From be6c9f399c8b7e2ec3d3b7acf1e69f9775487d93 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Fri, 1 Jun 2018 18:56:41 +0200
Subject: [PATCH] Added support for DamNums.

---
 language.txt           | 18 ++++++++++++++++++
 zscript/ripper.zsc     |  4 ++--
 zscript/shockrifle.zsc |  6 +++---
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 language.txt

diff --git a/language.txt b/language.txt
new file mode 100644
index 0000000..77eaa11
--- /dev/null
+++ b/language.txt
@@ -0,0 +1,18 @@
+/* DamNums support */
+[enu default]
+DAMNUM_TYPECOLOR_PULSED = "DamGreen";
+DAMNUM_TYPECOLOR_ZAPPED = "DamGreen";
+DAMNUM_TYPECOLOR_SHOT = "DamYellow";
+DAMNUM_TYPECOLOR_JOLTED = "DamLightBlue";
+DAMNUM_TYPECOLOR_JOLTEDX = "DamOrange";
+DAMNUM_TYPECOLOR_REDEEMERDEATH = "DamBlack";
+DAMNUM_TYPECOLOR_SHREDDED = "DamGold";
+DAMNUM_TYPECOLOR_FLAKDEATH = "DamGold";
+DAMNUM_TYPECOLOR_SLASHED = "DamRed";
+DAMNUM_TYPECOLOR_DECAPITATED = "DamDarkRed";
+DAMNUM_TYPECOLOR_SLIME = "DamDarkGreen";
+DAMNUM_TYPECOLOR_IMPACT = "DamGray";
+DAMNUM_TYPECOLOR_RIPPER = "DamBrick";
+DAMNUM_TYPECOLOR_RIPPERALTDEATH = "DamCream";
+DAMNUM_TYPECOLOR_ROCKETDEATH = "DamTan";
+DAMNUM_TYPECOLOR_GRENADEDEATH = "DamTan";
diff --git a/zscript/ripper.zsc b/zscript/ripper.zsc
index ab03164..2541970 100644
--- a/zscript/ripper.zsc
+++ b/zscript/ripper.zsc
@@ -59,7 +59,7 @@ Class Razor2 : Actor
 		Height 2;
 		Speed 50;
 		DamageFunction Random[Ripper](20,30);
-		DamageType "Ripper";
+		DamageType 'Ripper';
 		Obituary "%k ripped a chunk of meat out of %o with the Ripper.";
 		BounceType "Doom";
 		ReactionTime 7;
@@ -184,7 +184,7 @@ Class Razor2Alt : Razor2
 	Default
 	{
 		DamageFunction Random[Ripper](25,34);
-		DamageType "RipperAltDealth";
+		DamageType 'RipperAltDealth';
 		BounceType "None";
 		-CANBOUNCEWATER;
 		+EXPLODEONWATER;
diff --git a/zscript/shockrifle.zsc b/zscript/shockrifle.zsc
index cd10af7..f07bd2f 100644
--- a/zscript/shockrifle.zsc
+++ b/zscript/shockrifle.zsc
@@ -474,7 +474,7 @@ Class SuperShockBeam : Actor
 	Default
 	{
 		Obituary "%k electrified %o with the Enhanced Shock Rifle.";
-		DamageType 'jolted';
+		DamageType 'joltedX';
 		RenderStyle "Add";
 		Radius 0.1;
 		Height 0;
@@ -560,7 +560,7 @@ Class SuperShockBeam : Actor
 			}
 			else
 			{
-				t.Results.HitActor.DamageMobj(self,target,Random[ASMD](3500,5000),'jolted');
+				t.Results.HitActor.DamageMobj(self,target,Random[ASMD](3500,5000),'joltedX');
 				let r = Spawn("SuperShockBeamRing",pos);
 				r.angle = atan2(t.Results.HitVector.y,t.Results.HitVector.x);
 				r.pitch = asin(-t.Results.HitVector.z);
@@ -884,7 +884,7 @@ Class SuperShockBall : Actor
 	{
 		Obituary "%k electrified %o with the Enhanced Shock Rifle.";
 		RenderStyle "Add";
-		DamageType 'jolted';
+		DamageType 'joltedX';
 		DamageFunction Random[ASMD](5000,6000);
 		Radius 2;
 		Height 2;