# HG changeset patch
# User nemo
# Date 1346345217 14400
# Node ID 0ba32e5412ce48c2badb4beac574c2989f58b134
# Parent  35d154745d7a32a9a1c0877bfdfd520f1c9ab62f
Final checkpoint w/ campaign.

diff -r 35d154745d7a -r 0ba32e5412ce share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/dragon.lua
--- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/dragon.lua	Sun Aug 26 01:31:38 2012 +0300
+++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/dragon.lua	Thu Aug 30 12:46:57 2012 -0400
@@ -299,7 +299,7 @@
   TurnTimeLeft = TurnTime
   ShowMission(loc("Dragon's Lair"), loc("Obstacle course"), loc("In order to get to the other side, you need to collect the crates first.|") ..
                                                   loc("As the ammo is sparse, you might want to reuse ropes while mid-air.|") ..
-                                                  loc("If you wish to restart the course, press [Precise]!|") ..
+                                                  loc("If you wish to restart the course, hold [Precise] while your turn ends (e.g with Skip)!|") ..
                                                   loc("The enemy can't move but it might be a good idea to stay out of sight!|") ..
                                                   loc("You have ") .. SuddenDeathTurns .. loc(" turns until Sudden Death! Better hurry!"), 1, 0)
 end
@@ -633,3 +633,7 @@
     retry = true
   end
 end
