# HG changeset patch
# User Wuzzy <almikes@aol.com>
# Date 1506783881 -7200
# Node ID 88b9f41a57890164e32341ee8a7b7e99c58048f9
# Parent  fbd0001ba2e74f20efd6785c7511a71faba32944
ASA, moon01: Fix various turn-based and gameplaying bugs

diff -r fbd0001ba2e7 -r 88b9f41a5789 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua	Sat Sep 30 15:40:02 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua	Sat Sep 30 17:04:41 2017 +0200
@@ -247,7 +247,7 @@
 			TurnTimeLeft = -1
 		end
 	elseif CurrentHedgehog == minion1.gear or CurrentHedgehog == minion2.gear or CurrentHedgehog == minion3.gear then
-		if not weaponsAcquired and not battleZoneReached then
+		if not battleZoneReached then
 			EndTurn(true)
 		elseif weaponsAcquired and not battleZoneReached and afterDialog02 then
 			battleZone(hero.gear)
@@ -256,7 +256,11 @@
 		or CurrentHedgehog == paoth3.gear or CurrentHedgehog == paoth4.gear then
 		EndTurn(true)
 	elseif CurrentHedgehog == professor.gear then
-		EndTurn(true)
+		if weaponsAcquired and not battleZoneReached and afterDialog02 then
+			battleZone(hero.gear)
+		else
+			EndTurn(true)
+		end
 	end
 end
 
@@ -292,7 +296,8 @@
 end
 
 function onBattleZone(gear)
-	if not battleZoneReached and not hero.dead and GetX(gear) > 1900 and StoppedGear(gear) then
+	if not battleZoneReached and not hero.dead and StoppedGear(gear) and
+			(GetX(gear) > 1900 or (weaponsAcquired and GetY(gear) > 1200)) then
 		return true
 	end
 	return false
@@ -354,8 +359,8 @@
 end
 
 function battleZone(gear)
+	battleZoneReached = true
 	EndTurn(true)
-	battleZoneReached = true
 	if weaponsAcquired then
 		AddAnim(dialog04)
 	else
@@ -435,9 +440,12 @@
 	if goals[anim] ~= nil then
 		ShowMission(unpack(goals[anim]))
 	end
-	if anim == dialog02 then
+	if anim == dialog01 then
+		AnimSwitchHog(hero.gear)
+	elseif anim == dialog02 then
 		setAfterDialog02()
-	elseif anim == dialog03 then
+		AnimSwitchHog(hero.gear)
+	elseif anim == dialog03 or anim == dialog04 then
 		startCombat()
 	elseif anim == dialog05 then
 		runaway(professor.gear)
@@ -447,8 +455,6 @@
 		runaway(minion2.gear)
 		runaway(minion3.gear)
 		afterDialog06()
-	else
-		AnimSwitchHog(hero.gear)
 	end
 end