# HG changeset patch # User Wuzzy # Date 1491871499 -7200 # Node ID d62d6f8ebef14a305f3e0ccf36f5d06ce997f5ac # Parent f30eab4b9b0514b05fba8324af2cb4baecf58bdd Disable Sudden Death consistently in all missions which don't require it diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua Tue Apr 11 02:44:59 2017 +0200 @@ -352,7 +352,9 @@ Delay = 10 Map = "Hogville" Theme = "Nature" - SuddenDeathTurns = 3000 + -- Disable Sudden Death + HealthDecrease = 0 + WaterRise = 0 GetVariables() AddHogs() diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Tue Apr 11 02:44:59 2017 +0200 @@ -944,7 +944,9 @@ Map = "A_Classic_Fairytale_journey" Theme = "Nature" - SuddenDeathTurns = 3000 + -- Disable Sudden Death + HealthDecrease = 0 + WaterRise = 0 AddTeam(loc("Natives"), 29439, "Bone", "Island", "HillBilly", "cm_birdy") leaks = AddHog(loc("Leaks A Lot"), 0, 100, "Rambo") diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Tue Apr 11 02:44:59 2017 +0200 @@ -847,7 +847,9 @@ Delay = 10 Map = "A_Classic_Fairytale_shadow" Theme = "Nature" - SuddenDeathTurns = 3000 + -- Disable Sudden Death + HealthDecrease = 0 + WaterRise = 0 AddHogs() PlaceHogs() diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Tue Apr 11 02:44:59 2017 +0200 @@ -411,7 +411,9 @@ Delay = 10 Map = "Hogville" Theme = "Nature" - SuddenDeathTurns = 3000 + -- Disable Sudden Death + HealthDecrease = 0 + WaterRise = 0 AddHogs() AnimInit() diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Tue Apr 11 02:44:59 2017 +0200 @@ -96,7 +96,9 @@ Explosives = 2 Delay = 3 HealthCaseAmount = 50 - SuddenDeathTurns = 100 + -- Disable Sudden Death + HealthDecrease = 0 + WaterRise = 0 Map = "death01_map" Theme = "Hell" diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Tue Apr 11 02:44:59 2017 +0200 @@ -104,7 +104,9 @@ MinesTime = 1 Explosives = 0 Delay = 3 - SuddenDeathTurns = 100 + -- Disable Sudden Death + HealthDecrease = 0 + WaterRise = 0 HealthCaseAmount = 50 Map = "fruit01_map" Theme = "Fruit" diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Tue Apr 11 02:44:59 2017 +0200 @@ -78,7 +78,9 @@ MinesTime = 1 Explosives = 0 Delay = 3 - SuddenDeathTurns = 200 + -- Disable Sudden Death + HealthDecrease = 0 + WaterRise = 0 Map = "fruit02_map" Theme = "Fruit" diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Challenge/Basic_Training_-_Sniper_Rifle.lua --- a/share/hedgewars/Data/Missions/Challenge/Basic_Training_-_Sniper_Rifle.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Challenge/Basic_Training_-_Sniper_Rifle.lua Tue Apr 11 02:44:59 2017 +0200 @@ -93,6 +93,9 @@ Map = "Ropes" -- The theme to be used Theme = "Golf" + -- Disable Sudden Death + WaterRise = 0 + HealthDecrease = 0 -- Create the player team AddTeam(loc("Sniperz"), 14483456, "Simple", "Island", "Default", "cm_crosshair") diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Challenge/User_Mission_-_RCPlane_Challenge.lua --- a/share/hedgewars/Data/Missions/Challenge/User_Mission_-_RCPlane_Challenge.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Challenge/User_Mission_-_RCPlane_Challenge.lua Tue Apr 11 02:44:59 2017 +0200 @@ -24,6 +24,10 @@ Map = "Ropes" Theme = "Eyes" + -- Disable Sudden Death + WaterRise = 0 + HealthDecrease = 0 + CaseFreq = 0 MinesNum = 0 Explosives = 0 diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Challenge/User_Mission_-_Rope_Knock_Challenge.lua --- a/share/hedgewars/Data/Missions/Challenge/User_Mission_-_Rope_Knock_Challenge.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Challenge/User_Mission_-_Rope_Knock_Challenge.lua Tue Apr 11 02:44:59 2017 +0200 @@ -123,6 +123,10 @@ Map = "Ropes" Theme = "Eyes" + -- Disable Sudden Death + WaterRise = 0 + HealthDecrease = 0 + CaseFreq = 0 MinesNum = 0 Explosives = 0 diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua Tue Apr 11 02:44:59 2017 +0200 @@ -18,7 +18,9 @@ Explosives = 0 Map = "Bamboo" Theme = "Bamboo" - SuddenDeathTurns = 99999 + -- Disable Sudden Death + HealthDecrease = 0 + WaterRise = 0 AddTeam(loc("Pathetic Resistance"), 14483456, "Simple", "Island", "Default", "cm_yinyang") player = AddHog(loc("Ikeda"), 0, 10, "StrawHat") diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua Tue Apr 11 02:44:59 2017 +0200 @@ -26,8 +26,9 @@ Delay = 0 -- The delay between each round Map = "Bath" -- The map to be played Theme = "Bath" -- The theme to be used - SuddenDeathTurns = 99999 - + -- Disable Sudden Death + HealthDecrease = 0 + WaterRise = 0 AddTeam(loc("Bloody Rookies"), 14483456, "Simple", "Island", "Default", "cm_duckhead") player = AddHog(loc("Hunter"), 0, 1, "NoHat") diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua Tue Apr 11 02:44:59 2017 +0200 @@ -20,7 +20,10 @@ Delay = 10 -- The delay between each round Map = "Hydrant" -- The map to be played Theme = "City" -- The theme to be used - SuddenDeathTurns = 99999 + + -- Disable Sudden Death + HealthDecrease = 0 + WaterRise = 0 AddTeam(loc("Bloody Rookies"), 14483456, "Simple", "Island", "Default", "cm_eyes") player = AddHog(loc("Hunter"), 0, 1, "NoHat") diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua Tue Apr 11 02:44:59 2017 +0200 @@ -14,7 +14,9 @@ TurnTime = 60000 CaseFreq = 0 MinesTime = 1000 - SuddenDeathTurns = 999999 + -- Disable Sudden Death + HealthDecrease = 0 + WaterRise = 0 HealthCaseProb = 35 Explosives = 0 MinesNum = 0 diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Scenario/User_Mission_-_Nobody_Laugh.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Nobody_Laugh.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Nobody_Laugh.lua Tue Apr 11 02:44:59 2017 +0200 @@ -12,7 +12,9 @@ Seed = 0 GameFlags = gfInfAttack + gfPerHogAmmo +gfDisableWind - SuddenDeathTurns = 9999 + -- Disable Sudden Death + HealthDecrease = 0 + WaterRise = 0 TurnTime = 180000 CaseFreq = 0 MinesNum = 0 diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua Tue Apr 11 02:44:59 2017 +0200 @@ -26,7 +26,9 @@ Delay = 10 -- The delay between each round Map = "Tree" -- The map to be played Theme = "Halloween" -- The theme to be used - SuddenDeathTurns = 99999 + -- Disable Sudden Death + HealthDecrease = 0 + WaterRise = 0 AddTeam(loc("Bloody Rookies"), 14483456, "Simple", "Island", "Default", "cm_eyes") player = AddHog(loc("Hunter"), 0, 1, "NoHat") diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Tue Apr 11 02:44:59 2017 +0200 @@ -20,7 +20,9 @@ Delay = 10 -- The delay between each round Map = "Mushrooms" -- The map to be played Theme = "Nature" -- The theme to be used - SuddenDeathTurns = 99999 + -- Disable Sudden Death + HealthDecrease = 0 + WaterRise = 0 AddTeam(loc("Feeble Resistance"), 14483456, "Simple", "Island", "Default", "cm_kiwi") player = AddHog(string.format(loc("Pathetic Hog #%d"), 1), 0, 50, "NoHat") diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua --- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua Tue Apr 11 02:44:59 2017 +0200 @@ -89,6 +89,9 @@ Map = "Bamboo" -- The theme to be used Theme = "Bamboo" + -- Setting these 2 values to 0 is the official way to disable Sudden Death cleanly + HealthDecrease = 0 -- Sudden Death damage + WaterRise = 0 -- Water rise in Sudden Death -- Create the player team AddTeam(loc("'Zooka Team"), 14483456, "Simple", "Island", "Default", "cm_crosshair") diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua --- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua Tue Apr 11 02:44:59 2017 +0200 @@ -82,6 +82,9 @@ Map = "Battlefield" -- The theme to be used Theme = "Castle" + -- Setting these 2 values to 0 is the official way to disable Sudden Death cleanly + HealthDecrease = 0 -- Sudden Death damage + WaterRise = 0 -- Water rise in Sudden Death -- Create the player team AddTeam(loc("Grenadiers"), 14483456, "Simple", "Island", "Default", "cm_grenade") diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Scripts/SpeedShoppa.lua --- a/share/hedgewars/Data/Scripts/SpeedShoppa.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Scripts/SpeedShoppa.lua Tue Apr 11 02:44:59 2017 +0200 @@ -97,6 +97,9 @@ Delay = 10 Theme = params.theme Map = params.map + -- Disable Sudden Death + WaterRise = 0 + HealthDecrease = 0 AddTeam(params.teamName, params.clanColor, params.teamGrave, "Castle", "Default", params.teamFlag) playerHog = AddHog(params.hogName, 0, 1, params.hogHat) diff -r f30eab4b9b05 -r d62d6f8ebef1 share/hedgewars/Data/Scripts/TargetPractice.lua --- a/share/hedgewars/Data/Scripts/TargetPractice.lua Tue Apr 11 02:11:49 2017 +0200 +++ b/share/hedgewars/Data/Scripts/TargetPractice.lua Tue Apr 11 02:44:59 2017 +0200 @@ -136,6 +136,9 @@ CaseFreq = 0 MinesNum = 0 Explosives = 0 + -- Disable Sudden Death + WaterRise = 0 + HealthDecrease = 0 SetWind(params.wind)