From 3b36859992b8fa6a8d72c2ecbba73936c65aebe1 Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Tue, 10 Oct 2023 17:03:53 +0200
Subject: [PATCH] Fix custom boss tags being overriden in vanilla boss maps.

---
 language.version                             |  4 ++--
 zscript/handler/swwm_handler_vanillaboss.zsc | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/language.version b/language.version
index e12026cd4..41fc786f5 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r974 \cu(Tue 10 Oct 14:39:12 CEST 2023)\c-";
-SWWM_SHORTVER="\cw1.3pre r974 \cu(2023-10-10 14:39:12)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r975 \cu(Tue 10 Oct 17:03:53 CEST 2023)\c-";
+SWWM_SHORTVER="\cw1.3pre r975 \cu(2023-10-10 17:03:53)\c-";
diff --git a/zscript/handler/swwm_handler_vanillaboss.zsc b/zscript/handler/swwm_handler_vanillaboss.zsc
index 9dd4b1d1d..0d51555bb 100644
--- a/zscript/handler/swwm_handler_vanillaboss.zsc
+++ b/zscript/handler/swwm_handler_vanillaboss.zsc
@@ -240,8 +240,8 @@ extend Class SWWMHandler
 				bossactors.Push(e.Thing);
 				e.Thing.StartHealth = e.Thing.Health *= 3;
 				e.Thing.GiveInventory('BossMarker',1);
+				bosstag = "$BT_BRUISERS";
 			}
-			bosstag = "$BT_BRUISERS";
 		}
 		else if ( bossmap == MAP_DE2M8 )
 		{
@@ -250,8 +250,8 @@ extend Class SWWMHandler
 				bossactors.Push(e.Thing);
 				e.Thing.StartHealth = e.Thing.Health *= 5;
 				e.Thing.GiveInventory('BossMarker',1);
+				bosstag = "$BT_CYBIE";
 			}
-			bosstag = "$BT_CYBIE";
 		}
 		else if ( bossmap == MAP_DE3M8 )
 		{
@@ -261,8 +261,8 @@ extend Class SWWMHandler
 				e.Thing.StartHealth = e.Thing.Health *= 6;
 				e.Thing.GiveInventory('BossMarker',1);
 				e.Thing.GiveInventory('EndgameBossMarker',1);
+				bosstag = "$BT_SPIDER";
 			}
-			bosstag = "$BT_SPIDER";
 		}
 		else if ( bossmap == MAP_DE4M8 )
 		{
@@ -271,8 +271,8 @@ extend Class SWWMHandler
 				bossactors.Push(e.Thing);
 				e.Thing.StartHealth = e.Thing.Health *= 4;
 				e.Thing.GiveInventory('BossMarker',1);
+				bosstag = "$BT_SPIDER2";
 			}
-			bosstag = "$BT_SPIDER2";
 		}
 		else if ( bossmap == MAP_DMAP07 )
 		{
@@ -281,8 +281,8 @@ extend Class SWWMHandler
 				bossactors.Push(e.Thing);
 				e.Thing.StartHealth = e.Thing.Health *= 2;
 				e.Thing.GiveInventory('BossMarker',1);
+				bosstag = "$BT_DIMPLE";
 			}
-			bosstag = "$BT_DIMPLE";
 		}
 		else if ( bossmap == MAP_DMAP30 )
 		{
@@ -293,13 +293,13 @@ extend Class SWWMHandler
 				e.Thing.StartHealth = e.Thing.Health *= 40;	// goodbye, instakills
 				e.Thing.GiveInventory('BossMarker',1);
 				e.Thing.GiveInventory('EndgameBossMarker',1);
+				bosstag = "$BT_IOS";
 			}
 			if ( e.Thing is 'BossEye' )
 			{
 				bossviewactor = e.Thing;
 				e.Thing.GiveInventory('IconMessage',1);
 			}
-			bosstag = "$BT_IOS";
 		}
 		else if ( bossmap == MAP_DLVL08 )
 		{
@@ -308,8 +308,8 @@ extend Class SWWMHandler
 				bossactors.Push(e.Thing);
 				e.Thing.StartHealth = e.Thing.Health *= 4;
 				e.Thing.GiveInventory('BossMarker',1);
+				bosstag = "$BT_CYBIE2";
 			}
-			bosstag = "$BT_CYBIE2";
 		}
 		else if ( bossmap == MAP_HE1M8_HE4M8 )
 		{
@@ -318,8 +318,8 @@ extend Class SWWMHandler
 				bossactors.Push(e.Thing);
 				e.Thing.StartHealth = e.Thing.Health *= 4;
 				e.Thing.GiveInventory('BossMarker',1);
+				bosstag = "$BT_LICHES";
 			}
-			bosstag = "$BT_LICHES";
 		}
 		else if ( bossmap == MAP_HE2M8_HE5M8 )
 		{
@@ -328,8 +328,8 @@ extend Class SWWMHandler
 				bossactors.Push(e.Thing);
 				e.Thing.StartHealth = e.Thing.Health *= 3;
 				e.Thing.GiveInventory('BossMarker',1);
+				bosstag = "$BT_MINOTAUR";
 			}
-			bosstag = "$BT_MINOTAUR";
 		}
 		else if ( bossmap == MAP_HE3M8 )
 		{