diff --git a/language.version b/language.version index 380933731..e0f8ee791 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1064 \cu(Fri 22 Dec 08:18:51 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r1064 \cu(2023-12-22 08:18:51)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1065 \cu(Sat 23 Dec 15:33:09 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r1065 \cu(2023-12-23 15:33:09)\c-"; diff --git a/zscript/menu/swwm_inter.zsc b/zscript/menu/swwm_inter.zsc index 9e15ee6bf..49b2f4c4e 100644 --- a/zscript/menu/swwm_inter.zsc +++ b/zscript/menu/swwm_inter.zsc @@ -75,15 +75,15 @@ Class SWWMStatScreen : StatusScreen topheight = (statheight+lfheight+elheight+32); mtipheight = (5*TewiFont.GetHeight()+32); // tips don't generally go past 5 lines in height // defaults - lnamecolor = Font.FindFontColor('MiniWhite'); - lauthcolor = Font.FindFontColor('MiniIbukiHUD'); - lsubcolor = Font.FindFontColor('MiniCyanblu'); - statbasecolor = Font.FindFontColor('MiniCyanblu'); - statcolor0 = Font.FindFontColor('MiniWhite'); - statcolor1 = Font.FindFontColor('MiniBrass'); - statcolor2 = Font.FindFontColor('MiniRed'); - tipcolor0 = Font.FindFontColor('MiniCyanblu'); - tipcolor1 = Font.FindFontColor('MiniWhite'); + lnamecolor = Font.CR_WHITE; + lauthcolor = Font.CR_DARKGRAY; + lsubcolor = Font.CR_SAPPHIRE; + statbasecolor = Font.CR_SAPPHIRE; + statcolor0 = Font.CR_WHITE; + statcolor1 = Font.CR_GOLD; + statcolor2 = Font.CR_RED; + tipcolor0 = Font.CR_SAPPHIRE; + tipcolor1 = Font.CR_WHITE; flashcolor = Font.FindFontColor('MiniFlash'); tipflashcolor = Font.FindFontColor('MiniWhiteFlash'); glarecolor = 0xFF4080FF; @@ -96,7 +96,7 @@ Class SWWMStatScreen : StatusScreen private String StatCnt( int a, int b ) { if ( b <= 0 ) return "N/A"; - return String.Format("%s \c[MiniIbukiHUD]/\c- %s \c[MiniIbukiHUD](\c-%3d%%\c[MiniIbukiHUD])",SWWMUtility.ThousandsNum(max(a,0)),SWWMUtility.ThousandsNum(b),GetPct(a,b)); + return String.Format("%s \cu/\c- %s \cu(\c-%3d%%\cu)",SWWMUtility.ThousandsNum(max(a,0)),SWWMUtility.ThousandsNum(b),GetPct(a,b)); } private String TimeStr( int secs ) @@ -105,8 +105,8 @@ Class SWWMStatScreen : StatusScreen int h = secs/3600; int m = (secs/60)%60; int s = secs%60; - if ( h ) return String.Format("%02d\c[MiniIbukiHUD]:\c-%02d\c[MiniIbukiHUD]:\c-%02d",h,m,s); - return String.Format("%02d\c[MiniIbukiHUD]:\c-%02d",m,s); + if ( h ) return String.Format("%02d\cu:\c-%02d\cu:\c-%02d",h,m,s); + return String.Format("%02d\cu:\c-%02d",m,s); } private int GetPct( int a, int b )