# HG changeset patch # User Wuzzy # Date 1506725036 -7200 # Node ID 726b1edfc5116189cad1f399b53ddc54d4d9cc59 # Parent ef780eda6e48e87f06cfa81bbe275bb678aade6b ASA, moon01: Fix minions sometimes taking double turns diff -r ef780eda6e48 -r 726b1edfc511 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Sat Sep 30 00:09:48 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Sat Sep 30 00:43:56 2017 +0200 @@ -240,17 +240,20 @@ function onNewTurn() -- rounds start if hero got his weapons or got near the enemies - if not weaponsAcquired and not battleZoneReached and CurrentHedgehog ~= hero.gear then - EndTurn(true) - elseif weaponsAcquired and not battleZoneReached and CurrentHedgehog ~= hero.gear and afterDialog02 then - battleZone(hero.gear) - elseif not weaponsAcquired and not battleZoneReached and CurrentHedgehog == hero.gear then - TurnTimeLeft = -1 + if CurrentHedgehog == hero.gear then + if not weaponsAcquired and not battleZoneReached then + TurnTimeLeft = -1 + end + elseif CurrentHedgehog == minion1.gear or CurrentHedgehog == minion2.gear or CurrentHedgehog == minion3.gear then + if not weaponsAcquired and not battleZoneReached then + EndTurn(true) + elseif weaponsAcquired and not battleZoneReached and afterDialog02 then + battleZone(hero.gear) + end elseif CurrentHedgehog == paoth1.gear or CurrentHedgehog == paoth2.gear or CurrentHedgehog == paoth3.gear or CurrentHedgehog == paoth4.gear then EndTurn(true) elseif CurrentHedgehog == professor.gear then - AnimSwitchHog(hero.gear) EndTurn(true) end end