From 5bf0b73c7042f529fc14c48478d9f7c17a55c2c9 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Thu, 20 Oct 2022 23:25:11 +0200 Subject: [PATCH] Fix achievement bars in stats tab overflowing. --- language.version | 4 ++-- zscript/kbase/swwm_kbasetab_stats.zsc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/language.version b/language.version index e86e8ea37..5941c172b 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r577 \cu(Thu 20 Oct 23:22:53 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r577 \cu(2022-10-20 23:22:53)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r578 \cu(Thu 20 Oct 23:25:11 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r578 \cu(2022-10-20 23:25:11)\c-"; diff --git a/zscript/kbase/swwm_kbasetab_stats.zsc b/zscript/kbase/swwm_kbasetab_stats.zsc index 4dc0c056c..eb63eda23 100644 --- a/zscript/kbase/swwm_kbasetab_stats.zsc +++ b/zscript/kbase/swwm_kbasetab_stats.zsc @@ -726,7 +726,7 @@ Class DemolitionistMenuAchievementItem : DemolitionistMenuListItem { int val = a.val; if ( val < a.maxval ) Screen.DrawTexture(BarTex[0],false,xx,yy+35,DTA_DestWidthF,width,DTA_VirtualWidthF,master.ss.x,DTA_VirtualHeightF,master.ss.y,DTA_KeepRatio,true); - Screen.DrawTexture(BarTex[completed?2:1],false,xx,yy+35,DTA_DestWidthF,width*(val/double(a.maxval)),DTA_VirtualWidthF,master.ss.x,DTA_VirtualHeightF,master.ss.y,DTA_KeepRatio,true); + Screen.DrawTexture(BarTex[completed?2:1],false,xx,yy+35,DTA_DestWidthF,width*(min(val,a.maxval)/double(a.maxval)),DTA_VirtualWidthF,master.ss.x,DTA_VirtualHeightF,master.ss.y,DTA_KeepRatio,true); str = String.Format("%s / %s",SWWMUtility.ThousandsNum(val),SWWMUtility.ThousandsNum(a.maxval)); int ox = (width-master.mTinyFont.StringWidth(str))/2; Screen.DrawText(master.mTinyFont,completed?Font.CR_GREEN:Font.CR_WHITE,xx+ox,yy+37,str,DTA_VirtualWidthF,master.ss.x,DTA_VirtualHeightF,master.ss.y,DTA_KeepRatio,true);