diff --git a/animdefs.misc b/animdefs.misc index 95a1578c0..0532e3a27 100644 --- a/animdefs.misc +++ b/animdefs.misc @@ -2,7 +2,8 @@ canvastexture LOGOFADE 4 4 // ammo leds -canvastexture PLASBLED 64 64 +canvastexture PLASBLDR 64 64 +canvastexture PLASBLDL 64 64 canvastexture PLASBFDR 4 4 canvastexture PLASBFDL 4 4 canvastexture SHEENLED 128 128 diff --git a/gldefs/demolitionist.txt b/gldefs/demolitionist.txt index 13a746b56..ddb4dcdef 100644 --- a/gldefs/demolitionist.txt +++ b/gldefs/demolitionist.txt @@ -44,8 +44,8 @@ Material Texture "models/DemoFace_Dead.png" Texture "envtex" "models/envmap/glss4env.png" Texture "rimtex" "models/envmap/glss4rim.png" Define "RIM_LIGHTING" - Define "ENVFACT2" = ".4" - Define "RIMFACT2" = ".6" + Define "ENVFACT" = ".4" + Define "RIMFACT" = ".6" Define "RIMSTEP" = "0." } Material Texture "models/DemoFace_Default.png" @@ -68,8 +68,8 @@ Material Texture "models/DemoFace_Dizzy.png" Texture "envtex" "models/envmap/glss4env.png" Texture "rimtex" "models/envmap/glss4rim.png" Define "RIM_LIGHTING" - Define "ENVFACT2" = ".4" - Define "RIMFACT2" = ".6" + Define "ENVFACT" = ".4" + Define "RIMFACT" = ".6" Define "RIMSTEP" = "0." } Material Texture "models/DemoFace_Evil.png" diff --git a/gldefs/dlc/plasmablast.txt b/gldefs/dlc/plasmablast.txt index b96494834..4df26cf29 100644 --- a/gldefs/dlc/plasmablast.txt +++ b/gldefs/dlc/plasmablast.txt @@ -12,10 +12,15 @@ Material Texture "models/PlasmaBlast.png" Define "RIMFACT" = "1." Define "RIMSTEP" = "0." } -Material Texture "models/PlasmaLED.png" +Material Texture "models/PlasmaLED_R.png" { Shader "shaders/glsl/CanvasProxy.fp" - Texture "scrtex" "PLASBLED" + Texture "scrtex" "PLASBLDR" +} +Material Texture "models/PlasmaLED_L.png" +{ + Shader "shaders/glsl/CanvasProxy.fp" + Texture "scrtex" "PLASBLDL" } Material Texture "models/PlasmaBlast_1stR.png" { diff --git a/language.def_base b/language.def_base index 1777e4367..a7fdc0dfe 100644 --- a/language.def_base +++ b/language.def_base @@ -172,6 +172,8 @@ GOTYELWSKUL = "Yellow Skull Key"; GOTREDSKUL = "Red Skull Key"; // edited vanilla pickup messages TXT_DEFAULTPICKUPMSG = "Unidentified Item"; +// not our hero +CC_HERO = "Doomguy"; // quit messages QUITMSG = "You really want to go?\nWhat a shame..."; QUITMSG1 = "Wow, don't just go and leave!\nThere's still a lot of stuff to do!"; diff --git a/language.version b/language.version index e2bf7c299..e5f68e4e8 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1181 \cu(jue 13 feb 2025 11:00:19 CET)\c-"; -SWWM_SHORTVER="\cw1.3pre r1181 \cu(2025-02-13 11:00:19)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1182 \cu(jue 20 feb 2025 13:45:37 CET)\c-"; +SWWM_SHORTVER="\cw1.3pre r1182 \cu(2025-02-20 13:45:37)\c-"; diff --git a/models/PlasmaLED.png b/models/PlasmaLED_L.png similarity index 100% rename from models/PlasmaLED.png rename to models/PlasmaLED_L.png diff --git a/models/PlasmaLED_R.png b/models/PlasmaLED_R.png new file mode 100644 index 000000000..5d243b434 Binary files /dev/null and b/models/PlasmaLED_R.png differ diff --git a/patches/castdemo_0001.png b/patches/castdemo_0001.png deleted file mode 100644 index a03349b2a..000000000 Binary files a/patches/castdemo_0001.png and /dev/null differ diff --git a/patches/castdemo_0002.png b/patches/castdemo_0002.png deleted file mode 100644 index 0cc469539..000000000 Binary files a/patches/castdemo_0002.png and /dev/null differ diff --git a/patches/castdemo_0003.png b/patches/castdemo_0003.png deleted file mode 100644 index c507bfaa3..000000000 Binary files a/patches/castdemo_0003.png and /dev/null differ diff --git a/patches/castdemo_0004.png b/patches/castdemo_0004.png deleted file mode 100644 index b94ac460b..000000000 Binary files a/patches/castdemo_0004.png and /dev/null differ diff --git a/patches/castdemo_0005.png b/patches/castdemo_0005.png deleted file mode 100644 index 8bc37897b..000000000 Binary files a/patches/castdemo_0005.png and /dev/null differ diff --git a/patches/castdemo_0006.png b/patches/castdemo_0006.png deleted file mode 100644 index 9cdefa5f5..000000000 Binary files a/patches/castdemo_0006.png and /dev/null differ diff --git a/patches/castdemo_0007.png b/patches/castdemo_0007.png deleted file mode 100644 index da1384bdc..000000000 Binary files a/patches/castdemo_0007.png and /dev/null differ diff --git a/patches/castdemo_0008.png b/patches/castdemo_0008.png deleted file mode 100644 index e8b664351..000000000 Binary files a/patches/castdemo_0008.png and /dev/null differ diff --git a/patches/castdemo_0009.png b/patches/castdemo_0009.png deleted file mode 100644 index a03349b2a..000000000 Binary files a/patches/castdemo_0009.png and /dev/null differ diff --git a/patches/castdemo_0010.png b/patches/castdemo_0010.png deleted file mode 100644 index 186723bdf..000000000 Binary files a/patches/castdemo_0010.png and /dev/null differ diff --git a/patches/castdemo_0011.png b/patches/castdemo_0011.png deleted file mode 100644 index 11e0ff218..000000000 Binary files a/patches/castdemo_0011.png and /dev/null differ diff --git a/patches/castdemo_0012.png b/patches/castdemo_0012.png deleted file mode 100644 index 843c1fe0c..000000000 Binary files a/patches/castdemo_0012.png and /dev/null differ diff --git a/patches/castdemo_0013.png b/patches/castdemo_0013.png deleted file mode 100644 index 0046955e9..000000000 Binary files a/patches/castdemo_0013.png and /dev/null differ diff --git a/patches/castdemo_0014.png b/patches/castdemo_0014.png deleted file mode 100644 index 736a709f8..000000000 Binary files a/patches/castdemo_0014.png and /dev/null differ diff --git a/patches/castdemo_0015.png b/patches/castdemo_0015.png deleted file mode 100644 index fb811aeed..000000000 Binary files a/patches/castdemo_0015.png and /dev/null differ diff --git a/patches/castdemo_0016.png b/patches/castdemo_0016.png deleted file mode 100644 index 33de131af..000000000 Binary files a/patches/castdemo_0016.png and /dev/null differ diff --git a/patches/castdemo_0048.png b/patches/castdemo_0048.png deleted file mode 100644 index 1efd57f99..000000000 Binary files a/patches/castdemo_0048.png and /dev/null differ diff --git a/patches/castdemo_0049.png b/patches/castdemo_0049.png deleted file mode 100644 index f918c2656..000000000 Binary files a/patches/castdemo_0049.png and /dev/null differ diff --git a/patches/castdemo_0050.png b/patches/castdemo_0050.png deleted file mode 100644 index dc5ffc195..000000000 Binary files a/patches/castdemo_0050.png and /dev/null differ diff --git a/patches/castdemo_0051.png b/patches/castdemo_0051.png deleted file mode 100644 index 37843d403..000000000 Binary files a/patches/castdemo_0051.png and /dev/null differ diff --git a/patches/castdemo_0052.png b/patches/castdemo_0052.png deleted file mode 100644 index e9a1b27c5..000000000 Binary files a/patches/castdemo_0052.png and /dev/null differ diff --git a/patches/castdemo_0053.png b/patches/castdemo_0053.png deleted file mode 100644 index 7428e7114..000000000 Binary files a/patches/castdemo_0053.png and /dev/null differ diff --git a/patches/castdemo_0054.png b/patches/castdemo_0054.png deleted file mode 100644 index 5e7f53370..000000000 Binary files a/patches/castdemo_0054.png and /dev/null differ diff --git a/patches/castdemo_0055.png b/patches/castdemo_0055.png deleted file mode 100644 index 3e0b185c0..000000000 Binary files a/patches/castdemo_0055.png and /dev/null differ diff --git a/patches/castdemo_0056.png b/patches/castdemo_0056.png deleted file mode 100644 index 3eb6c21bb..000000000 Binary files a/patches/castdemo_0056.png and /dev/null differ diff --git a/patches/castdemo_0057.png b/patches/castdemo_0057.png deleted file mode 100644 index 09dcd63de..000000000 Binary files a/patches/castdemo_0057.png and /dev/null differ diff --git a/patches/castdemo_0058.png b/patches/castdemo_0058.png deleted file mode 100644 index 75f05730f..000000000 Binary files a/patches/castdemo_0058.png and /dev/null differ diff --git a/patches/castdemo_0059.png b/patches/castdemo_0059.png deleted file mode 100644 index 498a62eaf..000000000 Binary files a/patches/castdemo_0059.png and /dev/null differ diff --git a/patches/castdemo_0060.png b/patches/castdemo_0060.png deleted file mode 100644 index 877a72fee..000000000 Binary files a/patches/castdemo_0060.png and /dev/null differ diff --git a/patches/castdemo_0061.png b/patches/castdemo_0061.png deleted file mode 100644 index f6da58510..000000000 Binary files a/patches/castdemo_0061.png and /dev/null differ diff --git a/patches/castdemo_0062.png b/patches/castdemo_0062.png deleted file mode 100644 index 83072ec01..000000000 Binary files a/patches/castdemo_0062.png and /dev/null differ diff --git a/patches/castdemo_0063.png b/patches/castdemo_0063.png deleted file mode 100644 index 0b67cc8b1..000000000 Binary files a/patches/castdemo_0063.png and /dev/null differ diff --git a/patches/castdemo_0064.png b/patches/castdemo_0064.png deleted file mode 100644 index d0103c310..000000000 Binary files a/patches/castdemo_0064.png and /dev/null differ diff --git a/patches/castdemo_0166.png b/patches/castdemo_0166.png deleted file mode 100644 index 1ff9660e0..000000000 Binary files a/patches/castdemo_0166.png and /dev/null differ diff --git a/patches/castdemo_0167.png b/patches/castdemo_0167.png deleted file mode 100644 index 905e6585c..000000000 Binary files a/patches/castdemo_0167.png and /dev/null differ diff --git a/patches/castdemo_0168.png b/patches/castdemo_0168.png deleted file mode 100644 index 6eba55856..000000000 Binary files a/patches/castdemo_0168.png and /dev/null differ diff --git a/patches/castdemo_0169.png b/patches/castdemo_0169.png deleted file mode 100644 index d4d4ef222..000000000 Binary files a/patches/castdemo_0169.png and /dev/null differ diff --git a/patches/castdemo_0170.png b/patches/castdemo_0170.png deleted file mode 100644 index f425f6b9c..000000000 Binary files a/patches/castdemo_0170.png and /dev/null differ diff --git a/patches/castdemo_0171.png b/patches/castdemo_0171.png deleted file mode 100644 index de5ea000c..000000000 Binary files a/patches/castdemo_0171.png and /dev/null differ diff --git a/textures.castdemo b/textures.castdemo deleted file mode 100644 index bdef48df9..000000000 --- a/textures.castdemo +++ /dev/null @@ -1,316 +0,0 @@ -// Texture definitions generated by SLADE3 -// on Thu Mar 4 19:31:28 2021 - -Sprite "ZYX1A0", 50, 196 -{ - XScale 2.500 - YScale 3.000 - Offset 24, 191 - Patch "PATCHES/CASTDEMO_0001.PNG", 0, 0 -} - -Sprite "ZYX1B0", 51, 199 -{ - XScale 2.500 - YScale 3.000 - Offset 24, 191 - Patch "PATCHES/CASTDEMO_0002.PNG", 0, 0 -} - -Sprite "ZYX1C0", 51, 200 -{ - XScale 2.500 - YScale 3.000 - Offset 24, 191 - Patch "PATCHES/CASTDEMO_0003.PNG", 0, 0 -} - -Sprite "ZYX1D0", 51, 199 -{ - XScale 2.500 - YScale 3.000 - Offset 24, 192 - Patch "PATCHES/CASTDEMO_0004.PNG", 0, 0 -} - -Sprite "ZYX1E0", 51, 198 -{ - XScale 2.500 - YScale 3.000 - Offset 24, 192 - Patch "PATCHES/CASTDEMO_0005.PNG", 0, 0 -} - -Sprite "ZYX1F0", 51, 199 -{ - XScale 2.500 - YScale 3.000 - Offset 24, 192 - Patch "PATCHES/CASTDEMO_0006.PNG", 0, 0 -} - -Sprite "ZYX1G0", 51, 200 -{ - XScale 2.500 - YScale 3.000 - Offset 24, 190 - Patch "PATCHES/CASTDEMO_0007.PNG", 0, 0 -} - -Sprite "ZYX1H0", 51, 198 -{ - XScale 2.500 - YScale 3.000 - Offset 24, 191 - Patch "PATCHES/CASTDEMO_0008.PNG", 0, 0 -} - -Sprite "ZYX1I0", 50, 196 -{ - XScale 2.500 - YScale 3.000 - Offset 24, 191 - Patch "PATCHES/CASTDEMO_0009.PNG", 0, 0 -} - -Sprite "ZYX1J0", 50, 199 -{ - XScale 2.500 - YScale 3.000 - Offset 24, 191 - Patch "PATCHES/CASTDEMO_0010.PNG", 0, 0 -} - -Sprite "ZYX1K0", 50, 199 -{ - XScale 2.500 - YScale 3.000 - Offset 24, 191 - Patch "PATCHES/CASTDEMO_0011.PNG", 0, 0 -} - -Sprite "ZYX1L0", 50, 198 -{ - XScale 2.500 - YScale 3.000 - Offset 24, 188 - Patch "PATCHES/CASTDEMO_0012.PNG", 0, 0 -} - -Sprite "ZYX1M0", 50, 197 -{ - XScale 2.500 - YScale 3.000 - Offset 24, 184 - Patch "PATCHES/CASTDEMO_0013.PNG", 0, 0 -} - -Sprite "ZYX1N0", 50, 198 -{ - XScale 2.500 - YScale 3.000 - Offset 24, 187 - Patch "PATCHES/CASTDEMO_0014.PNG", 0, 0 -} - -Sprite "ZYX1O0", 50, 198 -{ - XScale 2.500 - YScale 3.000 - Offset 24, 190 - Patch "PATCHES/CASTDEMO_0015.PNG", 0, 0 -} - -Sprite "ZYX1P0", 50, 197 -{ - XScale 2.500 - YScale 3.000 - Offset 24, 190 - Patch "PATCHES/CASTDEMO_0016.PNG", 0, 0 -} - -Sprite "ZYX2A0", 60, 192 -{ - XScale 2.500 - YScale 3.000 - Offset 26, 187 - Patch "PATCHES/CASTDEMO_0166.PNG", 0, 0 -} - -Sprite "ZYX2B0", 59, 191 -{ - XScale 2.500 - YScale 3.000 - Offset 26, 186 - Patch "PATCHES/CASTDEMO_0167.PNG", 0, 0 -} - -Sprite "ZYX2C0", 57, 190 -{ - XScale 2.500 - YScale 3.000 - Offset 26, 184 - Patch "PATCHES/CASTDEMO_0168.PNG", 0, 0 -} - -Sprite "ZYX2D0", 55, 191 -{ - XScale 2.500 - YScale 3.000 - Offset 25, 185 - Patch "PATCHES/CASTDEMO_0169.PNG", 0, 0 -} - -Sprite "ZYX2E0", 54, 194 -{ - XScale 2.500 - YScale 3.000 - Offset 25, 188 - Patch "PATCHES/CASTDEMO_0170.PNG", 0, 0 -} - -Sprite "ZYX2F0", 52, 196 -{ - XScale 2.500 - YScale 3.000 - Offset 25, 190 - Patch "PATCHES/CASTDEMO_0171.PNG", 0, 0 -} - -Sprite "ZYX3A0", 81, 196 -{ - XScale 2.500 - YScale 3.000 - Offset 37, 192 - Patch "PATCHES/CASTDEMO_0048.PNG", 0, 0 -} - -Sprite "ZYX3B0", 98, 198 -{ - XScale 2.500 - YScale 3.000 - Offset 55, 192 - Patch "PATCHES/CASTDEMO_0049.PNG", 0, 0 -} - -Sprite "ZYX3C0", 107, 196 -{ - XScale 2.500 - YScale 3.000 - Offset 65, 190 - Patch "PATCHES/CASTDEMO_0050.PNG", 0, 0 -} - -Sprite "ZYX3D0", 123, 194 -{ - XScale 2.500 - YScale 3.000 - Offset 70, 190 - Patch "PATCHES/CASTDEMO_0051.PNG", 0, 0 -} - -Sprite "ZYX3E0", 133, 189 -{ - XScale 2.500 - YScale 3.000 - Offset 70, 187 - Patch "PATCHES/CASTDEMO_0052.PNG", 0, 0 -} - -Sprite "ZYX3F0", 129, 182 -{ - XScale 2.500 - YScale 3.000 - Offset 68, 183 - Patch "PATCHES/CASTDEMO_0053.PNG", 0, 0 -} - -Sprite "ZYX3G0", 133, 174 -{ - XScale 2.500 - YScale 3.000 - Offset 70, 176 - Patch "PATCHES/CASTDEMO_0054.PNG", 0, 0 -} - -Sprite "ZYX3H0", 134, 150 -{ - XScale 2.500 - YScale 3.000 - Offset 69, 155 - Patch "PATCHES/CASTDEMO_0055.PNG", 0, 0 -} - -Sprite "ZYX3I0", 93, 117 -{ - XScale 2.500 - YScale 3.000 - Offset 32, 118 - Patch "PATCHES/CASTDEMO_0056.PNG", 0, 0 -} - -Sprite "ZYX3J0", 86, 107 -{ - XScale 2.500 - YScale 3.000 - Offset 35, 91 - Patch "PATCHES/CASTDEMO_0057.PNG", 0, 0 -} - -Sprite "ZYX3K0", 100, 111 -{ - XScale 2.500 - YScale 3.000 - Offset 49, 87 - Patch "PATCHES/CASTDEMO_0058.PNG", 0, 0 -} - -Sprite "ZYX3L0", 101, 115 -{ - XScale 2.500 - YScale 3.000 - Offset 51, 83 - Patch "PATCHES/CASTDEMO_0059.PNG", 0, 0 -} - -Sprite "ZYX3M0", 110, 93 -{ - XScale 2.500 - YScale 3.000 - Offset 48, 71 - Patch "PATCHES/CASTDEMO_0060.PNG", 0, 0 -} - -Sprite "ZYX3N0", 111, 87 -{ - XScale 2.500 - YScale 3.000 - Offset 47, 65 - Patch "PATCHES/CASTDEMO_0061.PNG", 0, 0 -} - -Sprite "ZYX3O0", 101, 86 -{ - XScale 2.500 - YScale 3.000 - Offset 44, 63 - Patch "PATCHES/CASTDEMO_0062.PNG", 0, 0 -} - -Sprite "ZYX3P0", 103, 84 -{ - XScale 2.500 - YScale 3.000 - Offset 37, 57 - Patch "PATCHES/CASTDEMO_0063.PNG", 0, 0 -} - -Sprite "ZYX3Q0", 101, 74 -{ - XScale 2.500 - YScale 3.000 - Offset 31, 44 - Patch "PATCHES/CASTDEMO_0064.PNG", 0, 0 -} - -// End of texture definitions diff --git a/zmapinfo.txt b/zmapinfo.txt index 34e3c5fa7..1d77ba9d3 100644 --- a/zmapinfo.txt +++ b/zmapinfo.txt @@ -250,120 +250,3 @@ DoomEdNums // Heretic fuckery 4206999 = Mace } - -// edited Doom 2 cast to show the Demolitionist at the end -Intermission Doom2Cast -{ - Cast - { - CastClass = "Zombieman" - CastName = "$CC_ZOMBIE" - AttackSound = "Missile", 1, "grunt/attack" - } - Cast - { - CastClass = "ShotgunGuy" - CastName = "$CC_SHOTGUN" - AttackSound = "Missile", 1, "shotguy/attack" - } - Cast - { - CastClass = "ChaingunGuy" - CastName = "$CC_HEAVY" - AttackSound = "Missile", 1, "chainguy/attack" - AttackSound = "Missile", 2, "chainguy/attack" - AttackSound = "Missile", 3, "chainguy/attack" - } - Cast - { - CastClass = "DoomImp" - CastName = "$CC_IMP" - AttackSound = "Missile", 2, "imp/attack" - } - Cast - { - CastClass = "Demon" - CastName = "$CC_DEMON" - AttackSound = "Melee", 1, "demon/melee" - } - Cast - { - CastClass = "LostSoul" - CastName = "$CC_LOST" - AttackSound = "Missile", 1, "skull/melee" - } - Cast - { - CastClass = "Cacodemon" - CastName = "$CC_CACO" - AttackSound = "Missile", 1, "caco/attack" - } - Cast - { - CastClass = "HellKnight" - CastName = "$CC_HELL" - AttackSound = "Missile", 1, "baron/attack" - } - Cast - { - CastClass = "BaronOfHell" - CastName = "$CC_BARON" - AttackSound = "Missile", 1, "baron/attack" - } - Cast - { - CastClass = "Arachnotron" - CastName = "$CC_ARACH" - AttackSound = "Missile", 1, "baby/attack" - } - Cast - { - CastClass = "PainElemental" - CastName = "$CC_PAIN" - AttackSound = "Missile", 2, "skull/melee" - } - Cast - { - CastClass = "Revenant" - CastName = "$CC_REVEN" - AttackSound = "Missile", 1, "skeleton/attack" - AttackSound = "Melee", 1, "skeleton/swing" - AttackSound = "Melee", 3, "skeleton/melee" - } - Cast - { - CastClass = "Fatso" - CastName = "$CC_MANCU" - AttackSound = "Missile", 1, "fatso/attack" - AttackSound = "Missile", 4, "fatso/attack" - AttackSound = "Missile", 7, "fatso/attack" - } - Cast - { - CastClass = "Archvile" - CastName = "$CC_ARCH" - AttackSound = "Missile", 1, "vile/start" - } - Cast - { - CastClass = "SpiderMastermind" - CastName = "$CC_SPIDER" - AttackSound = "Missile", 1, "spider/attack" - AttackSound = "Missile", 2, "spider/attack" - } - Cast - { - CastClass = "Cyberdemon" - CastName = "$CC_CYBER" - AttackSound = "Missile", 1, "weapons/rocklf" - AttackSound = "Missile", 3, "weapons/rocklf" - AttackSound = "Missile", 5, "weapons/rocklf" - } - Cast - { - CastClass = "CastDemolitionist" - CastName = "$CC_HERO" - AttackSound = "Missile", 0, "explodium/fire" - } - Link = Doom2Cast // restart cast call -} diff --git a/zscript/player/swwm_player_extra.zsc b/zscript/player/swwm_player_extra.zsc index 809c8d804..2f27853e6 100644 --- a/zscript/player/swwm_player_extra.zsc +++ b/zscript/player/swwm_player_extra.zsc @@ -57,28 +57,3 @@ Class SWWMVoodooDoll : PlayerPawn Stop; } } - -// for the doom 2 cast -Class CastDemolitionist : Actor -{ - Default - { - DeathSound "demolitionist/death"; - } - States - { - Spawn: - See: - ZYX1 ABCDEFGHIJKLMNOP 2; - Loop; - Missile: - ZYX1 A 2; - ZYX2 ABCDEF 2; - Goto See; - Death: - ZYX1 A 2; - ZYX3 ABCDEFGHIJKLMNOP 2; - ZYX3 Q -1; - Stop; - } -}