# HG changeset patch
# User Wuzzy <Wuzzy2@mail.ru>
# Date 1520460379 -3600
# Node ID 03d065fc60dc488e8296be070a2a6dce67c632f3
# Parent  d78e65c6657338a3a55c71149a10474a22bd4d0b
ACF6: Fix cyborgs sometimes idling forever in their turns (fixes bug 521)

diff -r d78e65c66573 -r 03d065fc60dc ChangeLog.txt
--- a/ChangeLog.txt	Wed Mar 07 22:47:55 2018 +0100
+++ b/ChangeLog.txt	Wed Mar 07 23:06:19 2018 +0100
@@ -63,6 +63,7 @@
  + Mission 3: Display number of turns left at timed parcours
  * Fix incorrect storytelling in mission descriptions
  * Mission 1: Fix error message spam when Leaks a Lot drowns
+ * Mission 6: Fix cyborgs sometimes doing nothing for a full turn
 
 Theme customization:
  + Add fallback music with fallback-music and fallback-sd-music
diff -r d78e65c66573 -r 03d065fc60dc share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua	Wed Mar 07 22:47:55 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua	Wed Mar 07 23:06:19 2018 +0100
@@ -625,6 +625,7 @@
   for i = 1, 4 do
     cyborgs[i] = AddHog(cyborgNames[i], 2, 100, "cyborg2")
     gearDead[cyborgs[i]] = false
+    SetEffect(cyborgs[i], heArtillery, 1)
   end
   cyborgsLeft = 4
 
@@ -727,16 +728,6 @@
     firstTurn = false
   end
   if GetHogTeamName(CurrentHedgehog) == loc("011101000") then
-    SetInputMask(band(0xFFFFFFFF, bnot(gmLeft + gmRight + gmLJump + gmHJump)))
-    for i = 1, 4 do
-      if gearDead[CurrentHedgehog] ~= true and gearDead[native] ~= true then
-        if gearDead[cyborgs[i]] ~= true and GetX(cyborgs[i]) < GetX(native) then
-          HogTurnLeft(cyborgs[i], false)
-        else
-          HogTurnLeft(cyborgs[i], true)
-        end
-      end
-    end
     if TotalRounds % 6 == 0 then
       AddAmmo(CurrentHedgehog, amSniperRifle, 1)
       AddAmmo(CurrentHedgehog, amDEagle, 1)
@@ -744,8 +735,6 @@
     TurnTimeLeft = 30000
   elseif GetHogTeamName(CurrentHedgehog) == loc("011101001") then
     EndTurn(true)
-  else
-    SetInputMask(0xFFFFFFFF)
   end
 end