From b9a58adabc2653c4dfa1402a035b529e9179f8e9 Mon Sep 17 00:00:00 2001 From: Marisa the Magician 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 666d056f6..b7a270707 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r122 \cu(Tue 14 Jun 23:34:14 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r122 \cu(2022-06-14 23:34:14)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r123 \cu(Wed 15 Jun 10:58:47 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r123 \cu(2022-06-15 10:58:47)\c-"; diff --git a/zscript/items/swwm_powerups.zsc b/zscript/items/swwm_powerups.zsc index 8044273dc..aafef0339 100644 --- a/zscript/items/swwm_powerups.zsc +++ b/zscript/items/swwm_powerups.zsc @@ -1896,7 +1896,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 193c76b76..5afb20249 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