From 61824088ff595392c2ddbbb1bcc2559ed5f55863 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Fri, 5 Nov 2021 23:29:14 +0100
Subject: [PATCH] Fix handling of inventory resets.

---
 language.version                 |  4 ++--
 zscript/utility/swwm_utility.zsc | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/language.version b/language.version
index 6af5825c2..b205b5821 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.39 \cu(Fri  5 Nov 20:53:58 CET 2021)\c-";
-SWWM_SHORTVER="\cw1.1.39 \cu(2021-11-05 20:53:58)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.40 \cu(Fri  5 Nov 23:29:26 CET 2021)\c-";
+SWWM_SHORTVER="\cw1.1.40 \cu(2021-11-05 23:29:26)\c-";
diff --git a/zscript/utility/swwm_utility.zsc b/zscript/utility/swwm_utility.zsc
index 14ff99a72..926b84969 100644
--- a/zscript/utility/swwm_utility.zsc
+++ b/zscript/utility/swwm_utility.zsc
@@ -1877,18 +1877,24 @@ Class SWWMUtility
 	}
 
 	// sets all carried ammo back to zero
+	// resets hammerspace capacity
 	static play void ResetAmmo( Actor mo )
 	{
 		PlayerInfo p = mo.player;
 		if ( !p || !p.mo ) return;
 		for ( Inventory i=p.mo.inv; i; i=i.inv )
 		{
-			if ( !(i is 'Ammo') ) continue;
-			i.Amount = 0;
+			if ( i is 'Ammo' )
+			{
+				i.Amount = 0;
+				i.MaxAmount = i.default.MaxAmount;
+			}
+			if ( i is 'HammerspaceEmbiggener' )
+				i.Amount = 0;
 		}
 	}
 
-	// removes all carried items that aren't weapons or ammo
+	// removes all usable items
 	static play void ResetItems( Actor mo )
 	{
 		PlayerInfo p = mo.player;
@@ -1897,7 +1903,7 @@ Class SWWMUtility
 		while ( last.inv )
 		{
 			let inv = last.inv;
-			if ( (inv is 'SWWMCollectible') || (inv is 'Weapon') || (inv is 'Ammo') || (inv is 'SWWMArmor') )
+			if ( !inv.bINVBAR )
 			{
 				last = inv;
 				continue;