# HG changeset patch # User mikade # Date 1293289654 -10800 # Node ID 6c9d96d06800f1ca91958599fe80d57f4e906ab9 # Parent 81bf6a31f41a16f0c54dd70c06c4c57ed9b1380d Update missions diff -r 81bf6a31f41a -r 6c9d96d06800 share/hedgewars/Data/Missions/Training/User_Mission_-_Diver.lua --- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Diver.lua Sat Dec 25 18:06:33 2010 +0300 +++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Diver.lua Sat Dec 25 18:07:34 2010 +0300 @@ -43,7 +43,7 @@ AddGear(1603, 1320, gtMine, 0, 0, 0, 0) - ShowMission(loc("Operation Diver"), loc("by mikade"), loc("Eliminate Poison before the time runs out"), -amFirePunch, 0); + ShowMission(loc("Operation Diver"), loc("by mikade"), loc("Eliminate Poison before the time runs out") .. loc("|- Mines Time:") .. " " .. 1 .. " " .. loc("sec"), -amFirePunch, 0); --SetTag(AddGear(0, 0, gtATSmoothWindCh, 0, 0, 0, 1), -70) SetWind(-100) diff -r 81bf6a31f41a -r 6c9d96d06800 share/hedgewars/Data/Missions/Training/User_Mission_-_Spooky_Tree.lua --- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Spooky_Tree.lua Sat Dec 25 18:06:33 2010 +0300 +++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Spooky_Tree.lua Sat Dec 25 18:07:34 2010 +0300 @@ -79,7 +79,7 @@ GirderCrate = SpawnAmmoCrate(2813,1538,amShotgun) -- final shotgun SpawnAmmoCrate(2205,1443,amBee) - ShowMission(loc("Spooky Tree"), loc("by mikade"), loc("Eliminate all enemies"), -amBee, 0); + ShowMission(loc("Spooky Tree"), loc("by mikade"), loc("Eliminate all enemies") .. loc("|- Mines Time:") .. " " .. 0 .. " " .. loc("sec"), -amBee, 0) SetWind(-75) diff -r 81bf6a31f41a -r 6c9d96d06800 share/hedgewars/Data/Missions/Training/User_Mission_-_Teamwork.lua --- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Teamwork.lua Sat Dec 25 18:06:33 2010 +0300 +++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Teamwork.lua Sat Dec 25 18:07:34 2010 +0300 @@ -65,7 +65,7 @@ SpawnUtilityCrate(2567,1768,amJetpack) SpawnAmmoCrate(1251,1466,amDrill) - ShowMission(loc("Codename: Teamwork"), loc("by mikade"), loc("- Eliminate Unit 3378 |- Feeble Resistance must survive"), 0, 0) + ShowMission(loc("Codename: Teamwork"), loc("by mikade"), loc("- Eliminate Unit 3378 |- Feeble Resistance must survive") .. loc("|- Mines Time:") .. " " .. 0 .. " " .. loc("sec"), 0, 0) end @@ -107,13 +107,13 @@ end if (gear == enemy) and (GameOver == false) then - ShowMission(loc("Codename: Teamwork"), loc("MISSION SUCCESSFUL"), loc("Congratulations!"), 0, 0); - elseif (gear == player) or (gear == p2) then + ShowMission(loc("Codename: Teamwork"), loc("MISSION SUCCESSFUL"), loc("Congratulations!"), 0, 0) + GameOver = true + elseif ( ((gear == player) or (gear == p2)) and (GameOver == false)) then ShowMission(loc("Codename: Teamwork"), loc("MISSION FAILED"), loc("Oh no! Just try again!"), -amSkip, 0) GameOver = true SetHealth(p2,0) SetHealth(player,0) - end end