# HG changeset patch # User Periklis Ntanasis # Date 1378137450 -10800 # Node ID 7daf157d8b5256d5f45c6b36a913fdb4943e7d5c # Parent 504a41e1a27ae95ef3c1c47677843219131a8efa fix check if deleted gear is hog diff -r 504a41e1a27a -r 7daf157d8b52 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.hwp Binary file share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.hwp has changed diff -r 504a41e1a27a -r 7daf157d8b52 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua Mon Sep 02 17:30:34 2013 +0300 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua Mon Sep 02 18:57:30 2013 +0300 @@ -16,7 +16,7 @@ local challengeObjectives = loc("Use your available weapons in order to eliminate the enemies").."|".. loc("You can only use the Sniper Rifle or the Watermelon bomb").."|".. loc("You'll have only 2 watermelon bombs during the game").."|".. - loc("You'll get an extra Sniper Rifle every time you kill an enemy hog with a limit of max 3 rifles").."|".. + loc("You'll get an extra Sniper Rifle every time you kill an enemy hog with a limit of max 4 rifles").."|".. loc("You'll get an extra Teleport every time you kill an enemy hog with a limit of max 2 teleports").."|".. loc("The first turn will last 25 sec and every other turn 15 sec").."|".. loc("If you skip the game your time left will be added to your next turn").."|".. @@ -156,15 +156,14 @@ end end -function onGearDelete(gear) - if (gear > hero.gear and gear <= enemiesOdd[table.getn(enemiesOdd)].gear) or - (gear > hero.gear and gear <= enemiesEven[table.getn(enemiesEven)].gear) then +function onGearDelete(gear) + if (isHog(gear)) then local availableTeleports = GetAmmoCount(hero.gear,amTeleport) local availableSniper = GetAmmoCount(hero.gear,amSniperRifle) if availableTeleports < 2 then AddAmmo(hero.gear, amTeleport, availableTeleports + 1 ) end - if availableSniper < 3 then + if availableSniper < 4 then AddAmmo(hero.gear, amSniperRifle, availableSniper + 1 ) end end @@ -238,7 +237,7 @@ table.insert(dialog01, {func = AnimCaption, args = {hero.gear, loc("Use your available weapons in order to eliminate the enemies"), 5000}}) table.insert(dialog01, {func = AnimCaption, args = {hero.gear, loc("You can only use the Sniper Rifle or the Watermelon bomb"), 5000}}) table.insert(dialog01, {func = AnimCaption, args = {hero.gear, loc("You'll have only 2 watermelon bombs during the game"), 5000}}) - table.insert(dialog01, {func = AnimCaption, args = {hero.gear, loc("You'll get an extra Sniper Rifle every time you kill an enemy hog with a limit of max 3 rifles"), 5000}}) + table.insert(dialog01, {func = AnimCaption, args = {hero.gear, loc("You'll get an extra Sniper Rifle every time you kill an enemy hog with a limit of max 4 rifles"), 5000}}) table.insert(dialog01, {func = AnimCaption, args = {hero.gear, loc("You'll get an extra Teleport every time you kill an enemy hog with a limit of max 2 teleports"), 5000}}) table.insert(dialog01, {func = AnimCaption, args = {hero.gear, loc("The first turn will last 25 sec and every other turn 15 sec"), 5000}}) table.insert(dialog01, {func = AnimCaption, args = {hero.gear, loc("If you skip the game your time left will be added to your next turn"), 5000}}) @@ -279,3 +278,22 @@ timeLeft = 10000 AddAmmo(hero.gear, amSkip, 0) end + +function isHog(gear) + local hog = false + for i=1,table.getn(enemiesOdd) do + if gear == enemiesOdd[i].gear then + hog = true + break + end + end + if not hog then + for i=1,table.getn(enemiesEven) do + if gear == enemiesEven then + hog = true + break + end + end + end + return hog +end