diff --git a/fonts/MiniHUD/0025.png b/fonts/MiniHUD/0025.png deleted file mode 100644 index 1099ee784..000000000 Binary files a/fonts/MiniHUD/0025.png and /dev/null differ diff --git a/fonts/MiniHUD/002B.png b/fonts/MiniHUD/002B.png deleted file mode 100644 index 260dcc752..000000000 Binary files a/fonts/MiniHUD/002B.png and /dev/null differ diff --git a/fonts/MiniHUD/002D.png b/fonts/MiniHUD/002D.png deleted file mode 100644 index f26ab8667..000000000 Binary files a/fonts/MiniHUD/002D.png and /dev/null differ diff --git a/fonts/MiniHUD/002F.png b/fonts/MiniHUD/002F.png deleted file mode 100644 index 092d9f031..000000000 Binary files a/fonts/MiniHUD/002F.png and /dev/null differ diff --git a/fonts/MiniHUD/0030.png b/fonts/MiniHUD/0030.png deleted file mode 100644 index ef84a993a..000000000 Binary files a/fonts/MiniHUD/0030.png and /dev/null differ diff --git a/fonts/MiniHUD/0031.png b/fonts/MiniHUD/0031.png deleted file mode 100644 index 14c6b4b12..000000000 Binary files a/fonts/MiniHUD/0031.png and /dev/null differ diff --git a/fonts/MiniHUD/0032.png b/fonts/MiniHUD/0032.png deleted file mode 100644 index 37e3c154d..000000000 Binary files a/fonts/MiniHUD/0032.png and /dev/null differ diff --git a/fonts/MiniHUD/0033.png b/fonts/MiniHUD/0033.png deleted file mode 100644 index 7a8c6f7e4..000000000 Binary files a/fonts/MiniHUD/0033.png and /dev/null differ diff --git a/fonts/MiniHUD/0034.png b/fonts/MiniHUD/0034.png deleted file mode 100644 index e50a2f133..000000000 Binary files a/fonts/MiniHUD/0034.png and /dev/null differ diff --git a/fonts/MiniHUD/0035.png b/fonts/MiniHUD/0035.png deleted file mode 100644 index 4df6402d7..000000000 Binary files a/fonts/MiniHUD/0035.png and /dev/null differ diff --git a/fonts/MiniHUD/0036.png b/fonts/MiniHUD/0036.png deleted file mode 100644 index 6df31ead2..000000000 Binary files a/fonts/MiniHUD/0036.png and /dev/null differ diff --git a/fonts/MiniHUD/0037.png b/fonts/MiniHUD/0037.png deleted file mode 100644 index b0659827d..000000000 Binary files a/fonts/MiniHUD/0037.png and /dev/null differ diff --git a/fonts/MiniHUD/0038.png b/fonts/MiniHUD/0038.png deleted file mode 100644 index 043278ea9..000000000 Binary files a/fonts/MiniHUD/0038.png and /dev/null differ diff --git a/fonts/MiniHUD/0039.png b/fonts/MiniHUD/0039.png deleted file mode 100644 index 0c575dede..000000000 Binary files a/fonts/MiniHUD/0039.png and /dev/null differ diff --git a/fonts/MiniHUD/003A.png b/fonts/MiniHUD/003A.png deleted file mode 100644 index 575dd0e7f..000000000 Binary files a/fonts/MiniHUD/003A.png and /dev/null differ diff --git a/fonts/MiniHUD/0041.png b/fonts/MiniHUD/0041.png deleted file mode 100644 index e94f7dbdb..000000000 Binary files a/fonts/MiniHUD/0041.png and /dev/null differ diff --git a/fonts/MiniHUD/0042.png b/fonts/MiniHUD/0042.png deleted file mode 100644 index 227f7f111..000000000 Binary files a/fonts/MiniHUD/0042.png and /dev/null differ diff --git a/fonts/MiniHUD/0043.png b/fonts/MiniHUD/0043.png deleted file mode 100644 index f5162ccfd..000000000 Binary files a/fonts/MiniHUD/0043.png and /dev/null differ diff --git a/fonts/MiniHUD/0044.png b/fonts/MiniHUD/0044.png deleted file mode 100644 index 0587552b2..000000000 Binary files a/fonts/MiniHUD/0044.png and /dev/null differ diff --git a/fonts/MiniHUD/0045.png b/fonts/MiniHUD/0045.png deleted file mode 100644 index c73a593cf..000000000 Binary files a/fonts/MiniHUD/0045.png and /dev/null differ diff --git a/fonts/MiniHUD/0046.png b/fonts/MiniHUD/0046.png deleted file mode 100644 index 1d9f983de..000000000 Binary files a/fonts/MiniHUD/0046.png and /dev/null differ diff --git a/fonts/MiniHUD/0047.png b/fonts/MiniHUD/0047.png deleted file mode 100644 index 64eeb027a..000000000 Binary files a/fonts/MiniHUD/0047.png and /dev/null differ diff --git a/fonts/MiniHUD/0048.png b/fonts/MiniHUD/0048.png deleted file mode 100644 index 15fece44b..000000000 Binary files a/fonts/MiniHUD/0048.png and /dev/null differ diff --git a/fonts/MiniHUD/0049.png b/fonts/MiniHUD/0049.png deleted file mode 100644 index 31980aa27..000000000 Binary files a/fonts/MiniHUD/0049.png and /dev/null differ diff --git a/fonts/MiniHUD/004A.png b/fonts/MiniHUD/004A.png deleted file mode 100644 index 1e98c8f10..000000000 Binary files a/fonts/MiniHUD/004A.png and /dev/null differ diff --git a/fonts/MiniHUD/004B.png b/fonts/MiniHUD/004B.png deleted file mode 100644 index 5de056959..000000000 Binary files a/fonts/MiniHUD/004B.png and /dev/null differ diff --git a/fonts/MiniHUD/004C.png b/fonts/MiniHUD/004C.png deleted file mode 100644 index e8edbc425..000000000 Binary files a/fonts/MiniHUD/004C.png and /dev/null differ diff --git a/fonts/MiniHUD/004D.png b/fonts/MiniHUD/004D.png deleted file mode 100644 index 4a397c401..000000000 Binary files a/fonts/MiniHUD/004D.png and /dev/null differ diff --git a/fonts/MiniHUD/004E.png b/fonts/MiniHUD/004E.png deleted file mode 100644 index 4250d7983..000000000 Binary files a/fonts/MiniHUD/004E.png and /dev/null differ diff --git a/fonts/MiniHUD/004F.png b/fonts/MiniHUD/004F.png deleted file mode 100644 index ef84a993a..000000000 Binary files a/fonts/MiniHUD/004F.png and /dev/null differ diff --git a/fonts/MiniHUD/0050.png b/fonts/MiniHUD/0050.png deleted file mode 100644 index 9ac27b5a1..000000000 Binary files a/fonts/MiniHUD/0050.png and /dev/null differ diff --git a/fonts/MiniHUD/0051.png b/fonts/MiniHUD/0051.png deleted file mode 100644 index 5e86197c4..000000000 Binary files a/fonts/MiniHUD/0051.png and /dev/null differ diff --git a/fonts/MiniHUD/0052.png b/fonts/MiniHUD/0052.png deleted file mode 100644 index e0ba56d80..000000000 Binary files a/fonts/MiniHUD/0052.png and /dev/null differ diff --git a/fonts/MiniHUD/0053.png b/fonts/MiniHUD/0053.png deleted file mode 100644 index 8ee518e64..000000000 Binary files a/fonts/MiniHUD/0053.png and /dev/null differ diff --git a/fonts/MiniHUD/0054.png b/fonts/MiniHUD/0054.png deleted file mode 100644 index e799c010b..000000000 Binary files a/fonts/MiniHUD/0054.png and /dev/null differ diff --git a/fonts/MiniHUD/0055.png b/fonts/MiniHUD/0055.png deleted file mode 100644 index 1cbfc97bf..000000000 Binary files a/fonts/MiniHUD/0055.png and /dev/null differ diff --git a/fonts/MiniHUD/0056.png b/fonts/MiniHUD/0056.png deleted file mode 100644 index c46134e1a..000000000 Binary files a/fonts/MiniHUD/0056.png and /dev/null differ diff --git a/fonts/MiniHUD/0057.png b/fonts/MiniHUD/0057.png deleted file mode 100644 index 88898cea1..000000000 Binary files a/fonts/MiniHUD/0057.png and /dev/null differ diff --git a/fonts/MiniHUD/0058.png b/fonts/MiniHUD/0058.png deleted file mode 100644 index 77ec43e53..000000000 Binary files a/fonts/MiniHUD/0058.png and /dev/null differ diff --git a/fonts/MiniHUD/0059.png b/fonts/MiniHUD/0059.png deleted file mode 100644 index 5fec46442..000000000 Binary files a/fonts/MiniHUD/0059.png and /dev/null differ diff --git a/fonts/MiniHUD/005A.png b/fonts/MiniHUD/005A.png deleted file mode 100644 index 34886a310..000000000 Binary files a/fonts/MiniHUD/005A.png and /dev/null differ diff --git a/fonts/MiniHUD/0073.png b/fonts/MiniHUD/0073.png deleted file mode 100644 index fb54f4e64..000000000 Binary files a/fonts/MiniHUD/0073.png and /dev/null differ diff --git a/fonts/MiniHUD/207A.png b/fonts/MiniHUD/207A.png deleted file mode 100644 index 6f9bab7ab..000000000 Binary files a/fonts/MiniHUD/207A.png and /dev/null differ diff --git a/fonts/MiniHUD/221E.png b/fonts/MiniHUD/221E.png deleted file mode 100644 index 9ba7bdbb6..000000000 Binary files a/fonts/MiniHUD/221E.png and /dev/null differ diff --git a/fonts/MiniHUD/font.inf b/fonts/MiniHUD/font.inf deleted file mode 100644 index d5253db04..000000000 --- a/fonts/MiniHUD/font.inf +++ /dev/null @@ -1,6 +0,0 @@ -TranslationType Standard -Kerning 1 -SpaceWidth 3 -FontHeight 5 -MinLuminosity 0 -MaxLuminosity 255 diff --git a/fonts/MiniHUDShadow/0025.png b/fonts/MiniHUDShadow/0025.png new file mode 100644 index 000000000..5b4153de1 Binary files /dev/null and b/fonts/MiniHUDShadow/0025.png differ diff --git a/fonts/MiniHUDShadow/002B.png b/fonts/MiniHUDShadow/002B.png new file mode 100644 index 000000000..b519e4ff2 Binary files /dev/null and b/fonts/MiniHUDShadow/002B.png differ diff --git a/fonts/MiniHUDShadow/002D.png b/fonts/MiniHUDShadow/002D.png new file mode 100644 index 000000000..fa5e0bebb Binary files /dev/null and b/fonts/MiniHUDShadow/002D.png differ diff --git a/fonts/MiniHUDShadow/002F.png b/fonts/MiniHUDShadow/002F.png new file mode 100644 index 000000000..ea52ce324 Binary files /dev/null and b/fonts/MiniHUDShadow/002F.png differ diff --git a/fonts/MiniHUDShadow/0030.png b/fonts/MiniHUDShadow/0030.png new file mode 100644 index 000000000..9932417b3 Binary files /dev/null and b/fonts/MiniHUDShadow/0030.png differ diff --git a/fonts/MiniHUDShadow/0031.png b/fonts/MiniHUDShadow/0031.png new file mode 100644 index 000000000..d7dfe2ef8 Binary files /dev/null and b/fonts/MiniHUDShadow/0031.png differ diff --git a/fonts/MiniHUDShadow/0032.png b/fonts/MiniHUDShadow/0032.png new file mode 100644 index 000000000..166a5e0f1 Binary files /dev/null and b/fonts/MiniHUDShadow/0032.png differ diff --git a/fonts/MiniHUDShadow/0033.png b/fonts/MiniHUDShadow/0033.png new file mode 100644 index 000000000..d12f320e1 Binary files /dev/null and b/fonts/MiniHUDShadow/0033.png differ diff --git a/fonts/MiniHUDShadow/0034.png b/fonts/MiniHUDShadow/0034.png new file mode 100644 index 000000000..f05204188 Binary files /dev/null and b/fonts/MiniHUDShadow/0034.png differ diff --git a/fonts/MiniHUDShadow/0035.png b/fonts/MiniHUDShadow/0035.png new file mode 100644 index 000000000..6f42c7875 Binary files /dev/null and b/fonts/MiniHUDShadow/0035.png differ diff --git a/fonts/MiniHUDShadow/0036.png b/fonts/MiniHUDShadow/0036.png new file mode 100644 index 000000000..3a6006fd1 Binary files /dev/null and b/fonts/MiniHUDShadow/0036.png differ diff --git a/fonts/MiniHUDShadow/0037.png b/fonts/MiniHUDShadow/0037.png new file mode 100644 index 000000000..f92c325c3 Binary files /dev/null and b/fonts/MiniHUDShadow/0037.png differ diff --git a/fonts/MiniHUDShadow/0038.png b/fonts/MiniHUDShadow/0038.png new file mode 100644 index 000000000..842a512a6 Binary files /dev/null and b/fonts/MiniHUDShadow/0038.png differ diff --git a/fonts/MiniHUDShadow/0039.png b/fonts/MiniHUDShadow/0039.png new file mode 100644 index 000000000..78f395db4 Binary files /dev/null and b/fonts/MiniHUDShadow/0039.png differ diff --git a/fonts/MiniHUDShadow/003A.png b/fonts/MiniHUDShadow/003A.png new file mode 100644 index 000000000..305989b10 Binary files /dev/null and b/fonts/MiniHUDShadow/003A.png differ diff --git a/fonts/MiniHUDShadow/0041.png b/fonts/MiniHUDShadow/0041.png new file mode 100644 index 000000000..75c4c9868 Binary files /dev/null and b/fonts/MiniHUDShadow/0041.png differ diff --git a/fonts/MiniHUDShadow/0042.png b/fonts/MiniHUDShadow/0042.png new file mode 100644 index 000000000..4d7108553 Binary files /dev/null and b/fonts/MiniHUDShadow/0042.png differ diff --git a/fonts/MiniHUDShadow/0043.png b/fonts/MiniHUDShadow/0043.png new file mode 100644 index 000000000..9cd31e1df Binary files /dev/null and b/fonts/MiniHUDShadow/0043.png differ diff --git a/fonts/MiniHUDShadow/0044.png b/fonts/MiniHUDShadow/0044.png new file mode 100644 index 000000000..ff1391a2b Binary files /dev/null and b/fonts/MiniHUDShadow/0044.png differ diff --git a/fonts/MiniHUDShadow/0045.png b/fonts/MiniHUDShadow/0045.png new file mode 100644 index 000000000..77f23086f Binary files /dev/null and b/fonts/MiniHUDShadow/0045.png differ diff --git a/fonts/MiniHUDShadow/0046.png b/fonts/MiniHUDShadow/0046.png new file mode 100644 index 000000000..ee4f0e124 Binary files /dev/null and b/fonts/MiniHUDShadow/0046.png differ diff --git a/fonts/MiniHUDShadow/0047.png b/fonts/MiniHUDShadow/0047.png new file mode 100644 index 000000000..8f6e0ebb1 Binary files /dev/null and b/fonts/MiniHUDShadow/0047.png differ diff --git a/fonts/MiniHUDShadow/0048.png b/fonts/MiniHUDShadow/0048.png new file mode 100644 index 000000000..86f68fade Binary files /dev/null and b/fonts/MiniHUDShadow/0048.png differ diff --git a/fonts/MiniHUDShadow/0049.png b/fonts/MiniHUDShadow/0049.png new file mode 100644 index 000000000..17e4e931b Binary files /dev/null and b/fonts/MiniHUDShadow/0049.png differ diff --git a/fonts/MiniHUDShadow/004A.png b/fonts/MiniHUDShadow/004A.png new file mode 100644 index 000000000..83cf092cd Binary files /dev/null and b/fonts/MiniHUDShadow/004A.png differ diff --git a/fonts/MiniHUDShadow/004B.png b/fonts/MiniHUDShadow/004B.png new file mode 100644 index 000000000..33ad403ea Binary files /dev/null and b/fonts/MiniHUDShadow/004B.png differ diff --git a/fonts/MiniHUDShadow/004C.png b/fonts/MiniHUDShadow/004C.png new file mode 100644 index 000000000..870c17799 Binary files /dev/null and b/fonts/MiniHUDShadow/004C.png differ diff --git a/fonts/MiniHUDShadow/004D.png b/fonts/MiniHUDShadow/004D.png new file mode 100644 index 000000000..b329f0b24 Binary files /dev/null and b/fonts/MiniHUDShadow/004D.png differ diff --git a/fonts/MiniHUDShadow/004E.png b/fonts/MiniHUDShadow/004E.png new file mode 100644 index 000000000..bc4971d25 Binary files /dev/null and b/fonts/MiniHUDShadow/004E.png differ diff --git a/fonts/MiniHUDShadow/004F.png b/fonts/MiniHUDShadow/004F.png new file mode 100644 index 000000000..9932417b3 Binary files /dev/null and b/fonts/MiniHUDShadow/004F.png differ diff --git a/fonts/MiniHUDShadow/0050.png b/fonts/MiniHUDShadow/0050.png new file mode 100644 index 000000000..b1e6b0faf Binary files /dev/null and b/fonts/MiniHUDShadow/0050.png differ diff --git a/fonts/MiniHUDShadow/0051.png b/fonts/MiniHUDShadow/0051.png new file mode 100644 index 000000000..d4c76f6e1 Binary files /dev/null and b/fonts/MiniHUDShadow/0051.png differ diff --git a/fonts/MiniHUDShadow/0052.png b/fonts/MiniHUDShadow/0052.png new file mode 100644 index 000000000..e3a6d8aa5 Binary files /dev/null and b/fonts/MiniHUDShadow/0052.png differ diff --git a/fonts/MiniHUDShadow/0053.png b/fonts/MiniHUDShadow/0053.png new file mode 100644 index 000000000..2b09a9bb8 Binary files /dev/null and b/fonts/MiniHUDShadow/0053.png differ diff --git a/fonts/MiniHUDShadow/0054.png b/fonts/MiniHUDShadow/0054.png new file mode 100644 index 000000000..fc684ce11 Binary files /dev/null and b/fonts/MiniHUDShadow/0054.png differ diff --git a/fonts/MiniHUDShadow/0055.png b/fonts/MiniHUDShadow/0055.png new file mode 100644 index 000000000..20591c67a Binary files /dev/null and b/fonts/MiniHUDShadow/0055.png differ diff --git a/fonts/MiniHUDShadow/0056.png b/fonts/MiniHUDShadow/0056.png new file mode 100644 index 000000000..b2c4b4cfd Binary files /dev/null and b/fonts/MiniHUDShadow/0056.png differ diff --git a/fonts/MiniHUDShadow/0057.png b/fonts/MiniHUDShadow/0057.png new file mode 100644 index 000000000..c125bb7bf Binary files /dev/null and b/fonts/MiniHUDShadow/0057.png differ diff --git a/fonts/MiniHUDShadow/0058.png b/fonts/MiniHUDShadow/0058.png new file mode 100644 index 000000000..b63a6004f Binary files /dev/null and b/fonts/MiniHUDShadow/0058.png differ diff --git a/fonts/MiniHUDShadow/0059.png b/fonts/MiniHUDShadow/0059.png new file mode 100644 index 000000000..93f2fbf4f Binary files /dev/null and b/fonts/MiniHUDShadow/0059.png differ diff --git a/fonts/MiniHUDShadow/005A.png b/fonts/MiniHUDShadow/005A.png new file mode 100644 index 000000000..d0c7b752c Binary files /dev/null and b/fonts/MiniHUDShadow/005A.png differ diff --git a/fonts/MiniHUDShadow/0073.png b/fonts/MiniHUDShadow/0073.png new file mode 100644 index 000000000..985c361a2 Binary files /dev/null and b/fonts/MiniHUDShadow/0073.png differ diff --git a/fonts/MiniHUDShadow/207A.png b/fonts/MiniHUDShadow/207A.png new file mode 100644 index 000000000..944320613 Binary files /dev/null and b/fonts/MiniHUDShadow/207A.png differ diff --git a/fonts/MiniHUDShadow/221E.png b/fonts/MiniHUDShadow/221E.png new file mode 100644 index 000000000..2615ecff8 Binary files /dev/null and b/fonts/MiniHUDShadow/221E.png differ diff --git a/fonts/MiniHUDShadow/font.inf b/fonts/MiniHUDShadow/font.inf new file mode 100644 index 000000000..bb45bc970 --- /dev/null +++ b/fonts/MiniHUDShadow/font.inf @@ -0,0 +1,3 @@ +TranslationType Standard +SpaceWidth 4 +FontHeight 6 diff --git a/graphics/AltHUD/AmmoBoxB.png b/graphics/AltHUD/AmmoBoxB.png index 4132b97e5..341e6fc6e 100644 Binary files a/graphics/AltHUD/AmmoBoxB.png and b/graphics/AltHUD/AmmoBoxB.png differ diff --git a/graphics/AltHUD/AmmoBoxM.png b/graphics/AltHUD/AmmoBoxM.png index 088d37cef..7037c7f83 100644 Binary files a/graphics/AltHUD/AmmoBoxM.png and b/graphics/AltHUD/AmmoBoxM.png differ diff --git a/graphics/AltHUD/AmmoBoxT.png b/graphics/AltHUD/AmmoBoxT.png index bc04fc1da..e9a0bbdcd 100644 Binary files a/graphics/AltHUD/AmmoBoxT.png and b/graphics/AltHUD/AmmoBoxT.png differ diff --git a/graphics/AltHUD/BiosparkDisplay.png b/graphics/AltHUD/BiosparkDisplay.png index bd9565e62..128285e22 100644 Binary files a/graphics/AltHUD/BiosparkDisplay.png and b/graphics/AltHUD/BiosparkDisplay.png differ diff --git a/graphics/AltHUD/BiosparkRed.png b/graphics/AltHUD/BiosparkRed.png index 4f1c3c1ab..8f2868398 100644 Binary files a/graphics/AltHUD/BiosparkRed.png and b/graphics/AltHUD/BiosparkRed.png differ diff --git a/graphics/AltHUD/BiosparkShot.png b/graphics/AltHUD/BiosparkShot.png index 06fc465c5..8c976d768 100644 Binary files a/graphics/AltHUD/BiosparkShot.png and b/graphics/AltHUD/BiosparkShot.png differ diff --git a/graphics/AltHUD/CandyRound.png b/graphics/AltHUD/CandyRound.png index f4df1bf0e..be58ce0b6 100644 Binary files a/graphics/AltHUD/CandyRound.png and b/graphics/AltHUD/CandyRound.png differ diff --git a/graphics/AltHUD/DeepImpactDisplay.png b/graphics/AltHUD/DeepImpactDisplay.png index 1ed1bd0ad..e8752637a 100644 Binary files a/graphics/AltHUD/DeepImpactDisplay.png and b/graphics/AltHUD/DeepImpactDisplay.png differ diff --git a/graphics/AltHUD/EvisceratorDisplay.png b/graphics/AltHUD/EvisceratorDisplay.png index b521fc3bb..915de3045 100644 Binary files a/graphics/AltHUD/EvisceratorDisplay.png and b/graphics/AltHUD/EvisceratorDisplay.png differ diff --git a/graphics/AltHUD/EvisceratorRound.png b/graphics/AltHUD/EvisceratorRound.png index ce4a9ffce..4010dd5a6 100644 Binary files a/graphics/AltHUD/EvisceratorRound.png and b/graphics/AltHUD/EvisceratorRound.png differ diff --git a/graphics/AltHUD/EvisceratorTight.png b/graphics/AltHUD/EvisceratorTight.png index d5899e308..7c57e1794 100644 Binary files a/graphics/AltHUD/EvisceratorTight.png and b/graphics/AltHUD/EvisceratorTight.png differ diff --git a/graphics/AltHUD/EvisceratorWide.png b/graphics/AltHUD/EvisceratorWide.png index 0cede7a7f..299a1d8ad 100644 Binary files a/graphics/AltHUD/EvisceratorWide.png and b/graphics/AltHUD/EvisceratorWide.png differ diff --git a/graphics/AltHUD/ExplodiumDisplay.png b/graphics/AltHUD/ExplodiumDisplay.png index 253c6bba0..025348b24 100644 Binary files a/graphics/AltHUD/ExplodiumDisplay.png and b/graphics/AltHUD/ExplodiumDisplay.png differ diff --git a/graphics/AltHUD/ExplodiumRound.png b/graphics/AltHUD/ExplodiumRound.png index 47c25c5b5..e92437f05 100644 Binary files a/graphics/AltHUD/ExplodiumRound.png and b/graphics/AltHUD/ExplodiumRound.png differ diff --git a/graphics/AltHUD/GenericAmmoBoxL.png b/graphics/AltHUD/GenericAmmoBoxL.png index 71900663d..208a28db8 100644 Binary files a/graphics/AltHUD/GenericAmmoBoxL.png and b/graphics/AltHUD/GenericAmmoBoxL.png differ diff --git a/graphics/AltHUD/GenericAmmoBoxM.png b/graphics/AltHUD/GenericAmmoBoxM.png index 3b57ce9bc..8110ca2d9 100644 Binary files a/graphics/AltHUD/GenericAmmoBoxM.png and b/graphics/AltHUD/GenericAmmoBoxM.png differ diff --git a/graphics/AltHUD/GenericAmmoBoxR.png b/graphics/AltHUD/GenericAmmoBoxR.png index 5f8b83080..1946be32b 100644 Binary files a/graphics/AltHUD/GenericAmmoBoxR.png and b/graphics/AltHUD/GenericAmmoBoxR.png differ diff --git a/graphics/AltHUD/HealthBarD.png b/graphics/AltHUD/HealthBarD.png index 31af74234..4f34d7ae6 100644 Binary files a/graphics/AltHUD/HealthBarD.png and b/graphics/AltHUD/HealthBarD.png differ diff --git a/graphics/AltHUD/HellblazerCrackshot.png b/graphics/AltHUD/HellblazerCrackshot.png index 034705950..05382f569 100644 Binary files a/graphics/AltHUD/HellblazerCrackshot.png and b/graphics/AltHUD/HellblazerCrackshot.png differ diff --git a/graphics/AltHUD/HellblazerDisplay.png b/graphics/AltHUD/HellblazerDisplay.png index 3932ae025..d5e9b5e1c 100644 Binary files a/graphics/AltHUD/HellblazerDisplay.png and b/graphics/AltHUD/HellblazerDisplay.png differ diff --git a/graphics/AltHUD/HellblazerMissile.png b/graphics/AltHUD/HellblazerMissile.png index 2e7776221..2804f44c4 100644 Binary files a/graphics/AltHUD/HellblazerMissile.png and b/graphics/AltHUD/HellblazerMissile.png differ diff --git a/graphics/AltHUD/HellblazerRavager.png b/graphics/AltHUD/HellblazerRavager.png index 9e4d62bb2..4749268eb 100644 Binary files a/graphics/AltHUD/HellblazerRavager.png and b/graphics/AltHUD/HellblazerRavager.png differ diff --git a/graphics/AltHUD/HellblazerWarhead.png b/graphics/AltHUD/HellblazerWarhead.png index 167286f2c..f398673f6 100644 Binary files a/graphics/AltHUD/HellblazerWarhead.png and b/graphics/AltHUD/HellblazerWarhead.png differ diff --git a/graphics/AltHUD/ScoreBox.png b/graphics/AltHUD/ScoreBox.png index 9ebddba4e..69f212f2c 100644 Binary files a/graphics/AltHUD/ScoreBox.png and b/graphics/AltHUD/ScoreBox.png differ diff --git a/graphics/AltHUD/ShellBlack.png b/graphics/AltHUD/ShellBlack.png index fc063d9a8..e5e7916e3 100644 Binary files a/graphics/AltHUD/ShellBlack.png and b/graphics/AltHUD/ShellBlack.png differ diff --git a/graphics/AltHUD/ShellBlue.png b/graphics/AltHUD/ShellBlue.png index b37f166f0..fce4bd5af 100644 Binary files a/graphics/AltHUD/ShellBlue.png and b/graphics/AltHUD/ShellBlue.png differ diff --git a/graphics/AltHUD/ShellGold.png b/graphics/AltHUD/ShellGold.png index b52bbbff1..3600d2532 100644 Binary files a/graphics/AltHUD/ShellGold.png and b/graphics/AltHUD/ShellGold.png differ diff --git a/graphics/AltHUD/ShellGreen.png b/graphics/AltHUD/ShellGreen.png index 803348ead..a5285cd41 100644 Binary files a/graphics/AltHUD/ShellGreen.png and b/graphics/AltHUD/ShellGreen.png differ diff --git a/graphics/AltHUD/ShellPurple.png b/graphics/AltHUD/ShellPurple.png index 8928b9993..eb8434d55 100644 Binary files a/graphics/AltHUD/ShellPurple.png and b/graphics/AltHUD/ShellPurple.png differ diff --git a/graphics/AltHUD/ShellRed.png b/graphics/AltHUD/ShellRed.png index 1f51b44d4..0c72896e9 100644 Binary files a/graphics/AltHUD/ShellRed.png and b/graphics/AltHUD/ShellRed.png differ diff --git a/graphics/AltHUD/SilverBulletDisplay.png b/graphics/AltHUD/SilverBulletDisplay.png index d96588bde..c815d621a 100644 Binary files a/graphics/AltHUD/SilverBulletDisplay.png and b/graphics/AltHUD/SilverBulletDisplay.png differ diff --git a/graphics/AltHUD/SilverBulletFCB.png b/graphics/AltHUD/SilverBulletFCB.png index 5f4edda44..fda477d7f 100644 Binary files a/graphics/AltHUD/SilverBulletFCB.png and b/graphics/AltHUD/SilverBulletFCB.png differ diff --git a/graphics/AltHUD/SilverBulletFCBCasing.png b/graphics/AltHUD/SilverBulletFCBCasing.png index 1d08b7f0d..6e377ea4a 100644 Binary files a/graphics/AltHUD/SilverBulletFCBCasing.png and b/graphics/AltHUD/SilverBulletFCBCasing.png differ diff --git a/graphics/AltHUD/SilverBulletXSB.png b/graphics/AltHUD/SilverBulletXSB.png index 02115944a..1d336045b 100644 Binary files a/graphics/AltHUD/SilverBulletXSB.png and b/graphics/AltHUD/SilverBulletXSB.png differ diff --git a/graphics/AltHUD/SilverBulletXSBCasing.png b/graphics/AltHUD/SilverBulletXSBCasing.png index 74b8a0e62..88d0d7573 100644 Binary files a/graphics/AltHUD/SilverBulletXSBCasing.png and b/graphics/AltHUD/SilverBulletXSBCasing.png differ diff --git a/graphics/AltHUD/SilverBulletZoomDisplay.png b/graphics/AltHUD/SilverBulletZoomDisplay.png index fc38f136d..656f7db18 100644 Binary files a/graphics/AltHUD/SilverBulletZoomDisplay.png and b/graphics/AltHUD/SilverBulletZoomDisplay.png differ diff --git a/graphics/AltHUD/SpreadgunDisplay.png b/graphics/AltHUD/SpreadgunDisplay.png index 2f015cf45..387d9d898 100644 Binary files a/graphics/AltHUD/SpreadgunDisplay.png and b/graphics/AltHUD/SpreadgunDisplay.png differ diff --git a/graphics/AltHUD/StatusBox.png b/graphics/AltHUD/StatusBox.png index 8d0ef36e3..c418c5b34 100644 Binary files a/graphics/AltHUD/StatusBox.png and b/graphics/AltHUD/StatusBox.png differ diff --git a/graphics/AltHUD/WallbusterCursor.png b/graphics/AltHUD/WallbusterCursor.png index a04bdbaf7..6ced632cf 100644 Binary files a/graphics/AltHUD/WallbusterCursor.png and b/graphics/AltHUD/WallbusterCursor.png differ diff --git a/graphics/AltHUD/WallbusterDisplay.png b/graphics/AltHUD/WallbusterDisplay.png index df9c5a2fb..2ba9a7846 100644 Binary files a/graphics/AltHUD/WallbusterDisplay.png and b/graphics/AltHUD/WallbusterDisplay.png differ diff --git a/graphics/AltHUD/WeaponBox.png b/graphics/AltHUD/WeaponBox.png index 1c82ae795..71898b066 100644 Binary files a/graphics/AltHUD/WeaponBox.png and b/graphics/AltHUD/WeaponBox.png differ diff --git a/graphics/AltHUD/YnykronDisplay.png b/graphics/AltHUD/YnykronDisplay.png index f5f400bd6..7d0df8873 100644 Binary files a/graphics/AltHUD/YnykronDisplay.png and b/graphics/AltHUD/YnykronDisplay.png differ diff --git a/graphics/AltHUD/YnykronIconBeam.png b/graphics/AltHUD/YnykronIconBeam.png index 80586e26c..c54fc0a51 100644 Binary files a/graphics/AltHUD/YnykronIconBeam.png and b/graphics/AltHUD/YnykronIconBeam.png differ diff --git a/graphics/AltHUD/YnykronIconVortex.png b/graphics/AltHUD/YnykronIconVortex.png index 1a7dfa973..b4c1f7d41 100644 Binary files a/graphics/AltHUD/YnykronIconVortex.png and b/graphics/AltHUD/YnykronIconVortex.png differ diff --git a/language.version b/language.version index 0dba92a11..dd2ffd1e2 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r109 \cu(Thu 9 Jun 11:35:24 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r109 \cu(2022-06-09 11:35:24)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r110 \cu(Thu 9 Jun 13:27:30 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r110 \cu(2022-06-09 13:27:30)\c-"; diff --git a/zscript/hud/swwm_althud.zsc b/zscript/hud/swwm_althud.zsc index c8465adc1..7fe79cff8 100644 --- a/zscript/hud/swwm_althud.zsc +++ b/zscript/hud/swwm_althud.zsc @@ -237,7 +237,7 @@ extend Class SWWMStatusBar AltAmmoTex[0] = TexMan.CheckForTexture("graphics/AltHUD/AmmoBoxT.png",TexMan.Type_Any); AltAmmoTex[1] = TexMan.CheckForTexture("graphics/AltHUD/AmmoBoxM.png",TexMan.Type_Any); AltAmmoTex[2] = TexMan.CheckForTexture("graphics/AltHUD/AmmoBoxB.png",TexMan.Type_Any); - MiniHudFont = Font.GetFont("MiniHUD"); + MiniHudFont = Font.GetFont("MiniHUDShadow"); MiniHudFontOutline = Font.GetFont("MiniHUDOutline"); mhudfontcol[MCR_DEMOHUD] = Font.FindFontColor("MiniDemoHUD"); mhudfontcol[MCR_IBUKIHUD] = Font.FindFontColor("MiniIbukiHUD"); @@ -478,18 +478,18 @@ extend Class SWWMStatusBar void Alt_DrawWeapons() { - if ( CPlayer.ReadyWeapon is 'SWWMWeapon' ) SWWMWeapon(CPlayer.ReadyWeapon).DrawWeaponAlt(FracTic,ss.x-(margin+55),ss.y-(margin+11),hs,ss); + if ( CPlayer.ReadyWeapon is 'SWWMWeapon' ) SWWMWeapon(CPlayer.ReadyWeapon).DrawWeaponAlt(FracTic,ss.x-(margin+56),ss.y-(margin+12),hs,ss); else { // generic display - double xx = ss.x-(margin+57), yy = ss.y-(margin+11); + double xx = ss.x-(margin+58), yy = ss.y-(margin+22); String str; int len; if ( CPlayer.ReadyWeapon.Ammo2 && (CPlayer.ReadyWeapon.Ammo2 != CPlayer.ReadyWeapon.Ammo1) ) { str = String.Format("%d",CPlayer.ReadyWeapon.Ammo2.Amount); len = str.Length(); - yy -= 11; + yy -= 12; Screen.DrawTexture(AltGenericAmmoTex[2],false,xx,yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); for ( int i=0; i=0; i-- ) @@ -667,17 +667,17 @@ extend Class SWWMStatusBar Screen.DrawTexture(AltAmmoTex[0],false,xx,yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); // score String sstr = String.Format("%09d",ScoreInter.GetValue()); - xx = ss.x-(margin+46); - yy -= 11; + xx = ss.x-(margin+48); + yy -= 12; Screen.DrawTexture(AltScoreTex,false,xx,yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); - xx += 9; + xx += 10; yy += 2; Screen.DrawText(MiniHUDFont,mhudfontcol[MCR_BRASS],xx,yy,sstr,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); } void Alt_DrawStatus() { - Screen.DrawTexture(AltStatusTex,false,margin,ss.y-(margin+20),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); + Screen.DrawTexture(AltStatusTex,false,margin,ss.y-(margin+22),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); String str; double ht = clamp(AltHealthInter.GetValue(fractic),0,10000); str = String.Format("%3d",clamp(round(ht),0,999)); @@ -689,32 +689,34 @@ extend Class SWWMStatusBar else if ( round(ht) > 100 ) hcolor = MCR_CYAN; if ( isInvulnerable() || CPlayer.mo.FindInventory("InvinciballPower") ) { - Screen.DrawTexture(AltHealthTex[4],false,margin+2,ss.y-(margin+18),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,hw); + Screen.DrawTexture(AltHealthTex[0],false,margin+3,ss.y-(margin+19),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,hw,DTA_ColorOverlay,Color(255,0,0,0)); + Screen.DrawTexture(AltHealthTex[4],false,margin+2,ss.y-(margin+20),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,hw); hcolor = MCR_WHITE; } else { - Screen.DrawTexture(AltHealthTex[0],false,margin+2,ss.y-(margin+18),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,hw); + Screen.DrawTexture(AltHealthTex[0],false,margin+3,ss.y-(margin+19),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,hw,DTA_ColorOverlay,Color(255,0,0,0)); + Screen.DrawTexture(AltHealthTex[0],false,margin+2,ss.y-(margin+20),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,hw); if ( ht > 100 ) { hw = min(ht-100,100); - Screen.DrawTexture(AltHealthTex[1],false,margin+2,ss.y-(margin+18),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,hw); + Screen.DrawTexture(AltHealthTex[1],false,margin+2,ss.y-(margin+20),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,hw); } if ( ht > 200 ) { hw = min(ht-200,300)/3.; - Screen.DrawTexture(AltHealthTex[2],false,margin+2,ss.y-(margin+18),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,hw); + Screen.DrawTexture(AltHealthTex[2],false,margin+2,ss.y-(margin+20),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,hw); } if ( ht > 500 ) { hw = min(ht-500,500)/5.; - Screen.DrawTexture(AltHealthTex[3],false,margin+2,ss.y-(margin+18),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,hw); + Screen.DrawTexture(AltHealthTex[3],false,margin+2,ss.y-(margin+20),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,hw); } } if ( CPlayer.mo.FindInventory("DivineSpriteEffect") ) { double falph = clamp((ht-1000)/6000.,0.,1.); - Screen.DrawTexture(AltHealthTex[5],false,margin+2,ss.y-(margin+18),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_Alpha,falph,DTA_LegacyRenderStyle,STYLE_Add); + Screen.DrawTexture(AltHealthTex[5],false,margin+2,ss.y-(margin+20),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_Alpha,falph,DTA_LegacyRenderStyle,STYLE_Add); String tst; double alph = .1; int trl = 9; @@ -723,98 +725,41 @@ extend Class SWWMStatusBar tst = "AAA"; SWWMUtility.ObscureText(tst,(gametic-trl)/3,true); trl--; - Screen.DrawText(MiniHUDFont,mhudfontcol[MCR_WHITE],margin+106,ss.y-(margin+18),tst,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_Alpha,falph*alph,DTA_LegacyRenderStyle,STYLE_Add); + Screen.DrawText(MiniHUDFont,mhudfontcol[MCR_WHITE],margin+107,ss.y-(margin+20),tst,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_Alpha,falph*alph,DTA_LegacyRenderStyle,STYLE_Add); } - Screen.DrawText(MiniHUDFont,mhudfontcol[hcolor],margin+106,ss.y-(margin+18),String.Format("%3d",clamp(round(ht),0,999)),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_Alpha,1.-falph); + Screen.DrawText(MiniHUDFont,mhudfontcol[hcolor],margin+107,ss.y-(margin+20),String.Format("%3d",clamp(round(ht),0,999)),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_Alpha,1.-falph); } else { - Screen.DrawText(MiniHUDFont,mhudfontcol[hcolor],margin+106,ss.y-(margin+18),String.Format("%3d",clamp(round(ht),0,999)),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); + Screen.DrawText(MiniHUDFont,mhudfontcol[hcolor],margin+107,ss.y-(margin+20),String.Format("%3d",clamp(round(ht),0,999)),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); int f = HealthFlash; if ( f && (gametic < f) ) { double alph = max((f-(gametic+FracTic))/25.,0.)**1.5; - Screen.DrawTexture(AltHealthTex[7],false,margin+2,ss.y-(margin+18),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,bhw,DTA_LegacyRenderStyle,STYLE_Add,DTA_Alpha,alph); - Screen.DrawText(MiniHUDFont,mhudfontcol[MCR_FLASH],margin+106,ss.y-(margin+18),str,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_LegacyRenderStyle,STYLE_Add,DTA_Alpha,alph); + Screen.DrawTexture(AltHealthTex[7],false,margin+2,ss.y-(margin+20),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,bhw,DTA_LegacyRenderStyle,STYLE_Add,DTA_Alpha,alph); + Screen.DrawText(MiniHUDFont,mhudfontcol[MCR_FLASH],margin+107,ss.y-(margin+20),str,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_LegacyRenderStyle,STYLE_Add,DTA_Alpha,alph); } if ( (CPlayer.health > 0) && (CPlayer.health <= 25) && (PulsePhase <= 15) ) { double alph = clamp(sin((PulsePhase-FracTic)*12.),0.,1.); - Screen.DrawTexture(AltHealthTex[6],false,margin+2,ss.y-(margin+18),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,hw,DTA_Alpha,alph); - Screen.DrawText(MiniHUDFont,mhudfontcol[MCR_REDFLASH],margin+106,ss.y-(margin+18),str,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_Alpha,alph); + Screen.DrawTexture(AltHealthTex[6],false,margin+2,ss.y-(margin+20),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,hw,DTA_Alpha,alph); + Screen.DrawText(MiniHUDFont,mhudfontcol[MCR_REDFLASH],margin+107,ss.y-(margin+20),str,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_Alpha,alph); } ht = clamp(LagHealthInter.GetValue(fractic),0,1000); double hwl = min(ht,100); if ( hwl > bhw ) - Screen.DrawTexture(AltHealthTex[8],false,margin+2,ss.y-(margin+18),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowLeftF,bhw,DTA_WindowRightF,hwl); + { + Screen.DrawTexture(AltHealthTex[8],false,margin+3,ss.y-(margin+19),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowLeftF,bhw,DTA_WindowRightF,hwl,DTA_ColorOverlay,Color(255,0,0,0)); + Screen.DrawTexture(AltHealthTex[8],false,margin+2,ss.y-(margin+20),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowLeftF,bhw,DTA_WindowRightF,hwl); + } } double ft = clamp(AltFuelInter.GetValue(fractic),0,120); - Screen.DrawTexture(AltFuelTex[swwm_superfuel],false,margin+2,ss.y-(margin+7),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,ft); + Screen.DrawTexture(AltFuelTex[swwm_superfuel],false,margin+3,ss.y-(margin+7),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,ft,DTA_ColorOverlay,Color(255,0,0,0)); + Screen.DrawTexture(AltFuelTex[swwm_superfuel],false,margin+2,ss.y-(margin+8),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,ft); let d = Demolitionist(CPlayer.mo); bool blink = (!d || (d.dashfuel > 20) || ((gametic%10) < 5)); double dt = clamp(AltDashInter.GetValue(fractic),0,120); - Screen.DrawTexture(AltDashTex,false,margin+2,ss.y-(margin+4),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,dt,DTA_ColorOverlay,Color(blink?0:96,0,0,0)); - } -} - -// fractic-compatible interpolators, with double value -Class SmoothLinearValueInterpolator -{ - private double val, oldval, diff; - - static SmoothLinearValueInterpolator Create( double val, double diff ) - { - let v = new("SmoothLinearValueInterpolator"); - v.oldval = v.val = val; - v.diff = diff; - return v; - } - void Reset( double newval ) - { - oldval = val = newval; - } - void Update( double newval ) - { - oldval = val; - if ( abs(newval-val) < diff ) val = newval; - else if ( val > newval ) val = max(newval,val-diff); - else val = min(newval,val+diff); - } - double GetValue( double fractic = 1. ) - { - return SWWMUtility.Lerp(oldval,val,fractic); - } -} -Class SmoothDynamicValueInterpolator -{ - private double val, oldval, factor, mindiff, maxdiff; - - static SmoothDynamicValueInterpolator Create( double val, double factor, double mindiff, double maxdiff ) - { - let v = new("SmoothDynamicValueInterpolator"); - v.oldval = v.val = val; - v.factor = factor; - v.mindiff = mindiff; - v.maxdiff = maxdiff; - return v; - } - void Reset( double newval ) - { - oldval = val = newval; - } - void Update( double newval ) - { - oldval = val; - if ( abs(newval-val) < mindiff ) val = newval; - else - { - double diff = min(abs(newval-val)*factor,maxdiff); - if ( val > newval ) val = max(newval,val-diff); - else val = min(newval,val+diff); - } - } - double GetValue( double fractic = 1. ) - { - return SWWMUtility.Lerp(oldval,val,fractic); + Screen.DrawTexture(AltDashTex,false,margin+3,ss.y-(margin+4),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,dt,DTA_ColorOverlay,Color(255,0,0,0)); + Screen.DrawTexture(AltDashTex,false,margin+2,ss.y-(margin+5),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,dt,DTA_ColorOverlay,Color(blink?0:96,0,0,0)); } } diff --git a/zscript/hud/swwm_hud.zsc b/zscript/hud/swwm_hud.zsc index f8de0e8f7..40031a7ac 100644 --- a/zscript/hud/swwm_hud.zsc +++ b/zscript/hud/swwm_hud.zsc @@ -2954,7 +2954,7 @@ Class SWWMStatusBar : BaseStatusBar { DrawTopStuff(true); Alt_DrawTopStuff(); - DrawInventory(54); + DrawInventory(56); Alt_DrawStatus(); Alt_DrawWeapons(); } diff --git a/zscript/swwm_common.zsc b/zscript/swwm_common.zsc index 13064b4c3..270e909c5 100644 --- a/zscript/swwm_common.zsc +++ b/zscript/swwm_common.zsc @@ -34,3 +34,65 @@ Class SWWMNothing : Actor Stop; } } + +// fractic-compatible interpolators, with double value +Class SmoothLinearValueInterpolator +{ + private double val, oldval, diff; + + static SmoothLinearValueInterpolator Create( double val, double diff ) + { + let v = new("SmoothLinearValueInterpolator"); + v.oldval = v.val = val; + v.diff = diff; + return v; + } + void Reset( double newval ) + { + oldval = val = newval; + } + void Update( double newval ) + { + oldval = val; + if ( abs(newval-val) < diff ) val = newval; + else if ( val > newval ) val = max(newval,val-diff); + else val = min(newval,val+diff); + } + double GetValue( double fractic = 1. ) + { + return SWWMUtility.Lerp(oldval,val,fractic); + } +} +Class SmoothDynamicValueInterpolator +{ + private double val, oldval, factor, mindiff, maxdiff; + + static SmoothDynamicValueInterpolator Create( double val, double factor, double mindiff, double maxdiff ) + { + let v = new("SmoothDynamicValueInterpolator"); + v.oldval = v.val = val; + v.factor = factor; + v.mindiff = mindiff; + v.maxdiff = maxdiff; + return v; + } + void Reset( double newval ) + { + oldval = val = newval; + } + void Update( double newval ) + { + oldval = val; + if ( abs(newval-val) < mindiff ) val = newval; + else + { + double diff = min(abs(newval-val)*factor,maxdiff); + if ( val > newval ) val = max(newval,val-diff); + else val = min(newval,val+diff); + } + } + double GetValue( double fractic = 1. ) + { + return SWWMUtility.Lerp(oldval,val,fractic); + } +} diff --git a/zscript/weapons/swwm_deathlydeathcannon.zsc b/zscript/weapons/swwm_deathlydeathcannon.zsc index f2cdafb99..ec7ec3ec8 100644 --- a/zscript/weapons/swwm_deathlydeathcannon.zsc +++ b/zscript/weapons/swwm_deathlydeathcannon.zsc @@ -4,6 +4,7 @@ Class Ynykron : SWWMWeapon { transient ui DynamicValueInterpolator ChargeInter; + transient ui SmoothDynamicValueInterpolator AltChargeInter; enum EChargeState { @@ -31,6 +32,8 @@ Class Ynykron : SWWMWeapon Super.HudTick(); if ( !ChargeInter ) ChargeInter = DynamicValueInterpolator.Create(int(chargelevel*10),.5,1,400); ChargeInter.Update(int(chargelevel*10)); + if ( !AltChargeInter ) AltChargeInter = SmoothDynamicValueInterpolator.Create(chargelevel*10,.5,1.,400.); + AltChargeInter.Update(chargelevel*10); if ( lastmode && (lastmode != inverted+1) && (Owner.player == players[consoleplayer]) ) { let bar = SWWMStatusBar(statusbar); diff --git a/zscript/weapons/swwm_deepdarkimpact.zsc b/zscript/weapons/swwm_deepdarkimpact.zsc index 42a7b1d7b..09eb7a9d1 100644 --- a/zscript/weapons/swwm_deepdarkimpact.zsc +++ b/zscript/weapons/swwm_deepdarkimpact.zsc @@ -50,6 +50,7 @@ Class DeepImpact : SWWMWeapon bool charging; transient ui DynamicValueInterpolator ChargeInter; + transient ui SmoothDynamicValueInterpolator AltChargeInter; transient int failtime; Property ClipCount : clipcount; @@ -59,6 +60,8 @@ Class DeepImpact : SWWMWeapon Super.HudTick(); if ( !ChargeInter ) ChargeInter = DynamicValueInterpolator.Create(clipcount,.5,1,25); ChargeInter.Update(clipcount); + if ( !AltChargeInter ) AltChargeInter = SmoothDynamicValueInterpolator.Create(clipcount,.5,1.,25.); + AltChargeInter.Update(clipcount); } override bool ReportHUDAmmo() diff --git a/zscript/weapons/swwm_thiccboolet.zsc b/zscript/weapons/swwm_thiccboolet.zsc index 296f72b0f..b037dd0c0 100644 --- a/zscript/weapons/swwm_thiccboolet.zsc +++ b/zscript/weapons/swwm_thiccboolet.zsc @@ -225,6 +225,7 @@ Class SilverBullet : SWWMWeapon int nkills; transient ui DynamicValueInterpolator ZoomInter; + transient ui SmoothDynamicValueInterpolator AltZoomInter; bool zoomed; double zoomlevel; @@ -249,6 +250,8 @@ Class SilverBullet : SWWMWeapon Super.HudTick(); if ( !ZoomInter ) ZoomInter = DynamicValueInterpolator.Create(int(zoomlevel*10),.5,1,20); ZoomInter.Update(int(zoomlevel*10)); + if ( !AltZoomInter ) AltZoomInter = SmoothDynamicValueInterpolator.Create(zoomlevel*10,.5,1.,20.); + AltZoomInter.Update(zoomlevel*10); if ( lastammo && (lastammo != fcbselected+1) && (Owner.player == players[consoleplayer]) ) { let bar = SWWMStatusBar(statusbar); diff --git a/zscript/weapons/swwm_weapons_althud.zsc b/zscript/weapons/swwm_weapons_althud.zsc index d74e2e7c5..c77849577 100644 --- a/zscript/weapons/swwm_weapons_althud.zsc +++ b/zscript/weapons/swwm_weapons_althud.zsc @@ -9,11 +9,12 @@ extend Class DeepImpact { if ( !AltWeaponBox ) AltWeaponBox = TexMan.CheckForTexture("graphics/AltHUD/DeepImpactDisplay.png",TexMan.Type_Any); if ( !AltAmmoBar ) AltAmmoBar = TexMan.CheckForTexture("graphics/AltHUD/DeepImpactBar.png",TexMan.Type_Any); - Screen.DrawTexture(AltWeaponBox,false,bx-7,by-24,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); - int chg = clamp(ChargeInter?ChargeInter.GetValue():clipcount,0,100); - int ct = int(((by-2)-(chg*20./100.))*hs); + Screen.DrawTexture(AltWeaponBox,false,bx-8,by-25,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); + double chg = clamp(AltChargeInter?AltChargeInter.GetValue(TicFrac):clipcount,0.,100.); + double ch = chg*20./100.; bool blinking = (failtime>gametic)&&((failtime-gametic)%8>=4); - Screen.DrawTexture(AltAmmoBar,false,bx-5,by-22,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_ClipTop,ct,DTA_ColorOverlay,blinking?Color(128,0,0,0):Color(0,0,0,0)); + Screen.DrawTexture(AltAmmoBar,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(AltAmmoBar,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)); } } @@ -26,9 +27,9 @@ extend Class ExplodiumGun { if ( !AltWeaponBox ) AltWeaponBox = TexMan.CheckForTexture("graphics/AltHUD/ExplodiumDisplay.png",TexMan.Type_Any); if ( !AltRoundTex ) AltRoundTex = TexMan.CheckForTexture("graphics/AltHUD/ExplodiumRound.png",TexMan.Type_Any); - Screen.DrawTexture(AltWeaponBox,false,bx-9,by-21,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); - if ( chambered ) Screen.DrawTexture(AltRoundTex,false,bx-7,by-19,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); - for ( int i=0; i=(magpos-preload)))?magstate[i]?Color(128,0,0,0):Color(0,0,0,0):magstate[i]?Color(160,0,0,0):Color(96,0,0,0),DTA_Desaturate,magstate[i]?192:0); + Screen.DrawTexture(AltRoundTex[0],false,bx-11,by-yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_ColorOverlay,((i<=magpos)&&(i>=(magpos-preload)))?magstate[i]?Color(128,0,0,0):Color(0,0,0,0):magstate[i]?Color(160,0,0,0):Color(96,0,0,0),DTA_Desaturate,magstate[i]?192:0); yy -= 4; } break; case 1: - yy = 24; + yy = 25; for ( int i=0; i<3; i++ ) { - Screen.DrawTexture(AltRoundTex[1],false,bx-10,by-yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_ColorOverlay,((i<=magpos)&&(i>=(magpos-preload)))?magstate[i]?Color(128,0,0,0):Color(0,0,0,0):magstate[i]?Color(160,0,0,0):Color(96,0,0,0),DTA_Desaturate,magstate[i]?192:0); + Screen.DrawTexture(AltRoundTex[1],false,bx-11,by-yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_ColorOverlay,((i<=magpos)&&(i>=(magpos-preload)))?magstate[i]?Color(128,0,0,0):Color(0,0,0,0):magstate[i]?Color(160,0,0,0):Color(96,0,0,0),DTA_Desaturate,magstate[i]?192:0); yy -= 8; } break; case 2: - yy = 24; + yy = 25; for ( int i=0; i<3; i++ ) { - Screen.DrawTexture(AltRoundTex[2],false,bx-10,by-yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_ColorOverlay,((i<=magpos)&&(i>=(magpos-preload)))?magstate[i]?Color(128,0,0,0):Color(0,0,0,0):magstate[i]?Color(160,0,0,0):Color(96,0,0,0),DTA_Desaturate,magstate[i]?192:0); + Screen.DrawTexture(AltRoundTex[2],false,bx-11,by-yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_ColorOverlay,((i<=magpos)&&(i>=(magpos-preload)))?magstate[i]?Color(128,0,0,0):Color(0,0,0,0):magstate[i]?Color(160,0,0,0):Color(96,0,0,0),DTA_Desaturate,magstate[i]?192:0); yy -= 8; } break; case 3: - yy = 22; + yy = 23; for ( int i=0; i<2; i++ ) { - Screen.DrawTexture(AltRoundTex[3],false,bx-10,by-yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_ColorOverlay,((i<=magpos)&&(i>=(magpos-preload)))?magstate[i]?Color(128,0,0,0):Color(0,0,0,0):magstate[i]?Color(160,0,0,0):Color(96,0,0,0),DTA_Desaturate,magstate[i]?192:0); + Screen.DrawTexture(AltRoundTex[3],false,bx-11,by-yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_ColorOverlay,((i<=magpos)&&(i>=(magpos-preload)))?magstate[i]?Color(128,0,0,0):Color(0,0,0,0):magstate[i]?Color(160,0,0,0):Color(96,0,0,0),DTA_Desaturate,magstate[i]?192:0); yy -= 12; } break; @@ -194,36 +195,36 @@ extend Class Sparkster bool blinking = (failtime>gametic)&&((failtime-gametic)%16>=8); if ( doublestacc ) { - Screen.DrawTexture(AltWeaponBox,false,bx-6,by-24,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); - Screen.DrawTexture(AltWeaponBox,false,bx-6,by-12,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); + Screen.DrawTexture(AltWeaponBox,false,bx-7,by-26,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); + Screen.DrawTexture(AltWeaponBox,false,bx-7,by-13,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); if ( nomag ) return; bool bRed; - int yy = 22; + int yy = 24; for ( int i=0; i<8; i++ ) { if ( clipcount <= i ) Screen.DrawTexture(AltRoundTex[0],false,bx-4,by-yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_Desaturate,255,DTA_ColorOverlay,Color(160,0,0,0)); else { bRed = ((i>=4)&&(clipcount<6)||(i<4)&&(clipcount<2)); - Screen.DrawTexture(AltRoundTex[bRed],false,bx-4,by-yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_ColorOverlay,Color(blinking?96:0,0,0,0)); + Screen.DrawTexture(AltRoundTex[bRed],false,bx-5,by-yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_ColorOverlay,Color(blinking?96:0,0,0,0)); } yy -= 2; - if ( i == 3 ) yy -= 4; + if ( i == 3 ) yy -= 5; } } else { - Screen.DrawTexture(AltWeaponBox,false,bx-6,by-12,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); + Screen.DrawTexture(AltWeaponBox,false,bx-7,by-13,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); if ( nomag ) return; bool bRed; - int yy = 10; + int yy = 11; for ( int i=0; i<4; i++ ) { - if ( clipcount <= i ) Screen.DrawTexture(AltRoundTex[0],false,bx-4,by-yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_Desaturate,255,DTA_ColorOverlay,Color(160,0,0,0)); + if ( clipcount <= i ) Screen.DrawTexture(AltRoundTex[0],false,bx-5,by-yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_Desaturate,255,DTA_ColorOverlay,Color(160,0,0,0)); else { bRed = (clipcount<2); - Screen.DrawTexture(AltRoundTex[bRed],false,bx-4,by-yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_ColorOverlay,Color(blinking?96:0,0,0,0)); + Screen.DrawTexture(AltRoundTex[bRed],false,bx-5,by-yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_ColorOverlay,Color(blinking?96:0,0,0,0)); } yy -= 2; } @@ -245,17 +246,18 @@ extend Class SilverBullet if ( !AltRoundTex[1] ) AltRoundTex[1] = TexMan.CheckForTexture("graphics/AltHUD/SilverBulletFCB.png",TexMan.Type_Any); if ( !AltRoundTex[2] ) AltRoundTex[2] = TexMan.CheckForTexture("graphics/AltHUD/SilverBulletXSBCasing.png",TexMan.Type_Any); if ( !AltRoundTex[3] ) AltRoundTex[3] = TexMan.CheckForTexture("graphics/AltHUD/SilverBulletFCBCasing.png",TexMan.Type_Any); - int zl = clamp(ZoomInter?ZoomInter.GetValue():int(zoomlevel*10),0,160); - if ( zl >= 10 ) + double zl = clamp(AltZoomInter?AltZoomInter.GetValue(TicFrac):(zoomlevel*10),0.,160.); + if ( zl >= 10. ) { - Screen.DrawTexture(AltWeaponBox[1],false,bx-14,by-26,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); + Screen.DrawTexture(AltWeaponBox[1],false,bx-15,by-28,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); double zw = zl*10./160.; - Screen.DrawTexture(AltZoomBar,false,bx-12,by-24,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,zw); + Screen.DrawTexture(AltZoomBar,false,bx-12,by-25,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,zw,DTA_ColorOverlay,Color(255,0,0,0)); + Screen.DrawTexture(AltZoomBar,false,bx-13,by-26,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,zw); } - Screen.DrawTexture(AltWeaponBox[0],false,bx-14,by-17,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); - if ( chambered ) Screen.DrawTexture(AltRoundTex[fcbchambered+fired*2],false,bx-12,by-15,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); + Screen.DrawTexture(AltWeaponBox[0],false,bx-15,by-18,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); + if ( chambered ) Screen.DrawTexture(AltRoundTex[fcbchambered+fired*2],false,bx-13,by-16,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); for ( int i=0; i