From 4f8f39072e1b0909c8d54b51e1d28218499505e0 Mon Sep 17 00:00:00 2001
From: ZZYZX <zzyzx@virtual>
Date: Thu, 9 Mar 2017 17:58:46 +0200
Subject: [PATCH] Updated Zandronum game configurations to include invasion
 spawners and MBF items (dog, evil sceptre, unholy bible, beta lost soul)

---
 .../Includes/Skulltag_things.cfg              | 433 +++++++-----------
 .../Includes/Zandronum_common.cfg             |   2 +-
 .../Includes/Zandronum_things.cfg             |  23 +-
 3 files changed, 183 insertions(+), 275 deletions(-)

diff --git a/Build/Configurations/Includes/Skulltag_things.cfg b/Build/Configurations/Includes/Skulltag_things.cfg
index c1b43c31..50356600 100755
--- a/Build/Configurations/Includes/Skulltag_things.cfg
+++ b/Build/Configurations/Includes/Skulltag_things.cfg
@@ -76,9 +76,13 @@ skulltag
 		blocking = 2;
 		error = 2;
 		
-		// MBF stuff that's not in Zandronum yet
-		888 = NULL; // MBF helper dog
-		
+        888
+		{
+			title = "MBF Helper dog";
+			width = 12;
+			height = 28;
+			sprite = "internal:dog";
+		}
 	}
 }
 
@@ -97,24 +101,12 @@ doomheretichexen
 		hangs = 0;
 		blocking = 0;
 		
-		5030
-		{
-			title = "Turbo Sphere";
-			sprite = "TURBA0";
-			height = 45;
-		}
 		5032
 		{
 			title = "Time-freeze Sphere";
 			sprite = "TIMEA0";
 			height = 45;
 		}
