Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ACF2: Fix Lua error spam when Leaks A Lot died in same turn as weaklings, also do other minor tweaks
authorWuzzy <Wuzzy2@mail.ru>
Sun, 29 Oct 2017 16:21:24 +0100
changeset 12801 d97fa936778e
parent 12800 36d28428e719
child 12802 981036f1bdef
ACF2: Fix Lua error spam when Leaks A Lot died in same turn as weaklings, also do other minor tweaks - Grant skip to Dense Cloud and Leaks A Lot again, after refusing the cyborg's offer - Fix flow chart - String freeze is maintained, the new string is already in stub.lua.
share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua file | annotate | diff | comparison | revisions 
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua	Sun Oct 29 01:07:28 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua	Sun Oct 29 16:21:24 2017 +0100
@@ -27,7 +27,9 @@
 - The cyborg offer is an IMPORTANT decision, it completely changes the next mission, and the rest of the story
 | Accept: Player walks to cyborg
     - Cut scene: acceptAnim
-    - Hero returns to start
+    - Hero needs to walk all the way back (infinite turn time)
+    - Hero reached tree
+    - Turn time starts
     - TBS
     - Stronglings defeated
     | Stronglings defeated with both hogs survived
@@ -37,9 +39,9 @@
     > Victory
 | Reject: Player walks away
     - Cut scene: refusedAnim
-    - Hero needs to walk all the way back (infinite turn time)
-    - Hero reached tree
-    - Turn time starts
+    - Leaks a Lot teleports back to tree at the start (automatically)
+    - Spiky Cheese and Ramon appear together with crates
+    - Spiky Cheese gains control
     - TBS
     - Stronglings defeated
     - Cut scene: refusedFinalAnim
@@ -54,7 +56,7 @@
     > Victory
 
 == Non-linear events ==
-| Dense Cloud or Leaks A Lot dead (exceptions: killed by cyborg; or Dense Cloud died in same turn as the Stronglings):
+| Dense Cloud or Leaks A Lot dead (exceptions: killed by cyborg; or Leaks A Lot died in the battle against the Stronglings):
     > Game over
 
 ]]
@@ -159,6 +161,8 @@
   AddAmmo(cannibals[7], amGrenade, 1)
   AddAmmo(cannibals[8], amGrenade, 1)
   AddAmmo(cannibals[9], amGrenade, 1)
+  AddAmmo(dense, amSkip, 100)
+  AddAmmo(leaks, amSkip, 100)
   stage = ramonStage
   SwitchHog(cannibals[9])
   FollowGear(ramon)
@@ -777,6 +781,9 @@
   if stage == loseStage then
     return
   end
+  if denseDead or GetHealth(dense) == 0 or leaksDead or GetHealth(leaks) == 0 then
+    return
+  end
   SetGearMessage(CurrentHedgehog, 0)
   AddAnim(stronglingsAnim)
   AddFunction({func = AfterStronglingsAnim, args = {}})
@@ -872,7 +879,7 @@
   if stage == loseStage then
     return
   end
-  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").."|"..loc("Both your hedgehogs must survive."), 1, 8000)
+  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").."|"..loc("Leaks A Lot must survive!"), 1, 8000)
   AddAmmo(dense, amSkip, 100)
   AddAmmo(dense, amSwitch, 100)
   AddAmmo(leaks, amSkip, 100)
@@ -898,6 +905,9 @@
   if stage == loseStage then
     return
   end
+  if leaksDead or GetHealth(leaks) == 0 then
+    return
+  end
   SetGearMessage(CurrentHedgehog, 0)
   if denseDead == true then
     AddAnim(acceptedDiedFinalAnim)
sheepy-clone