From 6a6c26f307c640862a697a2d9451a6bf4f51129f Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Mon, 27 Nov 2023 15:44:23 +0100
Subject: [PATCH] Reset weapon pickup voicelines only when inventory is wiped.

---
 language.version                              |  4 ++--
 zscript/handler/swwm_handler_playerevents.zsc | 23 ++-----------------
 zscript/player/swwm_player_inventory.zsc      |  2 ++
 zscript/swwm_thinkers_player.zsc              | 22 ++++++++++++++++++
 zscript/utility/swwm_utility_item.zsc         |  3 +++
 5 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/language.version b/language.version
index 4f040a727..f03eb2f7b 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1024 \cu(Sun 26 Nov 20:45:51 CET 2023)\c-";
-SWWM_SHORTVER="\cw1.3pre r1024 \cu(2023-11-26 20:45:51)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1025 \cu(Mon 27 Nov 15:44:23 CET 2023)\c-";
+SWWM_SHORTVER="\cw1.3pre r1025 \cu(2023-11-27 15:44:23)\c-";
diff --git a/zscript/handler/swwm_handler_playerevents.zsc b/zscript/handler/swwm_handler_playerevents.zsc
index 12ab6b9ab..b6ef06db3 100644
--- a/zscript/handler/swwm_handler_playerevents.zsc
+++ b/zscript/handler/swwm_handler_playerevents.zsc
@@ -100,27 +100,8 @@ extend Class SWWMHandler
 				s.GotWeapon(Weapon(i).GetClass());
 			}
 		}
-		else if ( (s.lastcluster != level.cluster) || !(level.clusterflags&LevelLocals.CLUSTER_HUB) || (level.info.flags2&LEVEL2_RESETINVENTORY && !e.IsReturn) )
-		{
-			// clear the "weapon got" lists for weapons we don't have anymore (unless we're in a hub)
-			// so the obtain lines play again
-			for ( int i=0; i<s.alreadygot.Size(); i++ )
-			{
-				// special case for dual weapons
-				String cn = s.alreadygot[i].GetClassName();
-				if ( (cn.Left(4) ~== "Dual") )
-				{
-					int ss = p.mo.CountInv(GetDefaultByType(s.alreadygot[i]).SisterWeaponType);
-					if ( ss == 2 ) continue;
-					s.alreadygot.Delete(i);
-					i--;
-					continue;
-				}
-				if ( p.mo.FindInventory(s.alreadygot[i]) ) continue;
-				s.alreadygot.Delete(i);
-				i--;
-			}
-		}
+		else if ( level.info.flags2&LEVEL2_RESETINVENTORY && !e.IsReturn )
+			s.CleanGotWeapons(); // clean up the "got weapons" so their obtain lines are played again
 		// reset some vars
 		multilevel[e.playernumber] = 0;
 		spreecount[e.playernumber] = 0;
diff --git a/zscript/player/swwm_player_inventory.zsc b/zscript/player/swwm_player_inventory.zsc
index 1384f3a82..def718fdb 100644
--- a/zscript/player/swwm_player_inventory.zsc
+++ b/zscript/player/swwm_player_inventory.zsc
@@ -48,6 +48,8 @@ extend Class Demolitionist
 			}
 			else last = i;
 		}
+		// clean up the "got weapons" so their obtain lines are played again
+		if ( mystats ) mystats.CleanGotWeapons();
 	}
 
 	override void RemoveInventory( Inventory item )
diff --git a/zscript/swwm_thinkers_player.zsc b/zscript/swwm_thinkers_player.zsc
index f180ceaf6..003b6938c 100644
--- a/zscript/swwm_thinkers_player.zsc
+++ b/zscript/swwm_thinkers_player.zsc
@@ -118,6 +118,28 @@ Class SWWMStats : SWWMStaticThinker
 		return false;
 	}
 
+	void CleanGotWeapons()
+	{
+		// clean up the list of weapons we don't have anymore
+		// so the obtain lines play again
+		for ( int i=0; i<alreadygot.Size(); i++ )
+		{
+			// special case for dual weapons
+			String cn = alreadygot[i].GetClassName();
+			if ( (cn.Left(4) ~== "Dual") )
+			{
+				int ss = myplayer.mo.CountInv(GetDefaultByType(alreadygot[i]).SisterWeaponType);
+				if ( ss == 2 ) continue;
+				alreadygot.Delete(i);
+				i--;
+				continue;
+			}
+			if ( myplayer.mo.FindInventory(alreadygot[i]) ) continue;
+			alreadygot.Delete(i);
+			i--;
+		}
+	}
+
 	private Class<Weapon> WeaponFromInflictor( Actor inflictor, Name damagetype )
 	{
 		Class<Weapon> which = myplayer.ReadyWeapon?myplayer.ReadyWeapon.GetClass():null;
diff --git a/zscript/utility/swwm_utility_item.zsc b/zscript/utility/swwm_utility_item.zsc
index 435828e5b..a082ab9c9 100644
--- a/zscript/utility/swwm_utility_item.zsc
+++ b/zscript/utility/swwm_utility_item.zsc
@@ -31,6 +31,9 @@ extend Class SWWMUtility
 		p.mo.GiveDefaultInventory();
 		p.mo.BringUpWeapon();
 		p.health = p.mo.Health = p.mo.SpawnHealth();
+		// weapon pickup line stuff
+		SWWMStats s = SWWMStats.Find(p);
+		if ( s ) s.CleanGotWeapons();
 	}
 
 	// sets all carried ammo back to zero