# HG changeset patch
# User Wuzzy <Wuzzy2@mail.ru>
# Date 1520468520 -3600
# Node ID cf2a58dccc4ae7643918bb0d026a96451bd9d30f
# Parent  a4872ca7f17cc5fcb6653e4a428ad16a7de1c1be
CTF: Remove tardis and resurrector

diff -r a4872ca7f17c -r cf2a58dccc4a ChangeLog.txt
--- a/ChangeLog.txt	Thu Mar 08 01:12:35 2018 +0100
+++ b/ChangeLog.txt	Thu Mar 08 01:22:00 2018 +0100
@@ -49,7 +49,7 @@
  + Battalion (King Mode): If the king dies, the hogs die normally instead of disappearing
  + Space Invasion: Add a default Space Invasion game scheme
  + HedgeEditor: Show cursor coordinates in top left corner
- + Control: Remove TimeBox and Resurrector from ammo menu
+ + Control, Capture the Flag: Always remove TimeBox and Resurrector
  * Battalion: Some texts in the mission panel were wrong and misleading
  * Construction Mode: Remove drill strike if added by weapon scheme (it's broken)
 
diff -r a4872ca7f17c -r cf2a58dccc4a share/hedgewars/Data/Maps/Control/map.lua
--- a/share/hedgewars/Data/Maps/Control/map.lua	Thu Mar 08 01:12:35 2018 +0100
+++ b/share/hedgewars/Data/Maps/Control/map.lua	Thu Mar 08 01:22:00 2018 +0100
@@ -319,7 +319,7 @@
 	-- Things we don't modify here will use their default values.
 	
 	EnableGameFlags(gfInfAttack, gfSolidLand)
-	DisableGameFlags(gfKing, gfForts)
+	DisableGameFlags(gfKing, gfForts, gfAISurvival)
 	WaterRise = 0
 	HealthDecrease = 0
 
diff -r a4872ca7f17c -r cf2a58dccc4a share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua
--- a/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua	Thu Mar 08 01:12:35 2018 +0100
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua	Thu Mar 08 01:22:00 2018 +0100
@@ -461,7 +461,7 @@
 
 function onGameInit()
 
-	DisableGameFlags(gfKing)
+	DisableGameFlags(gfKing, gfAISurvival)
 	EnableGameFlags(gfDivideTeams)
 
 	-- Disable Sudden Death
@@ -523,6 +523,13 @@
 
 	--SetVisualGearValues(zxc, 1000,1000, 20, 255, 1,    10,                     0,         200,        1,      GetClanColor(0))
 					--minO,max0 -glowyornot	--pulsate timer	 -- fuckall      -- radius -- width  -- colour
+	for h=1, numhhs do
+		-- Tardis causes too many unexpected situations, so we forbid it
+		AddAmmo(hhs[h], amTardis, 0)
+		-- Hogs are resurrected for free, so this is pointless
+		AddAmmo(hhs[h], amResurrector, 0)
+	end
+
 end
 
 
diff -r a4872ca7f17c -r cf2a58dccc4a share/hedgewars/Data/Scripts/Multiplayer/Racer.lua
--- a/share/hedgewars/Data/Scripts/Multiplayer/Racer.lua	Thu Mar 08 01:12:35 2018 +0100
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Racer.lua	Thu Mar 08 01:22:00 2018 +0100
@@ -849,6 +849,8 @@
         end
 
         AddAmmo(CurrentHedgehog, amTardis, 0)
+        AddAmmo(CurrentHedgehog, amResurrector, 0)
+        AddAmmo(CurrentHedgehog, amInvulnerable, 0)
         AddAmmo(CurrentHedgehog, amDrillStrike, 0)
         AddAmmo(CurrentHedgehog, amMineStrike, 0)
         AddAmmo(CurrentHedgehog, amNapalm, 0)