From 27e979091bb9f274d59e68bdbcfb616ede19bffb Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Wed, 15 Jun 2022 10:58:47 +0200
Subject: [PATCH] Code cleanup.

---
 language.version                 |  4 ++--
 zscript/items/swwm_powerups.zsc  |  2 +-
 zscript/utility/swwm_utility.zsc | 30 ------------------------------
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/language.version b/language.version
index 029d8dfb4..b8bf8ee97 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.26 r1 \cu(Fri 17 Jun 23:02:08 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.2.26 r1 \cu(2022-06-17 23:02:08)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.26 r2 \cu(Fri 17 Jun 23:02:56 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.2.26 r2 \cu(2022-06-17 23:02:56)\c-";
diff --git a/zscript/items/swwm_powerups.zsc b/zscript/items/swwm_powerups.zsc
index 3e19657dd..79142f62a 100644
--- a/zscript/items/swwm_powerups.zsc
+++ b/zscript/items/swwm_powerups.zsc
@@ -1894,7 +1894,7 @@ Class SWWMLamp : Inventory
 			if ( (Charge >= Default.Charge) && (Amount+item.Amount > MaxAmount) )
 			{
 				// sell excess
-				int sellprice = SWWMUtility.Round100(abs(Stamina)*.7);
+				int sellprice = abs(Stamina)/2;
 				SWWMScoreObj.Spawn(sellprice,Owner.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+Owner.Height/2));
 				SWWMCredits.Give(Owner.player,sellprice);
 				if ( Owner.player )
diff --git a/zscript/utility/swwm_utility.zsc b/zscript/utility/swwm_utility.zsc
index 999db0cae..920f6d75e 100644
--- a/zscript/utility/swwm_utility.zsc
+++ b/zscript/utility/swwm_utility.zsc
@@ -354,31 +354,6 @@ Class SWWMUtility
 		return str;
 	}
 
-	static clearscope String BlockBar( int a, int b, int width, int acol, int bcol )
-	{
-		String str = "";
-		int blocks = clamp(int(a/double(b)*width),0,width);
-		int eblocks = width-blocks;
-		if ( blocks )
-		{
-			str.AppendCharacter(0x1C);
-			str.AppendCharacter(0x41+acol);
-		}
-		for ( int i=0; i<blocks; i++ ) str.AppendCharacter(0x258F);
-		if ( eblocks )
-		{
-			str.AppendCharacter(0x1C);
-			str.AppendCharacter(0x41+bcol);
-		}
-		for ( int i=0; i<eblocks; i++ ) str.AppendCharacter(0x258F);
-		if ( blocks || eblocks )
-		{
-			str.AppendCharacter(0x1C);
-			str.AppendCharacter(0x2D);
-		}
-		return str;
-	}
-
 	static clearscope void ObscureText( out String str, int seed )
 	{
 		int len = str.CodePointCount();
@@ -729,11 +704,6 @@ Class SWWMUtility
 		SetToSlopeSpecific(a,dang,plane,flipnorm);
 	}
 
-	static clearscope int Round100( double x )
-	{
-		return int(ceil(x/100.)*100.);
-	}
-
 	static clearscope bool IsDoorSector( Sector s, int part )
 	{
 		// super-easy mode: check for boss special sectors