From c166501b15dd2b01585582018fc247dbb390ffc9 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sun, 25 Jul 2021 16:46:47 +0200
Subject: [PATCH] Don't flag embiggeners with COUNTITEM (fixes inability to get
 100% items in Akeldama MAP02). Small code cleanup.

---
 language.version                 |  4 ++--
 zscript/items/swwm_ammoextra.zsc |  9 +--------
 zscript/menu/swwm_menus.zsc      | 30 +++++++++++-------------------
 zscript/utility/swwm_utility.zsc | 13 +++++++++++++
 4 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/language.version b/language.version
index 24dd69886..24cd55bb5 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r581 \cu(Sun 25 Jul 16:25:29 CEST 2021)\c-";
-SWWM_SHORTVER="\cw0.9.11b-pre r581 \cu(2021-07-25 16:25:29)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r581 \cu(Sun 25 Jul 16:46:47 CEST 2021)\c-";
+SWWM_SHORTVER="\cw0.9.11b-pre r581 \cu(2021-07-25 16:46:47)\c-";
diff --git a/zscript/items/swwm_ammoextra.zsc b/zscript/items/swwm_ammoextra.zsc
index b77701bf1..77b880e58 100644
--- a/zscript/items/swwm_ammoextra.zsc
+++ b/zscript/items/swwm_ammoextra.zsc
@@ -522,7 +522,6 @@ Class HammerspaceEmbiggener : Inventory
 		+INVENTORY.UNDROPPABLE;
 		+INVENTORY.UNTOSSABLE;
 		+INVENTORY.ALWAYSPICKUP;
-		+COUNTITEM;
 		+FLOATBOB;
 		FloatBobStrength 0.25;
 		Radius 8;
@@ -539,13 +538,7 @@ Class HammerspaceEmbiggener : Inventory
 
 // used when cheating or trading, this version does not give ammo and is meant
 // only for GiveInventory, so it shouldn't be spawned in the world
-Class TradedHammerspaceEmbiggener : HammerspaceEmbiggener
-{
-	Default
-	{
-		-COUNTITEM;
-	}
-}
+Class TradedHammerspaceEmbiggener : HammerspaceEmbiggener {}
 
 // used to denote "merged" embiggeners, changes color based on amount
 //  green (2+)
diff --git a/zscript/menu/swwm_menus.zsc b/zscript/menu/swwm_menus.zsc
index 8c695182e..e9ece8cd4 100644
--- a/zscript/menu/swwm_menus.zsc
+++ b/zscript/menu/swwm_menus.zsc
@@ -431,13 +431,9 @@ Class SWWMBigMenuHack : SWWMCleanMenu
 			isclean = true;
 		}
 		String str = "⌃ ⌃ ⌃";
