# HG changeset patch # User Wuzzy # Date 1545420681 -3600 # Node ID 8db03d9bc6e980ea13c2eceb58d842a4769f42db # Parent ff2c1f25fc03f13ff81f9654e6739bd1d3b0e1a7 Reduce skipping craziness in ASA fruit02 a bit diff -r ff2c1f25fc03 -r 8db03d9bc6e9 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Fri Dec 21 17:47:54 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Fri Dec 21 20:31:21 2018 +0100 @@ -249,8 +249,12 @@ function onNewTurn() if not inBattle and CurrentHedgehog == green1.gear then EndTurn(true) - elseif CurrentHedgehog == green2.gear or CurrentHedgehog == green3.gear then - EndTurn(true) + elseif (not inBattle) and GetHogTeamName(CurrentHedgehog) == teamA.name then + if CurrentHedgehog ~= hero.gear then + SwitchHog(hero.gear) + end + SetTurnTimeLeft(MAX_TURN_TIME) + wind() elseif inBattle then if CurrentHedgehog == green1.gear and previousHog ~= hero.gear then EndTurn(true) @@ -264,9 +268,6 @@ end SetTurnTimeLeft(20000) wind() - elseif not inBattle and CurrentHedgehog == hero.gear then - SetTurnTimeLeft(MAX_TURN_TIME) - wind() else EndTurn(true) end