-		5035
-		{
-			title = "Invisibility Sphere";
-			sprite = "SINVA0";
-			height = 45;
-		}
 		5036
 		{
 			title = "Doomsphere";
@@ -427,7 +419,7 @@ doomheretichexen
   // All the invasion spawners
   invmonsters
   {
-    color = 14;  // Yellow
+    color = 12;	// Light Red
     arrow = 1;
     title = "Invasion Monster Spawners";
     width = 20;
@@ -452,7 +444,7 @@ doomheretichexen
 
   invammunition
   {
-    color = 14;  // Yellow
+    color = 6;	// Brown
     arrow = 0;
     title = "Invasion Ammunition Spawners";
     width = 16;
@@ -464,7 +456,7 @@ doomheretichexen
 
   invhealth
   {
-    color = 14;  // Yellow
+    color = 1;  // Blue
     arrow = 0;
     title = "Invasion Health and Armor Spawners";
     width = 16;
@@ -476,7 +468,7 @@ doomheretichexen
 
   invpowerups
   {
-    color = 14;  // Yellow
+    color = 9;	// Light Blue
     arrow = 0;
     title = "Invasion Powerup Spawners";
     width = 20;
@@ -501,7 +493,7 @@ doomheretichexen
 
   invrunes
   {
-    color = 14;  // Yellow
+    color = 17;  // Light Orange
     arrow = 0;
     title = "Invasion Rune Spawners";
     width = 20;
@@ -630,8 +622,13 @@ doom
       sprite = "BOS3A2A8";
     }
     
-    // MBF stuff that's not in Zandronum yet
-    9037 = NULL; // Beta lost soul
+    9037
+    {
+      title = "PR Lost Soul (BETA)";
+      width = "16";
+      height = "56";
+      sprite = "SKULA1";
+    }
   }
   
   // New weapons
@@ -717,9 +714,15 @@ doom
       height = 45;
     }
 
-    // MBF stuff that's not in Zandronum yet
-    2016 = NULL; // Beta evil sceptre
-    2017 = NULL; // Beta unholy bible
+    2016
+    {
+      title = "Evil Sceptre (BETA)";
+    }
+
+    2017
+    {
+      title = "Unholy Bible (BETA)";
+    }
   }
 
   obstacles
@@ -744,7 +747,7 @@ doom
   // All the invasion spawners
   invmonsters
   {
-    color = 14;  // Yellow
+    color = 12;	// Light Red
     arrow = 1;
     title = "Invasion Monster Spawners";
     width = 20;
@@ -753,181 +756,147 @@ doom
     hangs = 0;
     blocking = 2;
     error = 2;
-
+    
+    5220
+    {
+      title = "Arachnotron Spawner";
+      sprite = "BSPIA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+      height = 64;
+      width = 64;
+    }
+    
+    5228
+    {
+      title = "Archvile Spawner";
+      sprite = "VILEA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    
+    5222
+    {
+      title = "Baron of Hell Spawner";
+      sprite = "BOSSA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+      height = 64;
+      width = 24;
+    }
+    
+    5214
+    {
+      title = "Cacodemon Spawner";
+      sprite = "HEADA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+      width = 31;
+    }
+    
+    5212
+    {
+      title = "Chaingunner Spawner";
+      sprite = "CPOSA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    
+    5226
+    {
+      title = "Cyberdemon Spawner";
+      sprite = "CYBRA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+      height = 110;
+      width = 40;
+    }
+    
+    5207
+    {
+      title = "Demon Spawner";
+      sprite = "SARGA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+      width = 30;
+    }
+    
+    5218
+    {
+      title = "Mancubus Spawner";
+      sprite = "FATTA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+      height = 64;
+      width = 48;
+    }
+    
+    5221
+    {
+      title = "Hell Knight Spawner";
+      sprite = "BOS2A2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+      height = 64;
+      width = 24;
+    }
+    
     5205
     {
       title = "Imp Spawner";
       sprite = "TROOA2A8";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
-    5206
+    
+    5224
     {
-      title = "Dark Imp Spawner";
-      sprite = "DIMPA2A8";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5207
-    {
-      title = "Demon Spawner";
-      width = 30;
-      sprite = "SARGA2A8";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5208
-    {
-      title = "Spectre Spawner";
-      width = 30;
-      sprite = "SARGA2A8";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5209
-    {
-      title = "Blood Demon Spawner";
-      width = 30;
-      sprite = "SRG2A2A8";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5210
-    {
-      title = "Former Human Spawner";
-      sprite = "POSSA2A8";
+      title = "Lost Soul Spawner";
+      sprite = "SKULA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+      width = 16;
+    }
+    
+    5225
+    {
+      title = "Pain Elemental Spawner";
+      sprite = "PAINA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+      width = 31;
+    }
+    
+    5217
+    {
+      title = "Revenant Spawner";
+      sprite = "SKELA2A8";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
+    
     5211
     {
       title = "Former Sergeant Spawner";
       sprite = "SPOSA2A8";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
-    5212
-    {
-      title = "Chaingunner Spawner";
-      sprite = "CPOSA2";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5213
-    {
-      title = "Super Shotgunner Spawner";
-      sprite = "GPOSA2A8";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5214
-    {
-      title = "Cacodemon Spawner";
-      width = 31;
-      sprite = "HEADA2A8";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5215
-    {
-      title = "Cacolantern Spawner";
-      width = 31;
-      sprite = "HED2A2A8";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5216
-    {
-      title = "Abaddon Spawner";
-      width = 31;
-      sprite = "HED3A2A8";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5217
-    {
-      title = "Revenant Spawner";
-      sprite = "SKELA2D8";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5218
-    {
-      title = "Mancubus Spawner";
-      width = 48;
-      sprite = "FATTC2C8";
-      height = 64;
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5219
-    {
-      title = "Hectebus Spawner";
-      width = 48;
-      sprite = "HECTC2C8";
-      height = 64;
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5220
-    {
-      title = "Arachnotron Spawner";
-      width = 64;
-      sprite = "BSPIA2A8";
-      height = 64;
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5221
-    {
-      title = "Hell Knight Spawner";
-      width = 24;
-      sprite = "BOS2A2C8";
-      height = 64;
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5222
-    {
-      title = "Baron of Hell Spawner";
-      width = 24;
-      sprite = "BOSSA2A8";
-      height = 64;
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5223
-    {
-      title = "Belphegor Spawner";
-      width = 24;
-      sprite = "BOS3A2A8";
-      height = 64;
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5224
-    {
-      title = "Lost Soul Spawner";
-      width = 16;
-      sprite = "SKULA8A2";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5225
-    {
-      title = "Pain Elemental Spawner";
-      width = 31;
-      sprite = "PAINA2A8";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5226
-    {
-      title = "Cyberdemon Spawner";
-      width = 40;
-      sprite = "CYBRA2";
-      height = 110;
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
+    
     5227
     {
       title = "Spider Mastermind Spawner";
-      width = 128;
       sprite = "SPIDA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
       height = 100;
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
+      width = 128;
     }
-    5228
+    
+    5208
     {
-      title = "Arch-Vile Spawner";
-      sprite = "VILEA2D8";
+      title = "Spectre Spawner";
+      sprite = "SARGA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+      width = 30;
+    }
+    
+    5210
+    {
+      title = "Former Human Spawner";
+      sprite = "POSSA2A8";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
-
+    
     5280
     {
       title = "Wolfenstein SS Spawner";
       sprite = "SSWVA2";
-      height = 25;
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
   }
@@ -967,36 +936,18 @@ doom
       sprite = "MGUNA0";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
-    5271
-    {
-      title = "Minigun Spawner";
-      sprite = "MNGNA0";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
     5272
     {
       title = "Rocket Launcher Spawner";
       sprite = "LAUNA0";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
-    5273
-    {
-      title = "Grenade Launcher Spawner";
-      sprite = "GLAUA0";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
     5274
     {
       title = "Plasma Gun Spawner";
       sprite = "PLASA0";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
-    5275
-    {
-      title = "Railgun Spawner";
-      sprite = "RAILA0";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
     5276
     {
       title = "BFG9000 Spawner";
@@ -1004,17 +955,11 @@ doom
       height = 30;
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
-    5277
-    {
-      title = "BFG10000 Spawner";
-      sprite = "BFG2A0";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
   }
 
   invammunition
   {
-    color = 14;  // Yellow
+    color = 6;	// Brown
     arrow = 0;
     title = "Invasion Ammunition Spawners";
     width = 16;
@@ -1086,7 +1031,7 @@ doom
 
   invhealth
   {
-    color = 14;  // Yellow
+    color = 1;	// Blue
     arrow = 0;
     title = "Invasion Health and Armor Spawners";
     width = 16;
@@ -1120,18 +1065,6 @@ doom
       sprite = "BON2A0";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
-    5233
-    {
-      title = "Max. Health Bonus Spawner";
-      sprite = "BON3A0";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
-    5234
-    {
-      title = "Max. Armor Bonus Spawner";
-      sprite = "BON4A0";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
     5235
     {
       title = "Green Armor Spawner";
@@ -1144,17 +1077,11 @@ doom
       sprite = "ARM2A0";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
-    5237
-    {
-      title = "Red Armor Spawner";
-      sprite = "ARM3A0";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
   }
 
   invpowerups
   {
-    color = 14;  // Yellow
+    color = 9;	// Light Blue
     arrow = 0;
     title = "Invasion Powerup Spawners";
     width = 20;
@@ -1176,12 +1103,6 @@ doom
       height = 30;
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
-    5240
-    {
-      title = "Invisibility Spawner";
-      sprite = "INVSA0";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
     5241
     {
       title = "Partial Invisibility Spawner";
@@ -1202,12 +1123,6 @@ doom
       height = 40;
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
-    5244
-    {
-      title = "Random Powerup Spawner";
-      sprite = "DOOMA0";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
     5245
     {
       title = "Soulsphere Spawner";
@@ -1220,12 +1135,6 @@ doom
       sprite = "TIMEA0";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
-    5247
-    {
-      title = "Turbosphere Spawner";
-      sprite = "TURBA0";
-      include("Zandronum_misc.cfg", "invasionspawnerargs");
-    }
 
     5266
     {
@@ -2260,7 +2169,7 @@ raven
 
   invmonsters
   {
-    color = 14;  // Yellow
+    color = 12;	// Light Red
     arrow = 1;
     title = "Invasion Monster Spawners";
     width = 20;
@@ -2280,7 +2189,7 @@ raven
   
   invhealth
   {
-    color = 14;  // Yellow
+    color = 1;	// Blue
     arrow = 0;
     title = "Invasion Health and Armor Spawners";
     width = 16;
@@ -2299,7 +2208,7 @@ raven
 
   invpowerups
   {
-    color = 14;  // Yellow
+    color = 9;	// Light Blue
     arrow = 0;
     title = "Invasion Powerup Spawners";
     width = 20;
@@ -2347,7 +2256,7 @@ strife
   // All the invasion spawners
   invmonsters
   {
-    color = 14;  // Yellow
+    color = 12;	// Light Red
     arrow = 1;
     title = "Invasion Monster Spawners";
     width = 20;
@@ -2359,67 +2268,67 @@ strife
 
     5600
     {
-      title="Acolyte spawner";
-      sprite= "AGRDA2";
+      title="Acolyte Spawner";
+      sprite = "AGRDA2";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
     5601
     {
-      title="Acolyte spawner (tan)";
-      sprite= "AGRDA2";
+      title="Acolyte Spawner (tan)";
+      sprite = "AGRDA2";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
     5602
     {
-      title="Acolyte spawner (red)";
+      title="Acolyte Spawner (red)";
       sprite= "AGRDA2";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
     5603
     {
-      title="Acolyte spawner (rust)";
+      title="Acolyte Spawner (rust)";
       sprite= "AGRDA2";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
     5604
     {
-      title="Acolyte spawner (gray)";
+      title="Acolyte Spawner (gray)";
       sprite= "AGRDA2";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
     5605
     {
-      title="Acolyte spawner (dark green)";
+      title="Acolyte Spawner (dark green)";
       sprite= "AGRDA2";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
     5606
     {
-      title="Acolyte spawner (gold)";
+      title="Acolyte Spawner (gold)";
       sprite= "AGRDA2";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
     5607
     {
-      title="Acolyte spawner (light green)";
+      title="Acolyte Spawner (light green)";
       sprite= "AGRDA2";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
     5608
     {
-      title="Acolyte spawner (blue)";
+      title="Acolyte Spawner (blue)";
       sprite= "AGRDA2";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
     5609
     {
-      title="Acolyte spawner (shadow)";
+      title="Acolyte Spawner (shadow)";
       sprite= "AGRDA2";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
     5610
     {
-      title="Random Acolyte spawner";
+      title="Random Acolyte Spawner";
       sprite= "AGRDA2";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
     }
@@ -2428,7 +2337,7 @@ strife
       title="Sentinel Spawner";
       sprite= "SEWRA8A2";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
-        width = 23;
+      width = 23;
     }
     5612
     {
@@ -2441,21 +2350,21 @@ strife
       title="Inquisitor Spawner";
       sprite= "ROB3A2";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
-        width = 40;
+      width = 40;
     }
     5614
     {
       title="Stalker Spawner";
       sprite= "SPIDJ2";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
-        width = 31;
+      width = 31;
     }
     5615
     {
       title="Ceiling Turret Spawner";
       sprite= "TURTA8A2";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
-        width = 20;
+      width = 20;
     }
     5616
     {
@@ -2468,7 +2377,7 @@ strife
       title="Reaver Spawner";
       sprite= "ROB1A2";
       include("Zandronum_misc.cfg", "invasionspawnerargs");
-        width = 20;
+      width = 20;
     }
     5618
     {
@@ -2595,7 +2504,7 @@ strife
 		}
 		5634
 		{
-			title="Assault Gun (Standing) Spawner";
+			title="Assault Gun Spawner (Standing)";
 			sprite= "RIFLB0";
 			include("Zandronum_misc.cfg", "invasionspawnerargs");
 		}
@@ -2669,7 +2578,7 @@ strife
 
 	invammunition
 	{
-		color = 14;	// Yellow
+		color = 6;	// Brown
 		arrow = 0;
 		title = "Invasion Ammunition Spawners";
 		width = 16;
@@ -2790,7 +2699,7 @@ strife
 
 	invhealth
 	{
-		color = 14;	// Yellow
+		color = 1;	// Blue
 		arrow = 0;
 		title = "Invasion Health and Armor Spawners";
 		width = 16;
@@ -2845,7 +2754,7 @@ strife
 
 	invpowerups
 	{
-		color = 14;	// Yellow
+		color = 9;	// Light Blue
 		arrow = 0;
 		title = "Invasion Powerup Spawners";
 		width = 20;
diff --git a/Build/Configurations/Includes/Zandronum_common.cfg b/Build/Configurations/Includes/Zandronum_common.cfg
index 2a293793..862cb557 100755
--- a/Build/Configurations/Includes/Zandronum_common.cfg
+++ b/Build/Configurations/Includes/Zandronum_common.cfg
@@ -107,7 +107,7 @@ doomheretichexen
 	// Zandronum runes
 	runes
 	{
-		color = 9;	// Light Blue
+		color = 17;  // Light Orange
 		arrow = 0;
 		title = "Runes";
 		width = 20;
diff --git a/Build/Configurations/Includes/Zandronum_things.cfg b/Build/Configurations/Includes/Zandronum_things.cfg
index 182966a1..4989a3e2 100755
--- a/Build/Configurations/Includes/Zandronum_things.cfg
+++ b/Build/Configurations/Includes/Zandronum_things.cfg
@@ -8,8 +8,8 @@ doom
 	include("Zandronum_common.cfg", "zandronum")
 	include("Zandronum_common.cfg", "doomheretichexenstrife")
 	include("Zandronum_common.cfg", "doomheretichexen")
-	//include("Skulltag_things.cfg", "doomheretichexen")
-	//include("Skulltag_things.cfg", "doom")
+	include("Skulltag_things.cfg", "doomheretichexen")
+	include("Skulltag_things.cfg", "doom")
 }
 
 heretic
@@ -17,9 +17,9 @@ heretic
 	include("Zandronum_common.cfg", "zandronum")
 	include("Zandronum_common.cfg", "doomheretichexenstrife")
 	include("Zandronum_common.cfg", "doomheretichexen")
-	//include("Skulltag_things.cfg", "doomheretichexen")
-	//include("Skulltag_things.cfg", "raven")
-	//include("Skulltag_things.cfg", "heretic")
+	include("Skulltag_things.cfg", "doomheretichexen")
+	include("Skulltag_things.cfg", "raven")
+	include("Skulltag_things.cfg", "heretic")
 }
 
 hexen
@@ -27,21 +27,20 @@ hexen
 	include("Zandronum_common.cfg", "zandronum")
 	include("Zandronum_common.cfg", "doomheretichexenstrife")
 	include("Zandronum_common.cfg", "doomheretichexen")
-	//include("Skulltag_things.cfg", "doomheretichexen")
-	//include("Skulltag_things.cfg", "raven")
-	//include("Skulltag_things.cfg", "hexen")
+	include("Skulltag_things.cfg", "doomheretichexen")
+	include("Skulltag_things.cfg", "raven")
+	include("Skulltag_things.cfg", "hexen")
 }
 
 strife
 {
 	include("Zandronum_common.cfg", "zandronum")
 	include("Zandronum_common.cfg", "doomheretichexenstrife")
-	//include("Skulltag_things.cfg", "strife")
+	include("Skulltag_things.cfg", "strife")
 }
 
 default
 {
 	include("Zandronum_common.cfg", "zandronum")
-	//include("Skulltag_things.cfg", "skulltag")
-}
-
+	include("Skulltag_things.cfg", "skulltag")
+}
\ No newline at end of file