From 154fba714621e0bfc269cae8adb9c801904606a2 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sun, 23 Jan 2022 20:46:40 +0100
Subject: [PATCH] Finetune BD detection.

---
 language.version              |  4 ++--
 zscript/compat/swwm_shame.zsc | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/language.version b/language.version
index b04aac9c3..f1c7c7c3c 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r123 \cu(Sat 22 Jan 17:17:41 CET 2022)\c-";
-SWWM_SHORTVER="\cw1.2pre r123 \cu(2022-01-22 17:17:41)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r124 \cu(Sun 23 Jan 20:46:41 CET 2022)\c-";
+SWWM_SHORTVER="\cw1.2pre r124 \cu(2022-01-23 20:46:41)\c-";
diff --git a/zscript/compat/swwm_shame.zsc b/zscript/compat/swwm_shame.zsc
index 4de31b6df..5a8a91018 100644
--- a/zscript/compat/swwm_shame.zsc
+++ b/zscript/compat/swwm_shame.zsc
@@ -15,6 +15,7 @@ Class SWWMBrutalHandler : StaticEventHandler
 	ui int timer;
 	ui TextureID scr;
 	bool detected;
+	String which, whichshort;
 
 	override void OnRegister()
 	{
@@ -22,17 +23,26 @@ Class SWWMBrutalHandler : StaticEventHandler
 			return;
 		for ( int i=0; i<AllActorClasses.size(); i++ )
 		{
-			if ( (AllActorClasses[i].GetClassName() != "BrutalWeapon")
-				&& (AllActorClasses[i].GetClassName() != "BrutalDoomer") ) continue;
-			detected = true;
-			break;
+			if ( AllActorClasses[i].GetClassName() == "BDoomer" )
+			{
+				detected = true;
+				which = "Brutal Doom";
+				whichshort = "BD";
+			}
+			else if ( AllActorClasses[i].GetClassName() == "BrutalDoomer" )
+			{
+				detected = true;
+				which = "Project Brutality";
+				whichshort = "PB";
+			}
+			if ( detected ) break;
 		}
 		if ( !detected )
 			return;
 		SetRandomSeed[bdscreen](Random[bdscreen]()+consoleplayer+MSTime());
 		Console.Printf(
 			"\cx┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓\c-\n"
-			"\cx┃   \cfIf you have BD on your autoload you really shouldn't.   \cx┃\c-\n"
+			"\cx┃   \cfIf you have "..whichshort.." on your autoload you really shouldn't.   \cx┃\c-\n"
 			"\cx┃  \cfIf you manually loaded it with this mod, why would you?  \cx┃\c-\n"
 			"\cx┃         \cfThey're not compatible and never will be.         \cx┃\c-\n"
 			"\cx┃    \cfThis mod will now shit the bed once you go in-game,    \cx┃\c-\n"