From c192c22b9ba8e8578a06ac18902257d42871e735 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Fri, 2 May 2025 23:48:45 +0200 Subject: [PATCH] As of a recent VKDoom update, Heretic and Hexen keys now have actual tags. --- language.def_base | 15 +++++++++++++++ language.version | 4 ++-- zscript/handler/swwm_handler_worldthings.zsc | 14 -------------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/language.def_base b/language.def_base index a7fdc0dfe..45572149f 100644 --- a/language.def_base +++ b/language.def_base @@ -170,6 +170,21 @@ GOTREDCARD = "Red Keycard"; GOTBLUESKUL = "Blue Skull Key"; GOTYELWSKUL = "Yellow Skull Key"; GOTREDSKUL = "Red Skull Key"; +// heretic and hexen keys actually have proper tags, so just redirect them +TAG_GOTYELLOWKEY = "$$T_KEYYELLOW"; +TAG_GOTGREENKEY = "$$T_KEYGREEN"; +TAG_GOTBLUEKEY = "$$T_KEYBLUE"; +TAG_KEY_STEEL = "$$T_KEYSTEEL"; +TAG_KEY_CAVE = "$$T_KEYCAVE"; +TAG_KEY_AXE = "$$T_KEYAXE"; +TAG_KEY_FIRE = "$$T_KEYFIRE"; +TAG_KEY_EMERALD = "$$T_KEYEMERALD"; +TAG_KEY_DUNGEON = "$$T_KEYDUNGEON"; +TAG_KEY_SILVER = "$$T_KEYSILVER"; +TAG_KEY_RUSTED = "$$T_KEYRUSTED"; +TAG_KEY_HORN = "$$T_KEYHORN"; +TAG_KEY_SWAMP = "$$T_KEYSWAMP"; +TAG_KEY_CASTLE = "$$T_KEYCASTLE"; // edited vanilla pickup messages TXT_DEFAULTPICKUPMSG = "Unidentified Item"; // not our hero diff --git a/language.version b/language.version index bbd72b5fd..36da58ba1 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1212 \cu(lun 28 abr 2025 10:08:05 CEST)\c-"; -SWWM_SHORTVER="\cw1.3pre r1212 \cu(2025-04-28 10:08:05)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1213 \cu(vie 02 may 2025 23:48:45 CEST)\c-"; +SWWM_SHORTVER="\cw1.3pre r1213 \cu(2025-05-02 23:48:45)\c-"; diff --git a/zscript/handler/swwm_handler_worldthings.zsc b/zscript/handler/swwm_handler_worldthings.zsc index aef3020ba..a08f88f76 100644 --- a/zscript/handler/swwm_handler_worldthings.zsc +++ b/zscript/handler/swwm_handler_worldthings.zsc @@ -160,21 +160,7 @@ extend Class SWWMHandler else if ( a is 'RedSkull' ) a.SetTag("$T_REDSKULL"); else if ( a is 'BlueSkull' ) a.SetTag("$T_BLUESKULL"); else if ( a is 'YellowSkull' ) a.SetTag("$T_YELLOWSKULL"); - else if ( a is 'KeyYellow' ) a.SetTag("$T_KEYYELLOW"); - else if ( a is 'KeyGreen' ) a.SetTag("$T_KEYGREEN"); - else if ( a is 'KeyBlue' ) a.SetTag("$T_KEYBLUE"); else if ( a.GetClassName() == 'KeyRed' ) a.SetTag("$T_KEYRED"); - else if ( a is 'KeySteel' ) a.SetTag("$T_KEYSTEEL"); - else if ( a is 'KeyCave' ) a.SetTag("$T_KEYCAVE"); - else if ( a is 'KeyAxe' ) a.SetTag("$T_KEYAXE"); - else if ( a is 'KeyFire' ) a.SetTag("$T_KEYFIRE"); - else if ( a is 'KeyEmerald' ) a.SetTag("$T_KEYEMERALD"); - else if ( a is 'KeyDungeon' ) a.SetTag("$T_KEYDUNGEON"); - else if ( a is 'KeySilver' ) a.SetTag("$T_KEYSILVER"); - else if ( a is 'KeyRusted' ) a.SetTag("$T_KEYRUSTED"); - else if ( a is 'KeyHorn' ) a.SetTag("$T_KEYHORN"); - else if ( a is 'KeySwamp' ) a.SetTag("$T_KEYSWAMP"); - else if ( a is 'KeyCastle' ) a.SetTag("$T_KEYCASTLE"); } // tempfix keys have no tags