# HG changeset patch # User Wuzzy # Date 1493255510 -7200 # Node ID 7f09d01ecb4550fda4004d8d6ecfaf7846afbf94 # Parent 62b935bec899d76ba0cdb2c068221ba9b4fa5643 Fix false victory in Teamwork/Teamwork 2 when one of your hogs die in same turn as enemy diff -r 62b935bec899 -r 7f09d01ecb45 share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Thu Apr 27 02:42:40 2017 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Thu Apr 27 03:11:50 2017 +0200 @@ -107,11 +107,8 @@ if GetGearType(gear) == gtCase then TurnTimeLeft = TurnTimeLeft + 5000 end - - if (gear == enemy) and (GameOver == false) then - ShowMission(loc("Teamwork"), loc("MISSION SUCCESSFUL"), loc("Congratulations!"), 0, 0) - GameOver = true - elseif ( ((gear == player) or (gear == p2)) and (GameOver == false)) then + -- Note: The victory sequence is done automatically by Hedgewars + if ( ((gear == player) or (gear == p2)) and (GameOver == false)) then ShowMission(loc("Teamwork"), loc("MISSION FAILED"), loc("Oh no! Just try again!"), -amSkip, 0) GameOver = true SetHealth(p2,0) diff -r 62b935bec899 -r 7f09d01ecb45 share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork_2.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork_2.lua Thu Apr 27 02:42:40 2017 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork_2.lua Thu Apr 27 03:11:50 2017 +0200 @@ -107,10 +107,8 @@ if gear == Pack then HogSay(CurrentHedgehog, loc("This will certianly come in handy."), SAY_THINK) end - if (gear == enemy) and (GameOver == false) then - ShowMission(loc("Teamwork 2"), loc("MISSION SUCCESSFUL"), loc("Congratulations!"), 0, 0) - GameOver = true - elseif ( ((gear == player) or (gear == hlayer)) and (GameOver == false)) then + -- Note: The victory sequence is done automatically by Hedgewars + if ( ((gear == player) or (gear == hlayer)) and (GameOver == false)) then ShowMission(loc("Teamwork 2"), loc("MISSION FAILED"), loc("Oh no! Just try again!"), -amSkip, 0) GameOver = true SetHealth(hlayer, 0)