share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua
changeset 15081 3a561db2a71c
parent 15077 a2d09a597fbb
child 15085 84bab72a0b7f
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua	Wed May 29 13:21:23 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua	Fri May 31 11:10:01 2019 +0200
@@ -297,35 +297,39 @@
 end
 
 function onBattleWin(gear)
-	local win = true
 	for i=1,7 do
 		if i<3 then
 			if GetHealth(yellowArmy[i].gear) then
-				win = false
+				return false
 			end
 		else
 			if GetHealth(yellowArmy[i].gear) and not yellowArmy[i].hidden then
-				win = false
+				return false
 			end
 		end
 	end
 	if GetHealth(yellow1.gear) then
-		win = false
+		return false
 	end
-	return win
+	if (not IsHogAlive(gear)) or (not StoppedGear(gear)) then
+		return false
+	end
+	return true
 end
 
 function onEscapeWinByKill(gear)
-	local win = true
 	for i=1,7 do
 		if GetHealth(yellowArmy[i].gear) or yellowArmy[i].hidden then
-			win = false
+			return false
 		end
 	end
 	if GetHealth(yellow1.gear) then
-		win = false
+		return false
 	end
-	return win
+	if (not IsHogAlive(gear)) or (not StoppedGear(gear)) then
+		return false
+	end
+	return true
 end
 
 function isHeroOnLaunchPad()