From 9eaf47207198d375e1719f6d093dadf3f7281c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Lu=C3=ADs=20Vaz=20Silva?= Date: Tue, 6 May 2025 22:08:26 -0300 Subject: [PATCH] fix gldefs and decaldef being inverted --- wadsrc/static/decaldef.txt | 81 +++++++++++-------- .../static/filter/doom.id/gldefs.txt | 68 +++++++--------- 2 files changed, 75 insertions(+), 74 deletions(-) diff --git a/wadsrc/static/decaldef.txt b/wadsrc/static/decaldef.txt index 99618cd08..0efbd1e5d 100644 --- a/wadsrc/static/decaldef.txt +++ b/wadsrc/static/decaldef.txt @@ -593,41 +593,6 @@ decalgroup RedPlasmaScorch RedPlasmaScorch2 1 } -//ID24 Weapons -object ID24IncineratorProjectile -{ - frame HETBA { light ROCKET } - frame HETBB { light ROCKET } - frame HETBC { light ROCKET } - - frame HETBD { light ROCKET_X1 } - frame HETBE { light ROCKET_X1 } - frame HETBF { light ROCKET_X2 } - frame HETBG { light ROCKET_X2 } - frame HETBH { light ROCKET_X3 } - frame HETBI { light ROCKET_X3 } -} - -object ID24IncineratorFlame -{ - frame IFLMA { light ARCHFIRE1 } - frame IFLMB { light ARCHFIRE2 } - frame IFLMC { light ARCHFIRE3 } - frame IFLMD { light ARCHFIRE4 } - frame IFLME { light ARCHFIRE5 } - frame IFLMF { light ARCHFIRE6 } - frame IFLMG { light ARCHFIRE7 } - frame IFLMH { light ARCHFIRE8 } - - frame IFLMI { light ARCHFIRE1 } - frame IFLMJ { light ARCHFIRE2 } - frame IFLMK { light ARCHFIRE3 } - frame IFLML { light ARCHFIRE4 } - frame IFLMM { light ARCHFIRE5 } - frame IFLMN { light ARCHFIRE6 } - frame IFLMO { light ARCHFIRE7 } - frame IFLMP { light ARCHFIRE8 } -} // Graf Zahl provided definitions for the other games. @@ -1070,6 +1035,52 @@ decalgroup SwordLightning SwordLightning2 1 } +/***** ID24 ****************************************************************/ + +//Calamity Blade +decal BladeScorchLower +{ + pic SCORCH1 + shade "00 00 00" + x-scale 0.85 + y-scale 0.20 + randomflipx + randomflipy +} + +decal BladeScorch1 +{ + pic HETBA0 + add 1.0 + fullbright + animator GoAway + lowerdecal BladeScorchLower +} + +decal BladeScorch2 +{ + pic HETBB0 + add 1.0 + fullbright + animator GoAway + lowerdecal BladeScorchLower +} + +decal BladeScorch3 +{ + pic HETBC0 + add 1.0 + fullbright + animator GoAway + lowerdecal BladeScorchLower +} + +decalgroup BladeScorch +{ + BladeScorch1 1 + BladeScorch2 1 + BladeScorch3 1 +} /***** Generators **********************************************************/ diff --git a/wadsrc_lights/static/filter/doom.id/gldefs.txt b/wadsrc_lights/static/filter/doom.id/gldefs.txt index 11b7eccd2..253d4ebf8 100644 --- a/wadsrc_lights/static/filter/doom.id/gldefs.txt +++ b/wadsrc_lights/static/filter/doom.id/gldefs.txt @@ -1387,47 +1387,37 @@ object TeleportFog // -- ID24 -- // ---------- -//Calamity Blade -decal BladeScorchLower +object ID24IncineratorProjectile { - pic SCORCH1 - shade "00 00 00" - x-scale 0.85 - y-scale 0.20 - randomflipx - randomflipy + frame HETBA { light ROCKET } + frame HETBB { light ROCKET } + frame HETBC { light ROCKET } + + frame HETBD { light ROCKET_X1 } + frame HETBE { light ROCKET_X1 } + frame HETBF { light ROCKET_X2 } + frame HETBG { light ROCKET_X2 } + frame HETBH { light ROCKET_X3 } + frame HETBI { light ROCKET_X3 } } -decal BladeScorch1 +object ID24IncineratorFlame { - pic HETBA0 - add 1.0 - fullbright - animator GoAway - lowerdecal BladeScorchLower + frame IFLMA { light ARCHFIRE1 } + frame IFLMB { light ARCHFIRE2 } + frame IFLMC { light ARCHFIRE3 } + frame IFLMD { light ARCHFIRE4 } + frame IFLME { light ARCHFIRE5 } + frame IFLMF { light ARCHFIRE6 } + frame IFLMG { light ARCHFIRE7 } + frame IFLMH { light ARCHFIRE8 } + + frame IFLMI { light ARCHFIRE1 } + frame IFLMJ { light ARCHFIRE2 } + frame IFLMK { light ARCHFIRE3 } + frame IFLML { light ARCHFIRE4 } + frame IFLMM { light ARCHFIRE5 } + frame IFLMN { light ARCHFIRE6 } + frame IFLMO { light ARCHFIRE7 } + frame IFLMP { light ARCHFIRE8 } } - -decal BladeScorch2 -{ - pic HETBB0 - add 1.0 - fullbright - animator GoAway - lowerdecal BladeScorchLower -} - -decal BladeScorch3 -{ - pic HETBC0 - add 1.0 - fullbright - animator GoAway - lowerdecal BladeScorchLower -} - -decalgroup BladeScorch -{ - BladeScorch1 1 - BladeScorch2 1 - BladeScorch3 1 -} \ No newline at end of file