# HG changeset patch
# User mikade
# Date 1315531328 -7200
# Node ID 2af237f1fd5429c791a8f5c3b13659f31a777702
# Parent  afb988c1a2fe96fee6ca767800f993128a9047c1# Parent  ceb522b0f7d5e62e709cb89a0a0a9696d9fdece8
merge

diff -r ceb522b0f7d5 -r 2af237f1fd54 share/hedgewars/Data/Maps/CTF_Blizzard/map.lua
--- a/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua	Fri Sep 09 03:04:15 2011 +0200
+++ b/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua	Fri Sep 09 03:22:08 2011 +0200
@@ -1,5 +1,5 @@
 --------------------------------
--- CTF_BLIZZARD 0.8
+-- CTF_BLIZZARD 0.9
 --------------------------------
 
 ---------
@@ -68,14 +68,14 @@
 -- removed teleport from starting weapons
 -- increased captures to 3
 
------------
+------------
 -- 0.7
 ------------
 
 -- hopefully fixed a bug with the teleporters
 -- added a fix for crate possibly getting imbedded in land when it was near the water line
 
------------
+------------
 -- 0.8
 ------------
 
@@ -84,6 +84,13 @@
 -- changed hog placements code so that they start in the same place for both teams
 -- and hogs move in the same order, not backwards to each other.
 
+-----------
+-- 0.9
+------------
+
+-- add support for more players
+-- re-enable sudden death, but set water rise to 0
+
 loadfile(GetDataPath() .. "Scripts/Locale.lua")()
 
 ---------------------------------------------------------------
@@ -469,7 +476,7 @@
 
 
 	-- make a list of individual team names
-	for i = 0, 5 do
+	for i = 0, (TeamsCount-1) do
 		teamNameArr[i] = i
 		teamSize[i] = 0
 		teamIndex[i] = 0
@@ -566,7 +573,8 @@
 	MinesTime  = 2000
 	Explosives = 0 -- The number of explosives being placed
 	Delay = 10 -- The delay between each round
-	SuddenDeathTurns = 99 -- suddendeath is off, effectively
+	WaterRise = 0 -- I sure hope this works	
+	--SuddenDeathTurns = 99 -- suddendeath is off, effectively
 	Map = "Blizzard" -- The map to be played
 	Theme = "Snow" -- The theme to be used "Nature"
 
diff -r ceb522b0f7d5 -r 2af237f1fd54 share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua
--- a/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua	Fri Sep 09 03:04:15 2011 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua	Fri Sep 09 03:22:08 2011 +0200
@@ -1,5 +1,5 @@
 ---------------------------------------
--- CAPTURE_THE_FLAG GAMEPLAY MODE 0.4
+-- CAPTURE_THE_FLAG GAMEPLAY MODE 0.5
 -- by mikade
 ---------------------------------------
 
@@ -61,6 +61,15 @@
 -- changed starting feedback a little
 -- increased the radius around the circle indicating the flag thief so that it doesn't obscure his health
 
+--------
+-- 0.5
+--------
+
+-- add support for more players
+-- allow limited sudden death
+-- stop TimeBox ruining my life
+-- profit???
+
 -----------------
 --SCRIPT BEGINS
 -----------------
@@ -342,7 +351,7 @@
 
 
 	-- make a list of individual team names
-	for i = 0, 5 do
+	for i = 0, (TeamsCount-1) do
 		teamNameArr[i] = i
 		teamSize[i] = 0
 		teamIndex[i] = 0
@@ -436,7 +445,8 @@
 function onGameInit()
 
 	GameFlags = band(bor(GameFlags, gfDivideTeams), bnot(gfKing + gfForts))
-	SuddenDeathTurns = 999 -- suddendeath is off, effectively
+	--SuddenDeathTurns = 999 -- suddendeath is off, effectively
+	WaterRise = 0	
 	Delay = 10 
 
 end
@@ -562,6 +572,36 @@
 
 end
 
+function InABetterPlaceNow(gear)
+	for i = 0, (numhhs-1) do
+		if gear == hhs[i] then
+				
+			for i = 0,1 do
+				if gear == fThief[i] then
+					FlagThiefDead(gear)
+				end
+			end				
+			hhs[i] = nil	
+		end		
+	end
+end
+
+function onHogHide(gear)
+	 InABetterPlaceNow(gear)
+end
+
+function onHogRestore(gear)
+	match = false	
+	for i = 0, (numhhs-1) do
+		if (hhs[i] == nil) and (match == false) then
+			hhs[i] = gear
+			--AddCaption(GetHogName(gear) .. " has reappeared it seems!")	
+			match = true
+		end
+	end
+end
+
+
 function onGearAdd(gear)
 
 	if GetGearType(gear) == gtHedgehog then
@@ -584,17 +624,7 @@
 function onGearDelete(gear)
 
 	if GetGearType(gear) == gtHedgehog then
-		for i = 0, (numhhs-1) do
-			if gear == hhs[i] then
-				
-				for i = 0,1 do
-					if gear == fThief[i] then
-						FlagThiefDead(gear)
-					end
-				end				
-				hhs[i] = nil	
-			end		
-		end
+		InABetterPlaceNow(gear)		
 	end
 
 end
diff -r ceb522b0f7d5 -r 2af237f1fd54 share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.lua
--- a/share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.lua	Fri Sep 09 03:04:15 2011 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.lua	Fri Sep 09 03:22:08 2011 +0200
@@ -1,5 +1,5 @@
 ----------------------------------
--- THE SPECIALISTS MODE 0.5
+-- THE SPECIALISTS MODE 0.6
 -- by mikade
 ----------------------------------
 
@@ -35,6 +35,11 @@
 -- provision for variable minetimer / demo mines set to 5000ms
 -- don't autoswitch if player only has 1 hog on his team
 
+----------------
+-- version 0.6
+----------------
+-- for the meanwhile, don't drop any crates except health crates
+
 --------------------
 --TO DO
 --------------------
@@ -214,6 +219,7 @@
 function onGameInit()
         GameFlags = gfRandomOrder + gfResetWeps + gfInfAttack + gfPlaceHog
         Delay = 10
+	HealthCaseProb = 100
 end
 
 function onGameStart()