From 3948454866166e3ce1fe077860b8de0f5d0b22d3 Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Tue, 28 Nov 2023 12:23:13 +0100
Subject: [PATCH] Heretic hack to guarantee one mace spawn per map.

---
 language.version               |  4 ++--
 zmapinfo.txt                   |  2 ++
 zscript/compat/swwm_compat.zsc | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/language.version b/language.version
index 9e46c89c6..40a9425f6 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1029 \cu(Tue 28 Nov 11:23:44 CET 2023)\c-";
-SWWM_SHORTVER="\cw1.3pre r1029 \cu(2023-11-28 11:23:44)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1030 \cu(Tue 28 Nov 12:23:13 CET 2023)\c-";
+SWWM_SHORTVER="\cw1.3pre r1030 \cu(2023-11-28 12:23:13)\c-";
diff --git a/zmapinfo.txt b/zmapinfo.txt
index b7a835cf9..7a9f5b359 100644
--- a/zmapinfo.txt
+++ b/zmapinfo.txt
@@ -245,6 +245,8 @@ DoomEdNums
 	4206991 = SWWMHans
 	4206992 = SWWMSS
 	4206993 = SWWMDog
+	// Heretic fuckery
+	4206999 = Mace
 }
 
 // edited Doom 2 cast to show the Demolitionist at the end
diff --git a/zscript/compat/swwm_compat.zsc b/zscript/compat/swwm_compat.zsc
index e7027f808..357fa4b76 100644
--- a/zscript/compat/swwm_compat.zsc
+++ b/zscript/compat/swwm_compat.zsc
@@ -553,6 +553,24 @@ Class SWWMLevelCompatibility : LevelPostProcessor
 			level.ReplaceTextures("SW1TEK","-noflat-",0);
 			break;
 		}
+		// [Heretic] override mace spawner behavior to always guarantee
+		// one spawn per map
+		if ( gameinfo.gametype&GAME_Heretic )
+		{
+			Array<uint> Maces;
+			Maces.Clear();
+			for ( uint i=0; i<GetThingCount(); i++ )
+			{
+				if ( GetThingEdNum(i) != 2002 ) continue;
+				Maces.Push(i);
+			}
+			int chosen = Random[Replacements](0,Maces.Size()-1);
+			for ( int i=0; i<Maces.Size(); i++ )
+			{
+				if ( i == chosen ) SetThingEdNum(Maces[i],4206999);
+				else SetThingEdNum(Maces[i],0);
+			}
+		}
 		// [Hexen] force Mystic Ambit Incants to spawn outside coop
 		if ( gameinfo.gametype&GAME_Hexen )
 		{