From 5ea8ad54a46c67546aefdae17abfbcafc73b5768 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 25 Feb 2017 19:56:22 +0100
Subject: [PATCH] - added tags to all ammo types.

---
 wadsrc/static/language.enu                    | 17 +++++++++++++++++
 wadsrc/static/zscript/doom/doomammo.txt       |  4 ++++
 wadsrc/static/zscript/heretic/hereticammo.txt |  6 ++++++
 wadsrc/static/zscript/hexen/mana.txt          |  2 ++
 4 files changed, 29 insertions(+)

diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu
index b1a8172d7..224aa24f0 100644
--- a/wadsrc/static/language.enu
+++ b/wadsrc/static/language.enu
@@ -1566,6 +1566,23 @@ TXT_COMM0			= "Incoming Message";
 TXT_COMM1			= "Incoming Message from BlackBird";
 
 
+AMMO_CLIP			= "Bullets";
+AMMO_SHELLS			= "Shotgun Shells";
+AMMO_ROCKETS		= "Rockets";
+AMMO_CELLS			= "Energy Cells";
+AMMO_GOLDWAND		= "Wand Crystals";
+AMMO_CROSSBOW		= "Ethereal Arrows";
+AMMO_BLASTER		= "Claw Orbs";
+AMMO_MACE			= "Mace Spheres";
+AMMO_SKULLROD		= "Hellstaff Runes";
+AMMO_PHOENIXROD		= "Flame Orbs";
+AMMO_MANA1			= "Blue Mana";
+AMMO_MANA2			= "Green Mana";
+$ifgame(chex) AMMO_CLIP = "Mini Zorch Charge";
+$ifgame(chex) AMMO_SHELLS = "Large Zorcher Charge";
+$ifgame(chex) AMMO_ROCKETS = "Propulsor Charge";
+$ifgame(chex) AMMO_CELLS = "Phasing Zorcher Charge";
+
 // Menu Strings
 
 // Main Menu
diff --git a/wadsrc/static/zscript/doom/doomammo.txt b/wadsrc/static/zscript/doom/doomammo.txt
index 394f13e94..950fd2122 100644
--- a/wadsrc/static/zscript/doom/doomammo.txt
+++ b/wadsrc/static/zscript/doom/doomammo.txt
@@ -10,6 +10,7 @@ class Clip : Ammo
 		Ammo.BackpackAmount 10;
 		Ammo.BackpackMaxAmount 400;
 		Inventory.Icon "CLIPA0";
+		Tag "$AMMO_CLIP";
 	}
 	States
 	{
@@ -48,6 +49,7 @@ class RocketAmmo : Ammo
 		Ammo.BackpackAmount 1;
 		Ammo.BackpackMaxAmount 100;
 		Inventory.Icon "ROCKA0";
+		Tag "$AMMO_ROCKETS";
 	}
 	States
 	{
@@ -86,6 +88,7 @@ class Cell : Ammo
 		Ammo.BackpackAmount 20;
 		Ammo.BackpackMaxAmount 600;
 		Inventory.Icon "CELLA0";
+		Tag "$AMMO_CELLS";
 	}
 	States
 	{
@@ -124,6 +127,7 @@ class Shell : Ammo
 		Ammo.BackpackAmount 4;
 		Ammo.BackpackMaxAmount 100;
 		Inventory.Icon "SHELA0";
+		Tag "$AMMO_SHELLS";
 	}
 	States
 	{
diff --git a/wadsrc/static/zscript/heretic/hereticammo.txt b/wadsrc/static/zscript/heretic/hereticammo.txt
index cf1e50a3d..c5ea831aa 100644
--- a/wadsrc/static/zscript/heretic/hereticammo.txt
+++ b/wadsrc/static/zscript/heretic/hereticammo.txt
@@ -11,6 +11,7 @@ Class GoldWandAmmo : Ammo
 		Ammo.BackpackAmount 10;
 		Ammo.BackpackMaxAmount 200;
 		Inventory.Icon "INAMGLD";
+		Tag "$AMMO_GOLDWAND";
 	}
 	States
 	{
@@ -48,6 +49,7 @@ Class CrossbowAmmo : Ammo
 		Ammo.BackpackAmount 5;
 		Ammo.BackpackMaxAmount 100;
 		Inventory.Icon "INAMBOW";
+		Tag "$AMMO_CROSSBOW";
 	}
 	States
 	{
@@ -85,6 +87,7 @@ Class MaceAmmo : Ammo
 		Ammo.BackpackAmount 20;
 		Ammo.BackpackMaxAmount 300;
 		Inventory.Icon "INAMLOB";
+		Tag "$AMMO_MACE";
 	}
 	States
 	{
@@ -123,6 +126,7 @@ Class BlasterAmmo : Ammo
 		Ammo.BackpackAmount 10;
 		Ammo.BackpackMaxAmount 400;
 		Inventory.Icon "INAMBST";
+		Tag "$AMMO_BLASTER";
 	}
 	States
 	{
@@ -161,6 +165,7 @@ Class SkullRodAmmo : Ammo
 		Ammo.BackpackAmount 20;
 		Ammo.BackpackMaxAmount 400;
 		Inventory.Icon "INAMRAM";
+		Tag "$AMMO_SKULLROD";
 	}
 	States
 	{
@@ -199,6 +204,7 @@ Class PhoenixRodAmmo : Ammo
 		Ammo.BackpackAmount 1;
 		Ammo.BackpackMaxAmount 40;
 		Inventory.Icon "INAMPNX";
+		Tag "$AMMO_PHOENIXROD";
 	}
 	States
 	{
diff --git a/wadsrc/static/zscript/hexen/mana.txt b/wadsrc/static/zscript/hexen/mana.txt
index 0a43a21dd..ad3d6d66b 100644
--- a/wadsrc/static/zscript/hexen/mana.txt
+++ b/wadsrc/static/zscript/hexen/mana.txt
@@ -13,6 +13,7 @@ class Mana1 : Ammo
 		+FLOATBOB
 		Inventory.Icon "MAN1I0";
 		Inventory.PickupMessage "$TXT_MANA_1";
+		Tag "$AMMO_MANA1";
 	}
 	States
 	{
@@ -37,6 +38,7 @@ class Mana2 : Ammo
 		+FLOATBOB
 		Inventory.Icon "MAN2G0";
 		Inventory.PickupMessage "$TXT_MANA_2";
+		Tag "$AMMO_MANA2";
 	}
 	States
 	{