# HG changeset patch
# User Wuzzy <almikes@aol.com>
# Date 1480077504 -3600
# Node ID 8f222872d432d26556837a61bdd969251d37d28a
# Parent  99bfd35b39247b91f72420fac21accea575c718f
Disable SD for a couple of scripts and mission maps

diff -r 99bfd35b3924 -r 8f222872d432 ChangeLog.txt
--- a/ChangeLog.txt	Fri Nov 25 03:14:46 2016 +0100
+++ b/ChangeLog.txt	Fri Nov 25 13:38:24 2016 +0100
@@ -149,7 +149,7 @@
  + Capture The Flag supports setting number of captures with script parameter “capture=<number>”
  * Fixed Capture the Flag error: Flag of first team spawned at second hog instead of first
  * Mutant script shows now appropriate ranking and graph in stats screen
- * Disable Sudden Death for good in Shoppa game scheme
+ * Disable Sudden Death for good in Shoppa game scheme, some game styles and mission maps
 
 Missions:
  + Added Basic Flying Saucer Training
diff -r 99bfd35b3924 -r 8f222872d432 share/hedgewars/Data/Maps/Basketball/map.lua
--- a/share/hedgewars/Data/Maps/Basketball/map.lua	Fri Nov 25 03:14:46 2016 +0100
+++ b/share/hedgewars/Data/Maps/Basketball/map.lua	Fri Nov 25 13:38:24 2016 +0100
@@ -13,8 +13,10 @@
 	MinesNum = 0
 	Explosives = 0
 	Delay = 500
-	SuddenDeathTurns = 99999 -- "disable" sudden death
     Map = 'BasketballField'
+	-- Disable Sudden Death
+	WaterRise = 0
+	HealthDecrease = 0
 end
 
 function onGameStart()
diff -r 99bfd35b3924 -r 8f222872d432 share/hedgewars/Data/Maps/CTF_Blizzard/map.lua
--- a/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua	Fri Nov 25 03:14:46 2016 +0100
+++ b/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua	Fri Nov 25 13:38:24 2016 +0100
@@ -573,8 +573,9 @@
 	MinesTime  = 2000
 	Explosives = 0 -- The number of explosives being placed
 	Delay = 10 -- The delay between each round
-	WaterRise = 0 -- I sure hope this works	
-	--SuddenDeathTurns = 99 -- suddendeath is off, effectively
+	-- Disable Sudden Death
+	WaterRise = 0
+	HealthDecrease = 0
 	Map = "Blizzard" -- The map to be played
 	Theme = "Snow" -- The theme to be used "Nature"
 
diff -r 99bfd35b3924 -r 8f222872d432 share/hedgewars/Data/Maps/ClimbHome/map.lua
--- a/share/hedgewars/Data/Maps/ClimbHome/map.lua	Fri Nov 25 03:14:46 2016 +0100
+++ b/share/hedgewars/Data/Maps/ClimbHome/map.lua	Fri Nov 25 13:38:24 2016 +0100
@@ -78,6 +78,9 @@
     --EnableGameFlags(gfDisableLandObjects) 
     -- force seed instead.  Some themes will still be easier, but at least you won't luck out on the same theme
     Seed = ClimbHome
+    -- Disable Sudden Death
+    WaterRise = 0
+    HealthDecrease = 0
 end
 
 function onGearAdd(gear)
diff -r 99bfd35b3924 -r 8f222872d432 share/hedgewars/Data/Maps/Control/map.lua
--- a/share/hedgewars/Data/Maps/Control/map.lua	Fri Nov 25 03:14:46 2016 +0100
+++ b/share/hedgewars/Data/Maps/Control/map.lua	Fri Nov 25 13:38:24 2016 +0100
@@ -309,6 +309,7 @@
 	
 	GameFlags = band(bor(GameFlags, gfInfAttack + gfSolidLand), bnot(gfKing + gfForts))
 	WaterRise = 0
+	HealthDecrease = 0
 
 end
 
diff -r 99bfd35b3924 -r 8f222872d432 share/hedgewars/Data/Maps/Knockball/map.lua
--- a/share/hedgewars/Data/Maps/Knockball/map.lua	Fri Nov 25 03:14:46 2016 +0100
+++ b/share/hedgewars/Data/Maps/Knockball/map.lua	Fri Nov 25 13:38:24 2016 +0100
@@ -15,7 +15,9 @@
 	MinesNum = 0
 	Explosives = 0
 	Delay = 500
-	SuddenDeathTurns = 99999 -- "disable" sudden death
+	-- Disable Sudden Death
+	WaterRise = 0
+	HealthDecrease = 0
 end
 
 function onGameStart()
diff -r 99bfd35b3924 -r 8f222872d432 share/hedgewars/Data/Maps/TrophyRace/map.lua
--- a/share/hedgewars/Data/Maps/TrophyRace/map.lua	Fri Nov 25 03:14:46 2016 +0100
+++ b/share/hedgewars/Data/Maps/TrophyRace/map.lua	Fri Nov 25 13:38:24 2016 +0100
@@ -52,8 +52,10 @@
     MinesNum = 0
     Explosives = 0
     Delay = 500
-    SuddenDeathTurns = 99999 -- "disable" sudden death
     Theme = 'Olympics'
+    -- Disable Sudden Death
+    WaterRise = 0
+    HealthDecrease = 0
 end
 
 function onGameStart()
diff -r 99bfd35b3924 -r 8f222872d432 share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua
--- a/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua	Fri Nov 25 03:14:46 2016 +0100
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua	Fri Nov 25 13:38:24 2016 +0100
@@ -464,8 +464,10 @@
 	DisableGameFlags(gfKing)
 	EnableGameFlags(gfDivideTeams)
 
-	--SuddenDeathTurns = 999 -- suddendeath is off, effectively
+	-- Disable Sudden Death
 	WaterRise = 0
+	HealthDecrease = 0
+
 	Delay = 10
 
 end
diff -r 99bfd35b3924 -r 8f222872d432 share/hedgewars/Data/Scripts/Multiplayer/Racer.lua
--- a/share/hedgewars/Data/Scripts/Multiplayer/Racer.lua	Fri Nov 25 03:14:46 2016 +0100
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Racer.lua	Fri Nov 25 13:38:24 2016 +0100
@@ -537,6 +537,7 @@
         CaseFreq = 0
         TurnTime = 90000
         WaterRise = 0
+        HealthDecrease = 0
 
 end
 
diff -r 99bfd35b3924 -r 8f222872d432 share/hedgewars/Data/Scripts/Multiplayer/TechRacer.lua
--- a/share/hedgewars/Data/Scripts/Multiplayer/TechRacer.lua	Fri Nov 25 03:14:46 2016 +0100
+++ b/share/hedgewars/Data/Scripts/Multiplayer/TechRacer.lua	Fri Nov 25 13:38:24 2016 +0100
@@ -745,6 +745,7 @@
 		CaseFreq = 0
         TurnTime = 90000
         WaterRise = 0
+        HealthDecrease = 0
 
 		for x = 1, 16 do
 			AddPoint(x*100,100,5)