-		int x = (w-markfont.StringWidth(str))/2;
-		int y = (h-280)/2;
-		if ( isclean )
-		{
-			x = (x-160)*CleanXFac_1+(Screen.GetWidth()/2);
-			y = (y-100)*CleanYFac_1+(Screen.GetHeight()/2);
-		}
+		double x = (w-markfont.StringWidth(str))/2;
+		double y = (h-280)/2;
+		if ( isclean ) SWWMUtility.AdjustClean_1(x,y);
 		if ( ofs > 0 )
 		{
 			if ( isclean ) Screen.DrawText(markfont,Font.CR_FIRE,x,y+30*CleanYFac_1,str,DTA_CleanNoMove_1,true);
@@ -537,8 +533,8 @@ Class ListMenuItemSWWMStaticTextM : ListMenuItem
 		if ( w == ListMenuDescriptor.CleanScale )
 		{
 			double x = (320-fnt.StringWidth(text)*3)/2;
-			x = (x-160)*CleanXFac_1+(Screen.GetWidth()*.5);
-			double y = (mYpos-100)*CleanYFac_1+(Screen.GetHeight()*.5);
+			double y = mYpos;
+			SWWMUtility.AdjustClean_1(x,y);
 			Screen.DrawText(fnt,mColor,x,y,text,DTA_ScaleX,3.*CleanXFac_1,DTA_ScaleY,3.*CleanYFac_1);
 		}
 		else
@@ -573,9 +569,8 @@ class ListMenuItemSWWMLogo : ListMenuItem
 		if ( w == ListMenuDescriptor.CleanScale )
 		{
 			x = (320-vs.x)/2;
-			x = (x-160)*CleanXFac_1+(Screen.GetWidth()*.5);
 			double y = -48;
-			y = (y-100)*CleanYFac_1+(Screen.GetHeight()*.5);
+			SWWMUtility.AdjustClean_1(x,y);
 			Screen.DrawTexture(mTexture,false,x,y,DTA_ScaleX,CleanXFac_1*scl,DTA_ScaleY,CleanYFac_1*scl);
 		}
 		else
@@ -733,8 +728,7 @@ class ListMenuItemSWWMTextItemM : ListMenuItemSelectable
 			{
 				// due to specifics of how DTA_Clean works we can't combine with with DTA_ScaleX/Y
 				// so we have to set the scaling manually
-				xx = (xx-160)*CleanXFac_1+(Screen.GetWidth()*.5);
-				y = (y-100)*CleanYFac_1+(Screen.GetHeight()*.5);
+				SWWMUtility.AdjustClean_1(xx,y);
 				for ( int i=0, pos=0; i<tlen; i++ )
 				{
 					int ch;
@@ -760,8 +754,7 @@ class ListMenuItemSWWMTextItemM : ListMenuItemSelectable
 		{
 			// due to specifics of how DTA_Clean works we can't combine with with DTA_ScaleX/Y
 			// so we have to set the scaling manually
-			x = (x-160)*CleanXFac_1+(Screen.GetWidth()*.5);
-			y = (y-100)*CleanYFac_1+(Screen.GetHeight()*.5);
+			SWWMUtility.AdjustClean_1(x,y);
 			Screen.DrawText(fnt,Font.CR_WHITE,x,y,text,DTA_ScaleX,3.*CleanXFac_1,DTA_ScaleY,3.*CleanYFac_1);
 		}
 		else Screen.DrawText(fnt,Font.CR_WHITE,x,y,text,DTA_VirtualWidth,w,DTA_VirtualHeight,h,DTA_FullscreenScale,FSMode_ScaleToFit43,DTA_ScaleX,3.,DTA_ScaleY,3.);
@@ -778,11 +771,10 @@ class ListMenuItemSWWMTextItemM : ListMenuItemSelectable
 			xofs *= CleanXFac_1;
 			yofs *= CleanYFac_1;
 			double x = (320-GetWidth())/2;
-			x = (x-160)*CleanXFac_1+(Screen.GetWidth()*.5);
-			y = (y-100)*CleanYFac_1+(Screen.GetHeight()*.5);
+			SWWMUtility.AdjustClean_1(x,y);
 			Screen.DrawTexture(tex,true,x+xofs,y+yofs,DTA_CleanNoMove_1,true,DTA_CenterOffset,true,DTA_Rotate,15.*sin(8*Menu.MenuTime()));
 			x = (320+GetWidth())/2;
-			x = (x-160)*CleanXFac_1+(Screen.GetWidth()*.5);
+			SWWMUtility.AdjustClean_1x(x);
 			Screen.DrawTexture(tex,true,x-xofs,y+yofs,DTA_CleanNoMove_1,true,DTA_CenterOffset,true,DTA_Rotate,-15.*sin(8*Menu.MenuTime()));
 		}
 		else
@@ -795,7 +787,7 @@ class ListMenuItemSWWMTextItemM : ListMenuItemSelectable
 	}
 }
 
-// for compat with non-text episodes
+// for compat with non-text episodes (no longer used?)
 Class ListMenuItemSWWMPatchItemM : ListMenuItemSelectable
 {
 	TextureID mTexture;
diff --git a/zscript/utility/swwm_utility.zsc b/zscript/utility/swwm_utility.zsc
index 2e27e882a..b773dc925 100644
--- a/zscript/utility/swwm_utility.zsc
+++ b/zscript/utility/swwm_utility.zsc
@@ -201,6 +201,17 @@ Class SWWMUtility
 			&& (vpos.y == clamp(vpos.y,d.viewy,d.viewy+d.viewh)));
 	}
 
+	// less code duplication
+	static void AdjustClean_1( out double x, out double y )
+	{
+		x = (x-160)*CleanXFac_1+(Screen.GetWidth()*.5);
+		y = (y-100)*CleanYFac_1+(Screen.GetHeight()*.5);
+	}
+	static void AdjustClean_1x( out double x )
+	{
+		x = (x-160)*CleanXFac_1+(Screen.GetWidth()*.5);
+	}
+
 	// thanks zscript
 	static clearscope double fract( double a )
 	{
@@ -1644,6 +1655,8 @@ Class SWWMUtility
 	{
 		if ( target is 'Key' )
 			return true;
+		if ( target is 'HammerspaceEmbiggener' )
+			return true;
 		return target.bCOUNTITEM;
 	}