From 2d42438ebdfe19f3f7e1c2f9225b32d64115ed47 Mon Sep 17 00:00:00 2001 From: nashmuhandes Date: Fri, 14 Mar 2025 00:26:28 +0800 Subject: [PATCH] Properly assign tags to various Raven game items --- wadsrc/static/language.def | 21 +++++++++++++++++++ .../zscript/actors/heretic/hereticammo.zs | 1 + .../zscript/actors/heretic/hereticarmor.zs | 2 ++ .../actors/heretic/hereticartifacts.zs | 1 + .../zscript/actors/heretic/heretickeys.zs | 3 +++ .../static/zscript/actors/hexen/hexenkeys.zs | 11 ++++++++++ .../zscript/actors/raven/ravenhealth.zs | 1 + 7 files changed, 40 insertions(+) diff --git a/wadsrc/static/language.def b/wadsrc/static/language.def index 103d4d3a94..2700fbb209 100644 --- a/wadsrc/static/language.def +++ b/wadsrc/static/language.def @@ -391,5 +391,26 @@ TAG_ARTIINVULNERABILITY = "$$TXT_ARTIINVULNERABILITY"; TAG_ARTITELEPORT = "$$TXT_ARTITELEPORT"; TAG_ARTITOMEOFPOWER = "$$TXT_ARTITOMEOFPOWER"; TAG_ARTITORCH = "$$TXT_ARTITORCH"; +TAG_ITEMBAGOFHOLDING = "$$TXT_ITEMBAGOFHOLDING"; +TAG_ITEMSHIELD1 = "$$TXT_ITEMSHIELD2"; +TAG_ITEMSHIELD2 = "$$TXT_ITEMSHIELD2"; +TAG_GOTGREENKEY = "$$TXT_GOTGREENKEY"; +TAG_GOTBLUEKEY = "$$TXT_GOTBLUEKEY"; +TAG_GOTYELLOWKEY = "$$TXT_GOTYELLOWKEY"; +TAG_ITEMSUPERMAP = "$$TXT_ITEMSUPERMAP"; + +TAG_KEY_STEEL = "$$TXT_KEY_STEEL"; +TAG_KEY_CAVE = "$$TXT_KEY_CAVE"; +TAG_KEY_AXE = "$$TXT_KEY_AXE"; +TAG_KEY_FIRE = "$$TXT_KEY_FIRE"; +TAG_KEY_EMERALD = "$$TXT_KEY_EMERALD"; +TAG_KEY_DUNGEON = "$$TXT_KEY_DUNGEON"; +TAG_KEY_SILVER = "$$TXT_KEY_SILVER"; +TAG_KEY_RUSTED = "$$TXT_KEY_RUSTED"; +TAG_KEY_HORN = "$$TXT_KEY_HORN"; +TAG_KEY_SWAMP = "$$TXT_KEY_SWAMP"; +TAG_KEY_CASTLE = "$$TXT_KEY_CASTLE"; + +TAG_ITEMHEALTH = "$$TXT_ITEMHEALTH"; OPTMNU_SWRENDERER = "$$DSPLYMNU_SWOPT"; diff --git a/wadsrc/static/zscript/actors/heretic/hereticammo.zs b/wadsrc/static/zscript/actors/heretic/hereticammo.zs index 6464cf9dca..daf6d3ea74 100644 --- a/wadsrc/static/zscript/actors/heretic/hereticammo.zs +++ b/wadsrc/static/zscript/actors/heretic/hereticammo.zs @@ -237,6 +237,7 @@ Class BagOfHolding : BackpackItem Default { Inventory.PickupMessage "$TXT_ITEMBAGOFHOLDING"; + Tag "$TAG_ITEMBAGOFHOLDING"; +COUNTITEM +FLOATBOB } diff --git a/wadsrc/static/zscript/actors/heretic/hereticarmor.zs b/wadsrc/static/zscript/actors/heretic/hereticarmor.zs index 8cbcb9fbcf..b95a71ad90 100644 --- a/wadsrc/static/zscript/actors/heretic/hereticarmor.zs +++ b/wadsrc/static/zscript/actors/heretic/hereticarmor.zs @@ -7,6 +7,7 @@ Class SilverShield : BasicArmorPickup { +FLOATBOB Inventory.Pickupmessage "$TXT_ITEMSHIELD1"; + Tag "$TAG_ITEMSHIELD1"; Inventory.Icon "SHLDA0"; Armor.Savepercent 50; Armor.Saveamount 100; @@ -27,6 +28,7 @@ Class EnchantedShield : BasicArmorPickup { +FLOATBOB Inventory.Pickupmessage "$TXT_ITEMSHIELD2"; + Tag "$TAG_ITEMSHIELD2"; Inventory.Icon "SHD2A0"; Armor.Savepercent 75; Armor.Saveamount 200; diff --git a/wadsrc/static/zscript/actors/heretic/hereticartifacts.zs b/wadsrc/static/zscript/actors/heretic/hereticartifacts.zs index b620b04b4f..117d375868 100644 --- a/wadsrc/static/zscript/actors/heretic/hereticartifacts.zs +++ b/wadsrc/static/zscript/actors/heretic/hereticartifacts.zs @@ -9,6 +9,7 @@ Class SuperMap : MapRevealer +FLOATBOB Inventory.MaxAmount 0; Inventory.PickupMessage "$TXT_ITEMSUPERMAP"; + Tag "$TAG_ITEMSUPERMAP"; } States { diff --git a/wadsrc/static/zscript/actors/heretic/heretickeys.zs b/wadsrc/static/zscript/actors/heretic/heretickeys.zs index d5532ce016..b2bf3f3637 100644 --- a/wadsrc/static/zscript/actors/heretic/heretickeys.zs +++ b/wadsrc/static/zscript/actors/heretic/heretickeys.zs @@ -16,6 +16,7 @@ Class KeyGreen : HereticKey Default { Inventory.PickupMessage "$TXT_GOTGREENKEY"; + Tag "$TAG_GOTGREENKEY"; Inventory.Icon "GKEYICON"; } States @@ -33,6 +34,7 @@ Class KeyBlue : HereticKey Default { Inventory.PickupMessage "$TXT_GOTBLUEKEY"; + Tag "$TAG_GOTBLUEKEY"; Inventory.Icon "BKEYICON"; } States @@ -50,6 +52,7 @@ Class KeyYellow : HereticKey Default { Inventory.PickupMessage "$TXT_GOTYELLOWKEY"; + Tag "$TAG_GOTYELLOWKEY"; Inventory.Icon "YKEYICON"; } States diff --git a/wadsrc/static/zscript/actors/hexen/hexenkeys.zs b/wadsrc/static/zscript/actors/hexen/hexenkeys.zs index 9bf9f426c7..c0ec85ce77 100644 --- a/wadsrc/static/zscript/actors/hexen/hexenkeys.zs +++ b/wadsrc/static/zscript/actors/hexen/hexenkeys.zs @@ -14,6 +14,7 @@ class KeySteel : HexenKey { Inventory.Icon "KEYSLOT1"; Inventory.PickupMessage "$TXT_KEY_STEEL"; + Tag "$TAG_KEY_STEEL"; } States { @@ -29,6 +30,7 @@ class KeyCave : HexenKey { Inventory.Icon "KEYSLOT2"; Inventory.PickupMessage "$TXT_KEY_CAVE"; + Tag "$TAG_KEY_CAVE"; } States { @@ -44,6 +46,7 @@ class KeyAxe : HexenKey { Inventory.Icon "KEYSLOT3"; Inventory.PickupMessage "$TXT_KEY_AXE"; + Tag "$TAG_KEY_AXE"; } States { @@ -59,6 +62,7 @@ class KeyFire : HexenKey { Inventory.Icon "KEYSLOT4"; Inventory.PickupMessage "$TXT_KEY_FIRE"; + Tag "$TAG_KEY_FIRE"; } States { @@ -74,6 +78,7 @@ class KeyEmerald : HexenKey { Inventory.Icon "KEYSLOT5"; Inventory.PickupMessage "$TXT_KEY_EMERALD"; + Tag "$TAG_KEY_EMERALD"; } States { @@ -89,6 +94,7 @@ class KeyDungeon : HexenKey { Inventory.Icon "KEYSLOT6"; Inventory.PickupMessage "$TXT_KEY_DUNGEON"; + Tag "$TAG_KEY_DUNGEON"; } States { @@ -104,6 +110,7 @@ class KeySilver : HexenKey { Inventory.Icon "KEYSLOT7"; Inventory.PickupMessage "$TXT_KEY_SILVER"; + Tag "$TAG_KEY_SILVER"; } States { @@ -119,6 +126,7 @@ class KeyRusted : HexenKey { Inventory.Icon "KEYSLOT8"; Inventory.PickupMessage "$TXT_KEY_RUSTED"; + Tag "$TAG_KEY_RUSTED"; } States { @@ -134,6 +142,7 @@ class KeyHorn : HexenKey { Inventory.Icon "KEYSLOT9"; Inventory.PickupMessage "$TXT_KEY_HORN"; + Tag "$TAG_KEY_HORN"; } States { @@ -149,6 +158,7 @@ class KeySwamp : HexenKey { Inventory.Icon "KEYSLOTA"; Inventory.PickupMessage "$TXT_KEY_SWAMP"; + Tag "$TAG_KEY_SWAMP"; } States { @@ -164,6 +174,7 @@ class KeyCastle : HexenKey { Inventory.Icon "KEYSLOTB"; Inventory.PickupMessage "$TXT_KEY_CASTLE"; + Tag "$TAG_KEY_CASTLE"; } States { diff --git a/wadsrc/static/zscript/actors/raven/ravenhealth.zs b/wadsrc/static/zscript/actors/raven/ravenhealth.zs index cf7c79d0a7..7bf14ae15a 100644 --- a/wadsrc/static/zscript/actors/raven/ravenhealth.zs +++ b/wadsrc/static/zscript/actors/raven/ravenhealth.zs @@ -5,6 +5,7 @@ class CrystalVial : Health +FLOATBOB Inventory.Amount 10; Inventory.PickupMessage "$TXT_ITEMHEALTH"; + Tag "$TAG_ITEMHEALTH"; } States {