From 1b74e6b84df862331c97bbec5d2769fd1b7f720a Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Fri, 16 Sep 2022 20:23:43 +0200
Subject: [PATCH] Restore Deep Impact charge numbers in HUD.

---
 graphics/HUD/DeepImpactBar.png       | Bin 96 -> 96 bytes
 graphics/HUD/DeepImpactDisplay.png   | Bin 140 -> 159 bytes
 graphics/HUD/MisterDisplay.png       | Bin 238 -> 189 bytes
 language.version                     |   4 ++--
 zscript/weapons/swwm_weapons_hud.zsc |   7 +++++--
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/graphics/HUD/DeepImpactBar.png b/graphics/HUD/DeepImpactBar.png
index d2351890bf6cf02532610a241fa24087c6aebe6d..7e177193c441f12b80cf5f62811d899af708e871 100644
GIT binary patch
delta 24
gcmYdDn4l>j?~&$PJhOkrnP>0*$Nx7Ao@l8K0E0CPUH||9

delta 24
gcmYdDn4l@ZAeE+;Ff(oQnf?F&TjyM^nP{mF0CwmKvH$=8

diff --git a/graphics/HUD/DeepImpactDisplay.png b/graphics/HUD/DeepImpactDisplay.png
index e8752637a755dd2fb0eafeef9374b540adcef081..07e010437ec1818f07c3fc307ab996e99dd5624f 100644
GIT binary patch
delta 115
zcmeBSoX@D(8Q|y6%O%Cdz`(%k>ERN@z`!8Mz`!8I!py+Hup#)>zln;bo+h3yjv*4^
z$q5Zjo3?BTVYBcM5fKTLSY)%n-$6n25c4Dj1t<Nu4sHnx=FD_fHZ@h200xGWZi;5v
Ud%nsrFfcH9y85}Sb4q9e04;PKJOBUy

delta 96
zcmbQw*u$vU8Q|y6%O%Cdz`(%k>ERN@z`(%Cz`!8I!py+HF#T_~*hEEBGeu7q#}E$L
zWS!p!KGd5fKVoA`o9F1*#&EZI`b5vh#)t9@_TGxtJ1(t_XJBAp@O1TaS?83{1OR4m
B8*Kmp

diff --git a/graphics/HUD/MisterDisplay.png b/graphics/HUD/MisterDisplay.png
index 3d43a61e5e5d607b9fe394c56f9248b1d7870507..ae6e6b9dae4e1b58351d16be19f3cba326886382 100644
GIT binary patch
delta 173
zcmaFIxR-H)L_G^L0|SGhPT4vJ1_s3dpAc6D1_lKK2Zx0Eg#P^uV8Fp6ARwUt7u=|F
zS(Jf+fwd&aFBl|$CSYfW76Su=o2QFoh(vgD0t3^!nF$vdl8g&>H8^Uj9T%Fp*weI6
z^ujAY33inzPxd~S%F0T$p3OoxS%cLkOy%WRF8g9zPmzH~Y67n-1A|m&VUhPH11^x+
Mp00i_>zopr0BwOWc>n+a

delta 222
zcmdnX_>OUcL_G%^0|UchrtG;43=CU6T^vI^jwh!mFsXcb|NsAkM~rMi2b#IrCFNo)
z4xDhB@~E3#f=?&I#=DD^Nr>wh4-e1(nGzX1GdeirZbdm{-I$!ic(ys?3e&9U15Cbc
z7R9eXdPR8NoZQZkX0UD!*U5?B7EiRvI=JCn2EU$+%eqE`@B{t&@*0~DDDIP+)%~{c
zS<0yzhXwm&&z@W?))QsGqLUC}Q1Ijb!=ub|xaw+t9#B}AbfCeXSFhH7Urj<n%cuXB
cPq8yB-{5v*wc^8k1_lNOPgg&ebxsLQ0HTdsq5uE@

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));
 	}