From adb0eac431cbc0d757d4027ac624417a64ecb991 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Mon, 11 Dec 2023 10:56:47 +0100 Subject: [PATCH] Enemy healthbar redesign. --- graphics/HUD/BossHealthBarBox.png | Bin 154 -> 171 bytes graphics/HUD/BossHealthBarBoxSmol.png | Bin 151 -> 167 bytes graphics/HUD/EnemyBox.png | Bin 122 -> 129 bytes language.version | 4 ++-- zscript/handler/swwm_handler_vanillaboss.zsc | 4 ++-- zscript/hud/swwm_hud_target.zsc | 4 ++-- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/graphics/HUD/BossHealthBarBox.png b/graphics/HUD/BossHealthBarBox.png index fed7aa36b122edc1de25b2edd5fd851b2102ae04..bd6dee7ed79cd5e8d486e5f7ff487a1c76f267f4 100644 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0y~yU^HN0VBlh5W?*1A=q$gVfq_9Tz$e7jA)($Op`L?B zfB_5=`u8gsI0#56KtwY4%T8usU|=l?@(cdYz`$^3)?NQ)3=9nBo-U3d6}OUCn25-< zI8<0Ucb#6qlES_6B-AJL@0ZkH!pp$Gz*G|C7tCmdKI;Vst0QdwbSO5S3 diff --git a/graphics/HUD/EnemyBox.png b/graphics/HUD/EnemyBox.png index c85a5db67e578b1dcffc8652d3fefecb0b6eb70f..d32edd9c6695e8e262afec90298e527e5849887a 100644 GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0y~yU@&7~U|{E9V_;x#PTqHwfq}up)5S5Q;#RW2gn%FC z4=R7SuefktqD8`lc!#>A0E2=b=MNkxNV7Z_S1E|2KS=xZr=->{wf& kT=Uc}p2N%syj>aAe^zB#n)-1&0|Nttr>mdKI;Vst09pJl{Qv*} literal 122 zcmeAS@N?(olHy`uVBq!ia0y~yU@&K3VBp|jV_;y2{hn^ez`)?>>EaktaVy#5#r^;H z6&Kb;B(gHM|L0L)c*L;M_%J88hepGnFZEZ77tfRaDl^xXT`RI-PGYNN1&hMG=BEFL c1(_M#>o4ak=G-@9U|?YIboFyt=akR{0A%ea)Bpeg 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();