diff --git a/graphics/HUD/DeepImpactBar.png b/graphics/HUD/DeepImpactBar.png index d2351890b..7e177193c 100644 Binary files a/graphics/HUD/DeepImpactBar.png and b/graphics/HUD/DeepImpactBar.png differ diff --git a/graphics/HUD/DeepImpactDisplay.png b/graphics/HUD/DeepImpactDisplay.png index e8752637a..07e010437 100644 Binary files a/graphics/HUD/DeepImpactDisplay.png and b/graphics/HUD/DeepImpactDisplay.png differ diff --git a/graphics/HUD/MisterDisplay.png b/graphics/HUD/MisterDisplay.png index 3d43a61e5..ae6e6b9da 100644 Binary files a/graphics/HUD/MisterDisplay.png and b/graphics/HUD/MisterDisplay.png differ diff --git a/language.version b/language.version index 32bffc283..785fa75b5 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r471 \cu(Fri 16 Sep 19:11:04 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r471 \cu(2022-09-16 19:11:04)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r472 \cu(Fri 16 Sep 20:23:43 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r472 \cu(2022-09-16 20:23:43)\c-"; diff --git a/zscript/weapons/swwm_weapons_hud.zsc b/zscript/weapons/swwm_weapons_hud.zsc index 4b6c9e7ec..acb809dbc 100644 --- a/zscript/weapons/swwm_weapons_hud.zsc +++ b/zscript/weapons/swwm_weapons_hud.zsc @@ -4,15 +4,18 @@ extend Class DeepImpact { ui TextureID WeaponBox, AmmoBar; + ui Font AmmoFont; override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss ) { if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/DeepImpactDisplay.png",TexMan.Type_Any); if ( !AmmoBar ) AmmoBar = TexMan.CheckForTexture("graphics/HUD/DeepImpactBar.png",TexMan.Type_Any); - Screen.DrawTexture(WeaponBox,false,bx-8,by-25,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); + if ( !AmmoFont ) AmmoFont = Font.GetFont("MiniHudShadow"); + Screen.DrawTexture(WeaponBox,false,bx-24,by-25,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); double chg = clamp(ChargeInter?ChargeInter.GetValue(TicFrac):clipcount,0.,100.); - double ch = chg*20./100.; bool blinking = (failtime>gametic)&&((failtime-gametic)%8>=4); + Screen.DrawText(AmmoFont,Font.FindFontColor("MiniIce"),bx-22,by-8,String.Format("%3d",clamp(int(chg),0,100)),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_ColorOverlay,blinking?Color(128,0,0,0):Color(0,0,0,0)); + double ch = chg*20./100.; Screen.DrawTexture(AmmoBar,false,bx-5,by-(2+ch),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_SrcY,20.-ch,DTA_SrcHeight,ch,DTA_DestHeightF,ch,DTA_ColorOverlay,Color(255,0,0,0)); Screen.DrawTexture(AmmoBar,false,bx-6,by-(3+ch),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_SrcY,20.-ch,DTA_SrcHeight,ch,DTA_DestHeightF,ch,DTA_ColorOverlay,blinking?Color(128,0,0,0):Color(0,0,0,0)); }