From eb22547fc9d2fbc652d68dd7a339072271ab3e4e Mon Sep 17 00:00:00 2001
From: TheSuperDave938 <71569097+superdave938@users.noreply.github.com>
Date: Tue, 11 Mar 2025 15:50:40 -0400
Subject: [PATCH] ID24 Weapon Lights and Decals

---
 wadsrc/static/decaldef.txt                    | 35 +++++++++++++
 .../actors/doom/id24/id24calamityblade.zs     |  1 +
 .../actors/doom/id24/id24incinerator.zs       |  1 +
 .../static/filter/doom.id/gldefs.txt          | 49 +++++++++++++++++++
 4 files changed, 86 insertions(+)

diff --git a/wadsrc/static/decaldef.txt b/wadsrc/static/decaldef.txt
index ea67cc86e..99618cd08 100644
--- a/wadsrc/static/decaldef.txt
+++ b/wadsrc/static/decaldef.txt
@@ -593,6 +593,41 @@ 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.
 
diff --git a/wadsrc/static/zscript/actors/doom/id24/id24calamityblade.zs b/wadsrc/static/zscript/actors/doom/id24/id24calamityblade.zs
index 62e6a65f0..6dec94d8d 100644
--- a/wadsrc/static/zscript/actors/doom/id24/id24calamityblade.zs
+++ b/wadsrc/static/zscript/actors/doom/id24/id24calamityblade.zs
@@ -196,6 +196,7 @@ class ID24IncineratorProjectile : Actor // Heatwave Ripper
 		+ZDOOMTRANS;
 		+RIPPER;
 		RenderStyle "Add";
+		Decal "BladeScorch";
 
 		DeathSound "weapons/calamityblade/explode";
 	}
diff --git a/wadsrc/static/zscript/actors/doom/id24/id24incinerator.zs b/wadsrc/static/zscript/actors/doom/id24/id24incinerator.zs
index a55ffb83e..3d954a592 100644
--- a/wadsrc/static/zscript/actors/doom/id24/id24incinerator.zs
+++ b/wadsrc/static/zscript/actors/doom/id24/id24incinerator.zs
@@ -77,6 +77,7 @@ class ID24IncineratorFlame : Actor // Incinerator Flame
 		+ZDOOMTRANS;
 		+FORCERADIUSDMG;
 		RenderStyle "Add";
+		Decal "Scorch";
 	}
 
 	States
diff --git a/wadsrc_lights/static/filter/doom.id/gldefs.txt b/wadsrc_lights/static/filter/doom.id/gldefs.txt
index 5bb91c32f..11b7eccd2 100644
--- a/wadsrc_lights/static/filter/doom.id/gldefs.txt
+++ b/wadsrc_lights/static/filter/doom.id/gldefs.txt
@@ -1382,3 +1382,52 @@ object TeleportFog
     frame TFOGI { light DTFOG4 }
     frame TFOGJ { light DTFOG3 }
 }
+
+// ----------
+// -- 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
+}
\ No newline at end of file