From 4c92cb796a7408268e576018b02131a37daf8090 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Tue, 16 Jan 2024 10:40:28 +0100 Subject: [PATCH] Small tweak to some HUD colors. --- docimg/hudsample.png | Bin 13264 -> 18372 bytes graphics/HUD/EnemyBar2.png | Bin 82 -> 85 bytes graphics/HUD/EnemyBar3.png | Bin 82 -> 86 bytes graphics/HUD/FuelBar.png | Bin 102 -> 106 bytes graphics/HUD/HealthBar2.png | Bin 97 -> 103 bytes graphics/HUD/HealthBar3.png | Bin 96 -> 106 bytes language.version | 4 +-- zscript/hud/swwm_hud_status.zsc | 2 +- zscript/hud/swwm_hud_target.zsc | 45 ++++++++++++++++++++------------ 9 files changed, 32 insertions(+), 19 deletions(-) diff --git a/docimg/hudsample.png b/docimg/hudsample.png index 6923f9cdd4b19383192c38297e37ed96eb53b8d1..b62812a1fb826b018b7599f3a6c66c4c6cd98314 100644 GIT binary patch literal 18372 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 BNYelS diff --git a/graphics/HUD/EnemyBar2.png b/graphics/HUD/EnemyBar2.png index b4cae62216798acc4458794caf54c39a848cbbf0..f02a35943482c5e215f786f5071b924860608d67 100644 GIT binary patch delta 54 zcmWFvouFbU-yHCD)AGHaB00WT<(@Y{MDV9mK%Ez~JfX K=d#Wzp$Pye3KNq6 delta 51 zcmWFynxLX5>FMGaQgJKUBiX{3L(rM|@PEe+3AXeMMut7shr$i-b=fj7Ffe$!`njxg HN@xNArgIQL diff --git a/graphics/HUD/EnemyBar3.png b/graphics/HUD/EnemyBar3.png index 2eed5758f3ec21209caad2d2c752e6ac018f2b1b..b4895fad52c62457749932465eeb5cba372e36a3 100644 GIT binary patch delta 55 zcmWFvo1kJO>*?YcB5^snrtH$B#1D*Op03{yzF718dpVy|IwM0-D$A$Ty^q#1FfcH9 My85}Sb4q9e0Ci>-F#rGn delta 51 zcmWFwnxLX5>FMGaQgJKUVsl`zfKuE4@?LhuB#Ai-Ss4;Nq;1OhCU|{fc^>bP0 Hl+XkK#OM&J diff --git a/graphics/HUD/FuelBar.png b/graphics/HUD/FuelBar.png index 6d00f1d5338b1899ca4d2afa2acb89254f17941d..11ca8ebf152547d3aed99a81d0621e2ecfce65bb 100644 GIT binary patch delta 75 zcmYexnxNul=;`7ZqH#Xi#4ovlIk|1i^JAMI#K^bJJb(F;q#L6t!|BhPInG74Z9Y+y gev#FU@h1br!A@?ghIZ{d1_lNOPgg&ebxsLQ0Isec5dZ)H delta 71 zcmc~wo1o&P>*?YcQgQ3;@rAq$20Y9M!`r_4$(=IZs-t3JaA~5p%jA~KZIyFGT{Aq> c&Uf+8+j0F)%Cv?i1_lNOPgg&ebxsLQ000dfTL1t6 diff --git a/graphics/HUD/HealthBar2.png b/graphics/HUD/HealthBar2.png index b4858b97009fff93f9f5d1f705d7ec36a6b6fa9d..a12363828e7b21ceb2c422bfb4a3faa24b5f93b4 100644 GIT binary patch delta 84 zcmYdHpCIAS!NkD8V54#G4+8^(o~Mgrh{fsTFR3$58gO+m>rCP~ws@gKPJ(AIo7l(3 puRRanWM~LTN1S(O?#^IfcxS=#qwUOGX9fla22WQ%mvv4FO#snQ9y9;| delta 78 zcmYdKoFL)J#LU3Ja86~R1p@;EXMj(Lt1rXMG=?(`4F7+;FYjhxU=a3naSY*zPEI_) i8sT(uLZt659)?mSCeggsI41@M1_n=8KbLh*2~7ZXUl#iS diff --git a/graphics/HUD/HealthBar3.png b/graphics/HUD/HealthBar3.png index da639b650dccdd4e75f88b4ccd127d7a6623734b..56d58530a91f0c666fbf03d2716a3d9316554f4a 100644 GIT binary patch delta 75 zcmYeunxNul=;`7ZVsSdzW^-4fhyZ8Ak|(U|?YIboFyt=akR{073^F;{X5v delta 65 zcmc~wn4n^#?&;zfQgJJJ)=e$@t_~NUV^%SXJ3LIJB9^dRyQzKOO>km{$p#Mx2K)P$ W{{}|yDq~<^VDNPHb6Mw<&;$TlbQy&J diff --git a/language.version b/language.version index d19f3bbd8..e544a702a 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1087 \cu(Tue 16 Jan 10:17:28 CET 2024)\c-"; -SWWM_SHORTVER="\cw1.3pre r1087 \cu(2024-01-16 10:17:28)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1088 \cu(Tue 16 Jan 10:40:28 CET 2024)\c-"; +SWWM_SHORTVER="\cw1.3pre r1088 \cu(2024-01-16 10:40:28)\c-"; diff --git a/zscript/hud/swwm_hud_status.zsc b/zscript/hud/swwm_hud_status.zsc index 3bb51f530..1c6c7375c 100644 --- a/zscript/hud/swwm_hud_status.zsc +++ b/zscript/hud/swwm_hud_status.zsc @@ -146,7 +146,7 @@ extend Class SWWMStatusBar double hw = min(ht,100); double bhw = hw; int hcolor = MCR_RED; - if ( round(ht) > 500 ) hcolor = MCR_YELLOW; + if ( round(ht) > 500 ) hcolor = MCR_GOLD; else if ( round(ht) > 200 ) hcolor = MCR_PURPLE; else if ( round(ht) > 100 ) hcolor = MCR_AQUA; if ( isInvulnerable() || CPlayer.mo.FindInventory("InvinciballPower") ) diff --git a/zscript/hud/swwm_hud_target.zsc b/zscript/hud/swwm_hud_target.zsc index d541fa67d..85536c8c4 100644 --- a/zscript/hud/swwm_hud_target.zsc +++ b/zscript/hud/swwm_hud_target.zsc @@ -235,8 +235,6 @@ extend Class SWWMStatusBar } // ignore unowned (can happen?) if ( !ct.Owner ) continue; - // ignore if max health is zero (SOMEHOW can happen) - if ( ct.maxhealth <= 0 ) continue; // ignore non-player trackers and voodoo dolls if ( !ct.Owner.player || (ct.Owner.player.mo != ct.Owner) ) continue; // ignore local player or camera @@ -261,12 +259,27 @@ extend Class SWWMStatusBar { // player health values are drawn as a single number // font color is the same as in the status box - String val = String.Format("%d",ct.lasthealth); + String val = String.Format("%d",clamp(ct.lasthealth,0,999)); int valw = MiniHUDFontOutline.StringWidth(val); - int col = (ct.lasthealth>500)?mhudfontcol[MCR_YELLOW]:(ct.lasthealth>200)?mhudfontcol[MCR_PURPLE]:(ct.lasthealth>100)?mhudfontcol[MCR_AQUA]:mhudfontcol[MCR_RED]; + int col = (ct.lasthealth>500)?mhudfontcol[MCR_GOLD]:(ct.lasthealth>200)?mhudfontcol[MCR_PURPLE]:(ct.lasthealth>100)?mhudfontcol[MCR_AQUA]:mhudfontcol[MCR_RED]; if ( ct.Owner.bINVULNERABLE || (ct.Owner.player.cheats&(CF_GODMODE|CF_GODMODE2)) || ct.Owner.FindInventory("InvinciballPower") ) col = mhudfontcol[MCR_WHITE]; - Screen.DrawText(MiniHUDFontOutline,col,vpos.x-(valw/2),barpos.y-(MiniHUDFontOutline.GetHeight()+2),val,DTA_VirtualWidthF,ss1.x,DTA_VirtualHeightF,ss1.y,DTA_KeepRatio,true,DTA_Alpha,alph); + if ( ct.Owner.FindInventory("DivineSpriteEffect") ) + { + double falph = clamp((ct.intp.GetValue(fractic)-1000)/6000.,0.,1.); + String tst; + double ffalph = .1; + int trl = 9; + for ( double ffalph = .1; ffalph <= .5; ffalph += .1 ) + { + tst = "AAA"; + SWWMUtility.ObscureText(tst,(gametic-trl)/3,minihud:true); + trl--; + Screen.DrawText(MiniHUDFont,mhudfontcol[MCR_WHITE],vpos.x-(valw/2),barpos.y-(MiniHUDFontOutline.GetHeight()+2),tst,DTA_VirtualWidthF,ss1.x,DTA_VirtualHeightF,ss1.y,DTA_KeepRatio,true,DTA_Alpha,alph*falph*ffalph,DTA_LegacyRenderStyle,STYLE_Add); + } + Screen.DrawText(MiniHUDFontOutline,col,vpos.x-(valw/2),barpos.y-(MiniHUDFontOutline.GetHeight()+2),val,DTA_VirtualWidthF,ss1.x,DTA_VirtualHeightF,ss1.y,DTA_KeepRatio,true,DTA_Alpha,alph*(1.-falph)); + } + else Screen.DrawText(MiniHUDFontOutline,col,vpos.x-(valw/2),barpos.y-(MiniHUDFontOutline.GetHeight()+2),val,DTA_VirtualWidthF,ss1.x,DTA_VirtualHeightF,ss1.y,DTA_KeepRatio,true,DTA_Alpha,alph); } Font fnt = swwm_bigtags?mSmallFontOutlineAlt:mTinyFontOutlineAlt; int col = Font.CR_WHITE; @@ -279,39 +292,39 @@ extend Class SWWMStatusBar int ofsh = drawvalues?(MiniHUDFontOutline.GetHeight()+4):2; Screen.DrawText(fnt,col,vpos.x-fnt.StringWidth(ct.mytag)/2,barpos.y-(fnt.GetHeight()+ofsh),ct.mytag,DTA_VirtualWidthF,ss1.x,DTA_VirtualHeightF,ss1.y,DTA_KeepRatio,true,DTA_Alpha,alph); Screen.DrawTexture(EnemyBTex,false,barpos.x,barpos.y,DTA_VirtualWidthF,ss1.x,DTA_VirtualHeightF,ss1.y,DTA_KeepRatio,true,DTA_Alpha,alph); - double ht = clamp(ct.intp.GetValue(fractic),0,ct.maxhealth*100); - double hw = (ht*50.)/ct.maxhealth; + double ht = clamp(ct.intp.GetValue(fractic),0,10000); + double hw = (ht*50.)/100.; double ohw = hw; if ( ct.Owner.bINVULNERABLE || (ct.Owner.player.cheats&(CF_GODMODE|CF_GODMODE2)) || ct.Owner.FindInventory("InvinciballPower") ) Screen.DrawTexture(EnemyHTex[1],false,barpos.x+2,barpos.y+2,DTA_VirtualWidthF,ss1.x,DTA_VirtualHeightF,ss1.y,DTA_KeepRatio,true,DTA_Alpha,alph,DTA_WindowRightF,hw); else { Screen.DrawTexture(EnemyHTex[0],false,barpos.x+2,barpos.y+2,DTA_VirtualWidthF,ss1.x,DTA_VirtualHeightF,ss1.y,DTA_KeepRatio,true,DTA_Alpha,alph,DTA_WindowRightF,hw); - if ( ht > ct.maxhealth ) + if ( ht > 100 ) { - hw = (min(ht-ct.maxhealth,ct.maxhealth)*50.)/ct.maxhealth; + hw = (min(ht-100,100)*50.)/100.; Screen.DrawTexture(EnemyHTex[3],false,barpos.x+2,barpos.y+2,DTA_VirtualWidthF,ss1.x,DTA_VirtualHeightF,ss1.y,DTA_KeepRatio,true,DTA_Alpha,alph,DTA_WindowRightF,hw); } - if ( ht > ct.maxhealth*2 ) + if ( ht > 200 ) { - hw = (min(ht-ct.maxhealth*2,ct.maxhealth*3)*50.)/ct.maxhealth; + hw = (min(ht-200,300)*50.)/100.; Screen.DrawTexture(EnemyHTex[4],false,barpos.x+2,barpos.y+2,DTA_VirtualWidthF,ss1.x,DTA_VirtualHeightF,ss1.y,DTA_KeepRatio,true,DTA_Alpha,alph,DTA_WindowRightF,hw); } - if ( ht > ct.maxhealth*5 ) + if ( ht > 500 ) { - hw = (min(ht-ct.maxhealth*5,ct.maxhealth*5)*50.)/ct.maxhealth; + hw = (min(ht-500,500)*50.)/100.; Screen.DrawTexture(EnemyHTex[5],false,barpos.x+2,barpos.y+2,DTA_VirtualWidthF,ss1.x,DTA_VirtualHeightF,ss1.y,DTA_KeepRatio,true,DTA_Alpha,alph,DTA_WindowRightF,hw); } } if ( ct.Owner.FindInventory("DivineSpriteEffect") ) { - double falph = clamp((ht-ct.maxhealth*10)/(ct.maxhealth*60.),0.,1.); + double falph = clamp((ht-1000)/6000.,0.,1.); Screen.DrawTexture(EnemyHTex[6],false,barpos.x+2,barpos.y+2,DTA_VirtualWidthF,ss1.x,DTA_VirtualHeightF,ss1.y,DTA_KeepRatio,true,DTA_Alpha,alph*falph,DTA_LegacyRenderStyle,STYLE_Add); } else { - ht = clamp(ct.intpl.GetValue(fractic),0,ct.maxhealth); - hw = min((ht*50.)/ct.maxhealth,100.); + ht = clamp(ct.intpl.GetValue(fractic),0,100); + hw = min((ht*50.)/100.,100.); 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;