diff --git a/graphics/HUD/BossHealthBarBox.png b/graphics/HUD/BossHealthBarBox.png index fed7aa36b..bd6dee7ed 100644 Binary files a/graphics/HUD/BossHealthBarBox.png and b/graphics/HUD/BossHealthBarBox.png differ diff --git a/graphics/HUD/BossHealthBarBoxSmol.png b/graphics/HUD/BossHealthBarBoxSmol.png index e6ea4b265..443926649 100644 Binary files a/graphics/HUD/BossHealthBarBoxSmol.png and b/graphics/HUD/BossHealthBarBoxSmol.png differ diff --git a/graphics/HUD/EnemyBox.png b/graphics/HUD/EnemyBox.png index c85a5db67..d32edd9c6 100644 Binary files a/graphics/HUD/EnemyBox.png and b/graphics/HUD/EnemyBox.png differ diff --git a/language.version b/language.version index 09ab42efa..5d66b1041 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1048 \cu(Sun 10 Dec 10:56:48 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r1048 \cu(2023-12-10 10:56:48)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1049 \cu(Mon 11 Dec 10:56:47 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r1049 \cu(2023-12-11 10:56:47)\c-"; diff --git a/zscript/handler/swwm_handler_vanillaboss.zsc b/zscript/handler/swwm_handler_vanillaboss.zsc index 884504218..fd1011774 100644 --- a/zscript/handler/swwm_handler_vanillaboss.zsc +++ b/zscript/handler/swwm_handler_vanillaboss.zsc @@ -583,7 +583,7 @@ extend Class SWWMHandler { double calph = clamp(((lastcummtic+150)-gametic)/50.,0.,1.); string dnum = String.Format("%d",cummdamage); - Screen.DrawText(mTinyFont,Font.CR_RED,vpos.x+intsz-mTinyFont.StringWidth(dnum),vpos.y-(mTinyFont.GetHeight()+2),dnum,DTA_VirtualWidthF,bar.ss.x,DTA_VirtualHeightF,bar.ss.y,DTA_KeepRatio,true,DTA_Alpha,bossalpha*calph); + Screen.DrawText(mTinyFont,Font.CR_RED,(vpos.x+intsz)-(mTinyFont.StringWidth(dnum)+2),vpos.y-mTinyFont.GetHeight(),dnum,DTA_VirtualWidthF,bar.ss.x,DTA_VirtualHeightF,bar.ss.y,DTA_KeepRatio,true,DTA_Alpha,bossalpha*calph); } String bname = bosstag; if ( (bname.Left(1) == "$") && swwm_funtags ) @@ -591,7 +591,7 @@ extend Class SWWMHandler String fun = bname.."_FUN"; if ( !(StringTable.Localize(fun) ~== fun.Mid(1)) ) bname = fun; } - Screen.DrawText(mSmallFont,Font.CR_WHITE,vpos.x,vpos.y-(mSmallFont.GetHeight()+2),StringTable.Localize(bname),DTA_VirtualWidthF,bar.ss.x,DTA_VirtualHeightF,bar.ss.y,DTA_KeepRatio,true,DTA_Alpha,bossalpha); + Screen.DrawText(mSmallFont,Font.CR_WHITE,vpos.x+3,vpos.y-mSmallFont.GetHeight(),StringTable.Localize(bname),DTA_VirtualWidthF,bar.ss.x,DTA_VirtualHeightF,bar.ss.y,DTA_KeepRatio,true,DTA_Alpha,bossalpha); } // can't use this until I actually figure out how to make those walls damageable diff --git a/zscript/hud/swwm_hud_target.zsc b/zscript/hud/swwm_hud_target.zsc index d0870993d..2581dfb3a 100644 --- a/zscript/hud/swwm_hud_target.zsc +++ b/zscript/hud/swwm_hud_target.zsc @@ -217,10 +217,10 @@ extend Class SWWMStatusBar Screen.DrawTexture(EnemyHTex[2],false,barpos.x+2,barpos.y+2,DTA_VirtualWidthF,ss1.x,DTA_VirtualHeightF,ss1.y,DTA_KeepRatio,true,DTA_Alpha,alph,DTA_WindowLeftF,ohw,DTA_WindowRightF,hw); if ( ct.cummdamage <= 0 ) continue; double calph = clamp(ct.cummspan-fractic,0.,20.)/20.; - Screen.DrawText(MiniHUDFontOutline,mhudfontcol[MCR_RED],barpos.x+3,barpos.y+10,(ct.cummdamage>=Actor.TELEFRAG_DAMAGE)?"∞":String.Format("%d",ct.cummdamage),DTA_VirtualWidthF,ss1.x,DTA_VirtualHeightF,ss1.y,DTA_KeepRatio,true,DTA_Alpha,calph*alph); + Screen.DrawText(MiniHUDFontOutline,mhudfontcol[MCR_RED],barpos.x+4,barpos.y+8,(ct.cummdamage>=Actor.TELEFRAG_DAMAGE)?"∞":String.Format("%d",ct.cummdamage),DTA_VirtualWidthF,ss1.x,DTA_VirtualHeightF,ss1.y,DTA_KeepRatio,true,DTA_Alpha,calph*alph); if ( ct.cummflash <= 0 ) continue; double falph = max((ct.cummflash-FracTic)/15.,0.)**1.5; - Screen.DrawText(MiniHUDFontOutline,mhudfontcol[MCR_REDFLASH],barpos.x+3,barpos.y+10,(ct.cummdamage>=Actor.TELEFRAG_DAMAGE)?"∞":String.Format("%d",ct.cummdamage),DTA_VirtualWidthF,ss1.x,DTA_VirtualHeightF,ss1.y,DTA_KeepRatio,true,DTA_Alpha,falph*calph*alph,DTA_LegacyRenderStyle,STYLE_Add); + Screen.DrawText(MiniHUDFontOutline,mhudfontcol[MCR_REDFLASH],barpos.x+4,barpos.y+8,(ct.cummdamage>=Actor.TELEFRAG_DAMAGE)?"∞":String.Format("%d",ct.cummdamage),DTA_VirtualWidthF,ss1.x,DTA_VirtualHeightF,ss1.y,DTA_KeepRatio,true,DTA_Alpha,falph*calph*alph,DTA_LegacyRenderStyle,STYLE_Add); } // player-owned trackers are drawn last cti.Reinit();