# HG changeset patch # User Wuzzy # Date 1506796141 -7200 # Node ID 2b529ddf1b0129cc986eb21c3a7a3f5c352733fc # Parent 2d68c113fc8d5e0c0493cabb4f0e4d7d3237989f ASA, moon01, desert01: Enable skip for hero only if there is turn-based play diff -r 2d68c113fc8d -r 2b529ddf1b01 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Sat Sep 30 19:51:22 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Sat Sep 30 20:29:01 2017 +0200 @@ -195,6 +195,7 @@ AddAmmo(hero.gear, amGrenade, 6) AddAmmo(hero.gear, amDEagle, 4) AddAmmo(hero.gear, amRCPlane, tonumber(getBonus(1))) + AddAmmo(hero.gear, amSkip, 0) AddAnim(dialog01) @@ -286,6 +287,7 @@ hero.dead = true elseif (gear == smuggler1.gear or gear == smuggler2.gear or gear == smuggler3.gear) and heroIsInBattle then heroIsInBattle = false + AddAmmo(hero.gear, amSkip, 0) ongoingBattle = 0 end end @@ -391,6 +393,7 @@ end EndTurn(true) heroIsInBattle = true + AddAmmo(hero.gear, amSkip, 100) ongoingBattle = 1 AnimSwitchHog(smuggler1.gear) EndTurn(true) @@ -401,6 +404,7 @@ AnimSay(smuggler1.gear, loc("Run away, you coward!"), SAY_SHOUT, 4000) EndTurn(true) heroIsInBattle = false + AddAmmo(hero.gear, amSkip, 0) ongoingBattle = 0 end @@ -414,6 +418,7 @@ function heroAtThirdBattle(gear) heroIsInBattle = true + AddAmmo(hero.gear, amSkip, 100) ongoingBattle = 3 AnimSay(smuggler3.gear, loc("Who's there?! I'll get you!"), SAY_SHOUT, 5000) local dx, dy = GetGearVelocity(hero.gear) @@ -508,6 +513,7 @@ dy = div(dy, 3) end heroIsInBattle = true + AddAmmo(hero.gear, amSkip, 100) ongoingBattle = 2 AnimSay(smuggler2.gear, loc("This is seems like a wealthy hedgehog, nice ..."), SAY_THINK, 5000) AnimSwitchHog(smuggler2.gear) diff -r 2d68c113fc8d -r 2b529ddf1b01 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Sat Sep 30 19:51:22 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Sat Sep 30 20:29:01 2017 +0200 @@ -195,6 +195,7 @@ if checkPointReached == 1 then AddAmmo(hero.gear, amRope, 2) + AddAmmo(hero.gear, amSkip, 0) SpawnAmmoCrate(bazookaX, weaponsY, amBazooka) SpawnUtilityCrate(parachuteX, weaponsY, amParachute) SpawnAmmoCrate(grenadeX, weaponsY, amGrenade) @@ -349,6 +350,7 @@ SetWind(60) GameFlags = bor(GameFlags,gfDisableWind) AddAmmo(hero.gear, amRope, 0) + AddAmmo(hero.gear, amSkip, 100) if GetX(hero.gear) < 1900 then AddAnim(dialog02) end @@ -368,6 +370,7 @@ function battleZone(gear) battleZoneReached = true + AddAmmo(hero.gear, amSkip, 100) EndTurn(true) if weaponsAcquired then AddAnim(dialog04)