From a24972697f3fd89fc87372a38ede80064ffcc7a1 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Wed, 19 Aug 2020 20:34:53 +0200 Subject: [PATCH] Localizable units by request. --- language.def_base | 4 ++++ language.version | 2 +- zscript/swwm_hud.zsc | 4 ++-- zscript/swwm_menu.zsc | 16 ++++++++-------- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/language.def_base b/language.def_base index 56dab6cec..deb7db721 100644 --- a/language.def_base +++ b/language.def_base @@ -790,6 +790,10 @@ D_BARRIER = "The Elemental Coating wore off."; SWWM_YNYKRONREADY = "Ynykron Artifact ready for firing."; SWWM_TITLEPRESENTS = "presents"; SWWM_TITLEMODBY = "a mod by \cxMarisa Kirisame"; +SWWM_UNIT_METER = "m"; +SWWM_UNIT_KILOMETER = "km"; +SWWM_UNIT_KPH = "km/h"; +SWWM_UNIT_LITER = "l"; // boss tags BT_BRUISERS = "Bruiser Brothers"; BT_CYBIE = "Tyrant of Babel"; diff --git a/language.version b/language.version index 8070e1e15..93fa80562 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \cwGZ\c- r495 (Tue 18 Aug 17:36:40 CEST 2020)"; +SWWM_MODVER="\chSWWM \cwGZ\c- r496 (Wed 19 Aug 20:34:53 CEST 2020)"; diff --git a/zscript/swwm_hud.zsc b/zscript/swwm_hud.zsc index cbb8c5415..80699a08a 100644 --- a/zscript/swwm_hud.zsc +++ b/zscript/swwm_hud.zsc @@ -642,8 +642,8 @@ Class SWWMStatusBar : BaseStatusBar static private string FormatDist( double dist ) { double meters = dist/32.; - if ( meters > 1000. ) return String.Format("\cj%d\cckm",int(meters/1000.)); - return String.Format("\cj%d\ccm",int(meters)); + if ( meters > 1000. ) return String.Format("\cj%d\cc%s",int(meters/1000.),StringTable.Localize("$SWWM_UNIT_KILOMETER")); + return String.Format("\cj%d\cc%s",int(meters),StringTable.Localize("$SWWM_UNIT_METER")); } private void DrawTarget() diff --git a/zscript/swwm_menu.zsc b/zscript/swwm_menu.zsc index 99cb8f96b..b316a251c 100644 --- a/zscript/swwm_menu.zsc +++ b/zscript/swwm_menu.zsc @@ -2144,16 +2144,16 @@ Class SWWMKnowledgeBaseMenu : GenericMenu str = String.Format("\cx%s\c-%02d\cu:\c-%02d\cu:\c-%02d",StringTable.Localize("$SWWM_STATUPTIME"),thour,tmin,tsec); Screen.DrawText(fnt,Font.CR_WHITE,origin.x+xx,origin.y+yy,str,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); yy += 16; - if ( stats.grounddist > 32000. ) str = String.Format("\cx%s\c-%g\cukm\c-",StringTable.Localize("$SWWM_STATONFOOT"),stats.grounddist/32000.); - else str = String.Format("\cx%s\c-%g\cum\c-",StringTable.Localize("$SWWM_STATONFOOT"),stats.grounddist/32.); + if ( stats.grounddist > 32000. ) str = String.Format("\cx%s\c-%g\cu%s\c-",StringTable.Localize("$SWWM_STATONFOOT"),stats.grounddist/32000.,StringTable.Localize("$SWWM_UNIT_METER")); + else str = String.Format("\cx%s\c-%g\cu%s\c-",StringTable.Localize("$SWWM_STATONFOOT"),stats.grounddist/32.,StringTable.Localize("$SWWM_UNIT_METER")); Screen.DrawText(fnt,Font.CR_WHITE,origin.x+xx,origin.y+yy,str,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); yy += 16; - if ( stats.airdist > 32000. ) str = String.Format("\cx%s\c-%g\cukm\c-",StringTable.Localize("$SWWM_STATFLIGHT"),stats.airdist/32000.); - else str = String.Format("\cx%s\c-%g\cum\c-",StringTable.Localize("$SWWM_STATFLIGHT"),stats.airdist/32.); + if ( stats.airdist > 32000. ) str = String.Format("\cx%s\c-%g\cu%s\c-",StringTable.Localize("$SWWM_STATFLIGHT"),stats.airdist/32000.,StringTable.Localize("$SWWM_UNIT_KILOMETER")); + else str = String.Format("\cx%s\c-%g\cu%s\c-",StringTable.Localize("$SWWM_STATFLIGHT"),stats.airdist/32.,StringTable.Localize("$SWWM_UNIT_METER")); Screen.DrawText(fnt,Font.CR_WHITE,origin.x+xx,origin.y+yy,str,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); yy += 16; - if ( stats.swimdist > 32000. ) str = String.Format("\cx%s\c-%g\cukm\c-",StringTable.Localize("$SWWM_STATSWIM"),stats.swimdist/32000.); - else str = String.Format("\cx%s\c-%g\cum\c-",StringTable.Localize("$SWWM_STATSWIM"),stats.swimdist/32.); + if ( stats.swimdist > 32000. ) str = String.Format("\cx%s\c-%g\cu%s\c-",StringTable.Localize("$SWWM_STATSWIM"),stats.swimdist/32000.,StringTable.Localize("$SWWM_UNIT_KILOMETER")); + else str = String.Format("\cx%s\c-%g\cu%s\c-",StringTable.Localize("$SWWM_STATSWIM"),stats.swimdist/32.,StringTable.Localize("$SWWM_UNIT_METER")); Screen.DrawText(fnt,Font.CR_WHITE,origin.x+xx,origin.y+yy,str,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); yy += 16; str = String.Format("\cx%s\c-%d",StringTable.Localize("$SWWM_STATBOOST"),stats.boostcount); @@ -2165,10 +2165,10 @@ Class SWWMKnowledgeBaseMenu : GenericMenu str = String.Format("\cx%s\c-%d",StringTable.Localize("$SWWM_STATSTOMP"),stats.stompcount); Screen.DrawText(fnt,Font.CR_WHITE,origin.x+xx,origin.y+yy,str,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); yy += 16; - str = String.Format("\cx%s\c-%g\cul\c-",StringTable.Localize("$SWWM_STATFUEL"),stats.fuelusage/60.); + str = String.Format("\cx%s\c-%g\cu%s\c-",StringTable.Localize("$SWWM_STATFUEL"),stats.fuelusage/60.,StringTable.Localize("$SWWM_UNIT_LITER")); Screen.DrawText(fnt,Font.CR_WHITE,origin.x+xx,origin.y+yy,str,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); yy += 16; - str = String.Format("\cx%s\c-%g\cukm/h\c-",StringTable.Localize("$SWWM_STATSPEED"),stats.topspeed*32000./(3600*Thinker.TICRATE)); + str = String.Format("\cx%s\c-%g\cu%s\c-",StringTable.Localize("$SWWM_STATSPEED"),stats.topspeed*32000./(3600*Thinker.TICRATE),StringTable.Localize("$SWWM_UNIT_KPH")); Screen.DrawText(fnt,Font.CR_WHITE,origin.x+xx,origin.y+yy,str,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); yy += 16; thour = (stats.airtime/(3600*Thinker.TICRATE));