+
+function onPreciseUp()
+  retry = false
+end
diff -r 35d154745d7a -r 0ba32e5412ce share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/enemy.lua
--- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/enemy.lua	Sun Aug 26 01:31:38 2012 +0300
+++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/enemy.lua	Thu Aug 30 12:46:57 2012 -0400
@@ -248,7 +248,7 @@
 function SetupFinalAnim()
   finalAnim = {
     {func = AnimGearWait, args = {cyborg, 1000}},
-    {func = AnimSay, args = {cyborg, loc("Nicely done, meatbag!"), SAY_SAY, 3000}},
+    {func = AnimSay, args = {cyborg, loc("Nicely done, meatbags!"), SAY_SAY, 3000}},
     {func = AnimSay, args = {cyborg, loc("You have won the game by proving true cooperative skills!"), SAY_SAY, 7000}},
     {func = AnimSay, args = {cyborg, loc("You have proven yourselves worthy!"), SAY_SAY, 4000}},
     {func = AnimSay, args = {players[1], loc("Game? Was this a game to you?!"), SAY_SAY, 4000}},
diff -r 35d154745d7a -r 0ba32e5412ce share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/shadow.lua
--- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/shadow.lua	Sun Aug 26 01:31:38 2012 +0300
+++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/shadow.lua	Thu Aug 30 12:46:57 2012 -0400
@@ -92,7 +92,10 @@
   ShowMission(loc("The Shadow Falls"), loc("The Showdown"), loc("Save Leaks A Lot!|Hint: The Switch utility might be of help to you."), 1, 6000)
   RemoveEventFunc(CheckDenseDead)
   AddEvent(CheckStronglingsDead, {}, DoStronglingsDeadRefused, {}, 0)
-  AddAmmo(cannibals[6], amGrenade, 5)
+  AddAmmo(cannibals[6], amGrenade, 1)
+  AddAmmo(cannibals[7], amGrenade, 1)
+  AddAmmo(cannibals[8], amGrenade, 1)
+  AddAmmo(cannibals[9], amGrenade, 1)
   stage = ramonStage
   SwitchHog(cannibals[9])
   FollowGear(ramon)
@@ -125,9 +128,16 @@
 end
 
 function AfterWeaklingsAnim()
-  AddAmmo(cannibals[2], amShotgun, 4)
-  AddAmmo(cannibals[2], amGrenade, 3)
+  AddAmmo(cannibals[2], amShotgun, 1)
+  AddAmmo(cannibals[2], amGrenade, 1)
+  AddAmmo(cannibals[3], amShotgun, 1)
+  AddAmmo(cannibals[3], amGrenade, 1)
+  AddAmmo(cannibals[4], amShotgun, 1)
+  AddAmmo(cannibals[4], amGrenade, 1)
+  AddAmmo(cannibals[5], amShotgun, 1)
+  AddAmmo(cannibals[5], amGrenade, 1)
   AddAmmo(leaks, amSkip, 4)
+  AddAmmo(dense, amSkip, 4)
   AddEvent(CheckWeaklingsKilled, {}, DoWeaklingsKilled, {}, 0)
   SetHealth(SpawnHealthCrate(2757, 1030), 50)
   SetHealth(SpawnHealthCrate(2899, 1009), 50)
@@ -160,6 +170,8 @@
   AddEvent(CheckConfront, {}, DoConfront, {}, 0)
   AddAmmo(dense, amSwitch, 0)
   AddAmmo(dense, amSkip, 0)
+  AddAmmo(leaks, amSwitch, 0)
+  AddAmmo(leaks, amSkip, 0)
   SetHealth(SpawnHealthCrate(2557, 1030), 50)
   SetHealth(SpawnHealthCrate(3599, 1009), 50)
   TurnTimeLeft = 0
@@ -180,10 +192,10 @@
   end
   SetState(cyborg, 0)
   SetState(dense, 0)
-  AnimSetGearPosition(dense, 1350, 1310)
+  AnimSetGearPosition(dense, 1350, 1315)
   FollowGear(dense)
   HogTurnLeft(dense, true)
-  AnimSetGearPosition(cyborg, 1250, 1310)
+  AnimSetGearPosition(cyborg, 1250, 1315)
   SwitchHog(dense)
   SetInputMask(0xFFFFFFFF)
 end
@@ -226,9 +238,18 @@
 function AfterAttackedAnim()
   stage = aloneStage
   ShowMission(loc("The Shadow Falls"), loc("The Individualist"), loc("Defeat the cannibals!|Grenade hint: set the timer with [1-5], aim with [Up]/[Down] and hold [Space] to set power"), 1, 8000)
-  AddAmmo(cannibals[6], amGrenade, 5)
+  AddAmmo(cannibals[6], amGrenade, 1)
   AddAmmo(cannibals[6], amFirePunch, 0)
   AddAmmo(cannibals[6], amBaseballBat, 0)
+  AddAmmo(cannibals[7], amGrenade, 1)
+  AddAmmo(cannibals[7], amFirePunch, 0)
+  AddAmmo(cannibals[7], amBaseballBat, 0)
+  AddAmmo(cannibals[8], amGrenade, 1)
+  AddAmmo(cannibals[8], amFirePunch, 0)
+  AddAmmo(cannibals[8], amBaseballBat, 0)
+  AddAmmo(cannibals[9], amGrenade, 1)
+  AddAmmo(cannibals[9], amFirePunch, 0)
+  AddAmmo(cannibals[9], amBaseballBat, 0)
   SetGearMessage(leaks, 0)
   TurnTimeLeft = TurnTime
   AddEvent(CheckStronglingsDead, {}, DoStronglingsDeadAttacked, {}, 0)
@@ -707,13 +728,21 @@
   ShowMission(loc("The Shadow Falls"), loc("The guardian"), loc("Protect yourselves!|Grenade hint: set the timer with [1-5], aim with [Up]/[Down] and hold [Space] to set power"), 1, 8000)
   AddAmmo(dense, amSkip, 100)
   AddAmmo(dense, amSwitch, 100)
+  AddAmmo(leaks, amSkip, 100)
+  AddAmmo(leaks, amSwitch, 100)
   stage = duoStage
   RemoveEventFunc(CheckNeedGirder)
   RemoveEventFunc(CheckNeedWeapons)
   RemoveEventFunc(CheckRestartReturnAccepted)
   AddEvent(CheckStronglingsDead, {}, DoStronglingsDead, {}, 0)
-  AddAmmo(cannibals[6], amGrenade, 7)
-  AddAmmo(cannibals[6], amShotgun, 7)
+  AddAmmo(cannibals[6], amGrenade, 2)
+  AddAmmo(cannibals[6], amShotgun, 2)
+  AddAmmo(cannibals[7], amGrenade, 2)
+  AddAmmo(cannibals[7], amShotgun, 2)
+  AddAmmo(cannibals[8], amGrenade, 2)
+  AddAmmo(cannibals[8], amShotgun, 2)
+  AddAmmo(cannibals[9], amGrenade, 2)
+  AddAmmo(cannibals[9], amShotgun, 2)
   SetGearMessage(leaks, 0)
   SetGearMessage(dense, 0)
   TurnTimeLeft = TurnTime
@@ -827,6 +856,7 @@
 function onGameStart()
   HideHogs()
   AddAmmo(leaks, amSwitch, 100)
+  AddAmmo(dense, amSwitch, 100)
   AddEvent(CheckLeaksDead, {}, DoDead, {}, 0)
   AddEvent(CheckDenseDead, {}, DoDead, {}, 0)
   AddAnim(startDialogue)