From 017e6839156f44549c897e2e75df7bf7264da848 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Sat, 3 Sep 2022 19:52:47 +0200 Subject: [PATCH] 16 additional minihud gradients. --- damtypes.txt | 50 ++++++------- fonts/XekkasNum/0031.png | Bin 116 -> 108 bytes fonts/XekkasNum/0034.png | Bin 119 -> 119 bytes fonts/XekkasNum/0036.png | Bin 119 -> 116 bytes fonts/XekkasNum/0039.png | Bin 122 -> 111 bytes graphics/HUD/BiosparkShot.png | Bin 112 -> 108 bytes graphics/HUD/BlastRoundInert.png | Bin 102 -> 108 bytes graphics/HUD/DeepImpactBar.png | Bin 96 -> 96 bytes graphics/HUD/DemoFace_Head.png | Bin 401 -> 401 bytes graphics/HUD/EnemyBar1.png | Bin 89 -> 86 bytes graphics/HUD/HealthBar1.png | Bin 97 -> 97 bytes graphics/HUD/HellblazerCrackshot.png | Bin 147 -> 152 bytes graphics/HUD/HellblazerWarhead.png | Bin 152 -> 151 bytes graphics/HUD/ItamexBar.png | Bin 85 -> 85 bytes graphics/HUD/MenuShellBlue.png | Bin 129 -> 129 bytes graphics/HUD/MenuShellPurple.png | Bin 129 -> 129 bytes graphics/HUD/MisterGrenade.png | Bin 145 -> 145 bytes graphics/HUD/MisterGrenadeCasing.png | Bin 0 -> 127 bytes graphics/HUD/MisterRound.png | Bin 109 -> 109 bytes graphics/HUD/QuadravolCasing.png | Bin 133 -> 133 bytes graphics/HUD/QuadravolRound.png | Bin 133 -> 133 bytes graphics/HUD/RayKhomBar.png | Bin 111 -> 104 bytes graphics/HUD/RayKhomRound.png | Bin 146 -> 146 bytes graphics/HUD/ShellBlue.png | Bin 138 -> 134 bytes graphics/HUD/ShellBlueSmall.png | Bin 103 -> 110 bytes graphics/HUD/ShellGold.png | Bin 132 -> 121 bytes graphics/HUD/ShellPurple.png | Bin 138 -> 135 bytes graphics/HUD/ShellPurpleSmall.png | Bin 105 -> 110 bytes graphics/HUD/SilverBulletFCB.png | Bin 149 -> 149 bytes graphics/HUD/SilverBulletXSB.png | Bin 137 -> 137 bytes graphics/HUD/YnykronBarBeam.png | Bin 95 -> 95 bytes graphics/HUD/YnykronBarVortex.png | Bin 95 -> 89 bytes graphics/HUD/YnykronIconBeam.png | Bin 128 -> 124 bytes graphics/HUD/YnykronIconVortex.png | Bin 131 -> 131 bytes language.version | 4 +- textcolors.txt | 106 +++++++++++++++++++++++++++ zscript/hud/swwm_hud.zsc | 38 +++++++++- 37 files changed, 168 insertions(+), 30 deletions(-) create mode 100644 graphics/HUD/MisterGrenadeCasing.png diff --git a/damtypes.txt b/damtypes.txt index b6cfd2d65..f33d01e23 100644 --- a/damtypes.txt +++ b/damtypes.txt @@ -1,15 +1,15 @@ # from damnums Steel MiniWhite -Blood MiniRed -Ice MiniSilver -Fire MiniBrass +Blood MiniTomato +Ice MiniIce +Fire MiniOrange Earth MiniKirinHUD Quake MiniKirinHUD Electric MiniYellow Lightning MiniYellow Gravity MiniPurple -Poison MiniPurple -PoisonCloud MiniPurple +Poison MiniMagenta +PoisonCloud MiniMagenta Dark MiniIbukiHUD Rocket MiniGold Explode MiniGold @@ -20,11 +20,11 @@ Disintegrate MiniGreen BFG MiniGreen BFGSplash MiniGreen # from abort_m -Succ MiniDemoPink -Foam MiniGreen -PeaShot MiniGreen +Succ MiniPink +Foam MiniMint +PeaShot MiniGrass Salty MiniWhite -Rage MiniBrass +Rage MiniOrange Poke MiniKirinHUD Love MiniSayaHUD Thonk MiniYellow @@ -33,44 +33,44 @@ RaveYellow MiniYellow RaveGreen MiniGreen RaveCyan MiniCyan RaveBlue MiniBlue -RaveMagenta MiniPurple +RaveMagenta MiniMagenta # from doom tournament Pulsed MiniGreen Zapped MiniGreen Shot MiniYellow -Jolted MiniCyan -JoltedX MiniBrass +Jolted MiniCyanBlu +JoltedX MiniOrange RedeemerDeath MiniIbukiHUD Shredded MiniDemoPink Decapitated MiniSayaHUD Slime MiniGreen Impact MiniWhite -RipperAltDeath MiniRed +RipperAltDeath MiniTomato RocketDeath MiniKirinHUD GrenadeDeath MiniKirinHUD # from doomreal DAmmo1 MiniBlue DAmmo2 MiniGreen DAmmo3 MiniYellow -DAmmo4 MiniBrass +DAmmo4 MiniOrange DAmmo5 MiniRed -Stinger MiniKinylum -TarydiumCharge MiniKinylum +Stinger MiniAqua +TarydiumCharge MiniAqua Exploded MiniGold Stunned MiniCyan -Impaler MiniNokorokinylum +Impaler MiniMagenta PeaceDeath MiniGold PeaceBarrelDeath MiniGold BigShot MiniGold # from demolitionist -Love MiniDemoPink -Push MiniDemoBlue -AirRip MiniDemoBlue -Explodium MiniNokron +Love MiniPink +Push MiniCyanBlu +AirRip MiniCyanBlu +Explodium MiniFire Salt MiniKinylum -Concussion MiniPurple -CriticalConcussion MiniMana +Concussion MiniBlurp +CriticalConcussion MiniWitch Wallbust MiniSayaHUD Jet MiniWhite -Ynykron MiniVoidHUD -YnykronAlt MiniVoidHUD +Ynykron MiniPurb +YnykronAlt MiniPurb diff --git a/fonts/XekkasNum/0031.png b/fonts/XekkasNum/0031.png index 8051f3148160f78f230ac5bc2c21e3c95180f541..e9966600af8064e0e59b64ea4f3471736b361677 100644 GIT binary patch delta 77 zcmXTPnV{lf?CIhd!f`$J)InYbK@o?8oqA!?uL2e<+TtjA-?gds_(|q0?%gc=mbP0l+XkKrj8#~ delta 85 zcmc~PnV=G2?djqe!f`$H^hVwW1rdjX+_xj5rQ8x6$~JCozE!x7S83m;N$f={6Q?9t rm(5tQtwUVs%jVy@-@hJ=I>7v=k@r5=iR)Pm3=9mOu6{1-oD!M<7A7S8 diff --git a/fonts/XekkasNum/0034.png b/fonts/XekkasNum/0034.png index 20ed2e7f1c8965a87549ce5622a351cb97939c4a..8595dbe916632ee7bfe813e1501eb61093a97cd9 100644 GIT binary patch delta 81 zcmXRfpP=nyd&ZHmK|z4wpk-3TVVNrze4cD*yD~xI!^1o0|Cr6PdYk885i4x0yPSE+ o(%%kIyB4n8#hCQ}-$y3*5TR{}Y5R^aFfcH9y85}Sb4q9e00xvKwEzGB delta 81 zcmXRfpP=oNJSQ{y>wHG8OZ?jnjpnSp^<#cx<3szNv>)})?$)!hwf#4k_43WG!#p5h lFiY?(51X5Yv>pdTkgwd07q`|&F)%PNc)I$ztaD0e0s!gqA&LM1 diff --git a/fonts/XekkasNum/0036.png b/fonts/XekkasNum/0036.png index 771e79483b5bb74bfd4fcd6c340d56a9f0f3a8fd..1daf741489ce6b3145a92c3fe55a9a724af7eb97 100644 GIT binary patch delta 85 zcmXRfnV=G2?djqe!f`$Ilp}A0fe6dR@4_mH%+fCoxLv&R%Hdei!j=}xw>fMk(KaF5 r_iwV|J|f8SQ}lGf&k3`V?aUkE1f)gur}r~3Ffe$!`njxgN@xNA#rGjH delta 88 zcmXRZpP&+K=jq}Y!f`!0At51QMrQQa`HWl==RkdXK{zw-P1#>R*C t%*==Dc|>*6`RAuNF#VTIc^BLL9mK$#}@Q^ZAU|f-M`2YWabMYz{btxKNym=g_Ts#OQ|z3Ffe$!`njxgN@xNAv|Jt^ delta 81 zcmc~Pn4scg?&;zf!g1a7lq2r}1rgSRjP+kbxvw_1-TT!aap2hN#)4Zun~a|Be!7#T niucu0H4pn0tXt;pJ*?Yc!f`!$&dxVy{zqRwXLM&*-L%Bdw<3Fd49=a+PM4IBkoae87%Ww{CvN7#J8BJYD@<);T3K0RWgA9v=Vz diff --git a/graphics/HUD/DeepImpactBar.png b/graphics/HUD/DeepImpactBar.png index 1403248c620e3207712ea19f0fe81c613c458f57..d2351890bf6cf02532610a241fa24087c6aebe6d 100644 GIT binary patch delta 24 gcmYdDn4l@ZAeE+;Ff(oQnf?F&TjyM^nP{mF0CwmKvH$=8 delta 24 gcmYdDn4l@(8=O{LGjry$GyBi~-|_AFjER=&0FK)X&Hw-a diff --git a/graphics/HUD/DemoFace_Head.png b/graphics/HUD/DemoFace_Head.png index f12b8457d18b2664eeceeb1fa98e0fef04a5f3b0..6565587606d7024c32f68fb7d6bc8888bdfd88f4 100644 GIT binary patch delta 139 zcmbQpJdt^Vq3KM9GiMn7|Cg6fGnSIF^_}TElOfI8IIZJM+8Kt1{|qy2t7fM8&OGz~ zOx4CSGt>T`d3UaH_0oxH@+_PJi!V;>oTz2HiOtY;@v;x5_B;pk_uYQDpvQmpUWRGb xdK?X>rt(H~d@b4?JLTlEuAg0#T^KDzzUK4iF0I?*&%nUI;OXk;vd$@?2>>!lK4$;` delta 139 zcmbQpJdt^Vp(z8y%$W>l7#Pl+VffF$@c+NOe44S8l&$Z~G;8Cujx#fDt7fM8&OGz~ zOx4CSGt>T`c_-4O5jinUo~5(n$c%}d6SeMcVl#AIyzGPNeV&8)`))m4(Br>)FT*r# xJ&uM`t-KK(U;kCynR;?r*UzTOE{v8UTfYjP=YJdZhk=2C!PC{xWt~$(69CTfKSBTi diff --git a/graphics/HUD/EnemyBar1.png b/graphics/HUD/EnemyBar1.png index dcc342adf7169b1c587a7c4204fdb1e497968c1b..d743b40882aac41888e9e8632834ed002f9bb50e 100644 GIT binary patch delta 55 zcmazHo1kJO>*?YcqH#Vs#l!mZ{6q-`F*eQQwucWVrl+^Jx-gTe~DWM4f5?B&& delta 58 zcmWHGoSJ5L_G^L0|P^9?d=E#1_s3dpAc6DFfis|FivCeoym}<#E^D|q2WKnOkajG z9Sr}kGCY087sJ57z*rLG7tG-B>_!>`1B0rki(?3fY;wZqHysHH9_MG>)I9KjErr`) lLqy9eE&~G&E-o$xhD0Eal|A)B07e5roJB-NRL69OBa>IuJRW}8-fO5xM_)wVo53>CLIu3KJ5ex@-)nlT51FT>00tPOm4R>h-Ny_J42&f~e!&b5 z&u*kKFfgckx;Tb#$R;OzeRCoqfun!cP0a%jxKg+cHe@WB$!TD~!NtYJz>w+5diq_` SwhRUa1_n=8KbLh*2~7Y*=OuOk diff --git a/graphics/HUD/ItamexBar.png b/graphics/HUD/ItamexBar.png index efcc9e5e434d0cb63851bebaea1eca0c4d454d6b..2c0b9b68523ebfc0ba8ee165501aafb716f2776b 100644 GIT binary patch delta 45 zcmWFyouI1`eDuTr|B`M0(^pCSGd5IcoOqa#A#5Fc^`0w&%NQ6K7(8A5T-G@yGywqB C=n`}Q delta 45 zcmWFyouI36`QV5D|3lmUr&~$1xzGr5p{lC)Ck+*<BqnTFhJ9B25@0pot|F1Ntnsr{8=xPH1uTKn) delta 31 ncmZo{vkCA`RKPY{?L7{I^~-N<^6gL{Jz0|Nttr>mdKI;Vst0Il>J(f|Me delta 83 zcmbQpIFWIJfwZwPLz)Z2Oc#bT#`5xMw!SmdI?l{I^Z$`MThK&rNnOK)go4tv1Or2% ogcTaX2`_Tm69i@l1~4!LC$LWZAF(o+fq{X+)78&qol`;+0HOvQI{*Lx diff --git a/graphics/HUD/MisterGrenadeCasing.png b/graphics/HUD/MisterGrenadeCasing.png new file mode 100644 index 0000000000000000000000000000000000000000..2c831a29d13718248bd0a5f4c0a99d199d601039 GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0y~yU|?lnVBlb3W?*1Ad|!iufq_9Nz$e6&0Rp7b)DmW< zZ9cRA|NnRE{(3MlFff(``2{mLJiC#`z`!8w>Eal|A)B1wz@+BJ!?W%jQ$kLX%7FtK a8Vn4Q?o9dFVdQ&MBb@01ZkYQUCw| delta 70 zcmd1JouK15r}EkV|C_7N867zAb#b~RU%p>@iskO-I)}e5=IC^ve$L3iz~E1M%cuXw c3m6%0E)jP12xi*Ez`(%Z>FVdQ&MBb@0N&LfPyhe` diff --git a/graphics/HUD/QuadravolCasing.png b/graphics/HUD/QuadravolCasing.png index 692a40f9303f6b632d35cec0828e76add2581c91..552427c84251ca76ada7073e0f4f2d871535a330 100644 GIT binary patch delta 93 zcmZo=Y-OCFA0{OwrKYB)rfKZp;NTmaR$MbP)v&#dfq{XsB*-tA!Qt7BGzJC+X-^l& y5DwX7pZ_Oce48EkQ-1MFc>yM)h8Q)DYvw$WWNbu^{BZ{f`U`3=E#GelF{r5}E+m&mhzQ diff --git a/graphics/HUD/QuadravolRound.png b/graphics/HUD/QuadravolRound.png index e7d6e358ed3917525c83c0dd8341ecfe87ab5e61..e42482d225716386bfcba9adafe46d825c7b2c41 100644 GIT binary patch delta 22 ecmZo=Y-OBa$z#iKri$VJ8HW8uTTf1ObpQZbkqGqw delta 22 ecmZo=Y-OBa$>Ym#ri0=CRfb*H`f4V+IsgD%xCsXU diff --git a/graphics/HUD/RayKhomBar.png b/graphics/HUD/RayKhomBar.png index 42e08f6cd35c6ddec423de449114953274753118..ed1827bc7121242310133e30e07c48474e62a81d 100644 GIT binary patch delta 73 zcmd1Ln4sdqAK(+>YOKVN=F2d%f#J+|C*lVUIMM)@vrK`wR>W44$rjF6*2UngGsx9moIx diff --git a/graphics/HUD/RayKhomRound.png b/graphics/HUD/RayKhomRound.png index a02f7c9d0e24f7fcaaf24a5955c3011920464583..5f48365ab3c1234d28b3f184d42d653f27d96e63 100644 GIT binary patch delta 36 scmbQlIEitBp_DPhOkajGX$=1xICumEBoq`392^qrk9cjCo#^cj0KoeS=l}o! delta 36 scmbQlIEitBp%eqdOa_KC3=IDnICumEBoq`392^qra}HPUndt2f0HO*C3IG5A diff --git a/graphics/HUD/ShellBlue.png b/graphics/HUD/ShellBlue.png index e88fcc18d6f015c9c968a1f0f95f53d246b0a8b9..b79f0373eb761efcdde6b297f152fcd544b222f7 100644 GIT binary patch delta 117 zcmeBTY-5}tk;lQtz`zj0FM5uFfx*|)#W95Ada{kN@!S75H=mcRs{d)QpgDT?IU@($gaNxj!2MVcY8hGc#ANVl;>6?q`Jn84{(k%-9=!8v{00ADwEA=%J4A=H5 WOfBivl4W3EVDNPHb6Mw<&;$UN!!D2j delta 121 zcmZo;>|&fCQN+T`z`(Fhk>f7|1A}ycPl&4_0}Q04G0dFFaOTX+G~Y8b)Bay+_)uzb zo`HdZu_VYZn8D%MjWh-Z23b!R#}JO|$r{Clg=q;H{Jgw@2@D%WC1y;SGDU>J*^T9b T-v5iWAR|3p{an^LB{Ts5EE6Qx diff --git a/graphics/HUD/ShellBlueSmall.png b/graphics/HUD/ShellBlueSmall.png index fce4bd5afc4d4b9c2012aa90a200b9adb08a56f7..2b29f3ef0d56ecc0b4106dd92b9da5a99f810046 100644 GIT binary patch delta 79 zcmYe#o1o%l>gnPb!f`$MPyNz|^}lN6*(5ABeA79+mi1+iPI|vxvPHokotQ`0)@|nD l;ofq_(7{YPA_RL1!1_OZu4*RDx)z)d0CH1cP7^f_$9AY9^u=VMRRZAzG y@Kb+&b#ba1L#2=1nq`Za9)D#K@ITuxed>tV&wX!#<})xbFnGH9xvX|&fCQN+T`z`(Fhk>f7|1A}ycPl&4`0~8oDr1>(;Ok+4RGtKwR%(VYk8b0w# zm@zOgFqQ=Q1v5B2yOGAgz#!}C;uyklJz1l;urMtlgP)f-Fo9vCsKksZQ>KV8IJ>c2 T(EER}7G$KStDnm{r-UW|kijCv diff --git a/graphics/HUD/ShellPurpleSmall.png b/graphics/HUD/ShellPurpleSmall.png index eb8434d551b535cf0d4b557e2d8686f25ff743fa..ea4a3d9dc2761c51911a32fcf66609636d91516f 100644 GIT binary patch delta 79 zcmd1Io1o%l>gnPb!f`$MPyNz|^`1*rn0fZ>DV~;i@@r&|PI|vxaz*8H$(TpKHb3U! l;oxC!N9=4;OXk;vd$@?2>^4{A)f#M delta 74 zcmd1HoS@=r;OXKR!f`$MPyNz|^}G7`nR#r|ElzKksW^Ay(>E8>dCp6oJES_#@y372 gg@69@WH2zit>Js}I=A)=0|Nttr>mdKI;Vst0OwXA2mk;8 diff --git a/graphics/HUD/SilverBulletFCB.png b/graphics/HUD/SilverBulletFCB.png index 358fd08525c856a1059398c3db3dbb74d463cd5f..494f047cc753f86e022e2dae9f1e5d7aac31b4f0 100644 GIT binary patch delta 88 zcmbQrIF)gNzPxYo%>ET;W->6$O!Ga%z;I?}+Ov26|1&WBztSMy#hf(JPg1Yb{>c%A u0|k>W>Soj#O(>irs8!TG(QyJJ55v5Cb`3jkp63h<3=E#GelF{r5}E*e4I+yG delta 88 zcmbQrIF)gNzI<`b%$W=fGt+!$E<3aT{Qoly3}wV2cKS@2kDEUJQ v2R1ZcwD~tdctYV^L9I=bCpu1G|~svALUy-vwy{znQ6XfW~M!R_y7Nu1`}o_GX@3*#*!evUI9Zw4*`AtQE>hq~Y3Q;rGT?AxV3=mhZZ~mlZU+Mc1B0ilpUXO@geCyh Cq96qT delta 97 zcmeBV>|~svA5~m4b7q?F%w=cxpZ|YmX4?NN4f-oCu47;JJfq}u()z4*}Q$iB} DdC()k diff --git a/graphics/HUD/YnykronBarBeam.png b/graphics/HUD/YnykronBarBeam.png index 6d272a15bcce7e011ca458a2ab0a0af80b5eb299..12d28d17cd5bef0db514f393c9da68670404100d 100644 GIT binary patch delta 56 zcma!#pP*yBg3Idj|1)R)|6kp7?vMGj`9J43D!#QBW)?HhvUtPFD5Jq6*nFXD5d#AQ NgQu&X%Q~loCIA6J7i|Cl delta 56 zcma!#pP*yB#{c%8`xk<`9{%~5&h!1fU3$gekA}>`%wh&w7H?P?ZD(?8Zw)j{W?*1o N@O1TaS?83{1OWBw7QO%g diff --git a/graphics/HUD/YnykronBarVortex.png b/graphics/HUD/YnykronBarVortex.png index fb903dfd2dd611eb1a5f12310511bb135bad49dc..ca5d9d7220da4fee527f76ed34211eae4de39a4a 100644 GIT binary patch delta 70 zcma!#oFL)I!NkD8P$pR%#K6Fy;OXKRB5^tSU3_8Mzcn+B+V4#73sd{E&~GtgQu&X%Q~loCIG7l8HWG> diff --git a/graphics/HUD/YnykronIconBeam.png b/graphics/HUD/YnykronIconBeam.png index c54fc0a51fdc51a0773f40daf923c22a605d0553..43a80cb0fa727d615c17730dc9ded8057c5baec7 100644 GIT binary patch delta 94 zcmZo*teKz^;q2++7{YNqIUyk-VFj1f=lP7h2J>eAly|mdKI;Vst0Dw*+ A82|tP delta 98 zcmb5F=7{YNqIUyk-VTJ$gKl2%R4f1Bxi#Z!8T%0kH(erpc8(Z6d12bV} zX6D0xcb|W#rm#^`!p1l2zp;VApY}^U0e1@;lsFjd-bw#X@eEqXz`(%Z>FVdQ&MBb@ E07IxH0{{R3 diff --git a/graphics/HUD/YnykronIconVortex.png b/graphics/HUD/YnykronIconVortex.png index b4c1f7d41193c2b291f73253744221e94aa41863..f53b9385c58f7f5480c6a47e06e3599f344c2ad6 100644 GIT binary patch delta 90 zcmZo>Y-XHb5d0#(@LB!;F5~}_6Ao@J|DVY8f8mTq5J-KxZnJ@-TMDnwZ@>Ai#WmgO ui=@=wPy7~tPx-BV&)EjH32%S!Gx*Y-XHb5Ike&n=}7so<8>{-GS}*`Ty;lf7+ASKww(*_49{VBqy30+}%|sc20BM u%+9Pi`31M???2e`-@uGn%3<4Mdxkc4S>xgv#n}uD3=E#GelF{r5}E+AekZg5 diff --git a/language.version b/language.version index 321a259bc..e645e556b 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r399 \cu(Sat 3 Sep 18:28:13 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r399 \cu(2022-09-03 18:28:13)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r400 \cu(Sat 3 Sep 19:52:48 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r400 \cu(2022-09-03 19:52:48)\c-"; diff --git a/textcolors.txt b/textcolors.txt index 4c5fc8424..8179e7df9 100644 --- a/textcolors.txt +++ b/textcolors.txt @@ -260,6 +260,112 @@ MiniDemoPink // Pink from Demo-chan's chassis #993D7A #CC7AB1 152 203 #CC7AB1 #FFCCEE 204 255 } +// additional general colors +MiniOrange +{ + #000000 #FF8000 +} +MiniGrass +{ + #000000 #80FF00 +} +MiniMint +{ + #000000 #00FF80 +} +MiniAqua +{ + #000000 #0080FF +} +MiniMagenta +{ + #000000 #FF00FF +} +MiniPink +{ + #000000 #FF0080 +} +// additional specialized colors +MiniCrystal // gemstone-ish +{ + #000000 #003311 0 50 + #003311 #006633 51 101 + #006633 #269973 102 151 + #269973 #66CCBB 152 203 + #66CCBB #BFFFFF 204 255 +} +MiniFire // akin to zdoom's +{ + #000000 #330000 0 50 + #330000 #661400 51 101 + #661400 #993D00 102 151 + #993D00 #CC7A00 152 203 + #CC7A00 #FFCC00 204 255 +} +MiniSulfur // acidic looking +{ + #000000 #332200 0 50 + #332200 #664D00 51 101 + #664D00 #998000 102 151 + #998000 #CCBB00 152 203 + #CCBB00 #FFFF00 204 255 +} +MiniWitch // purple but faded highlights +{ + #000000 #000933 0 50 + #000933 #000066 51 101 + #000066 #331F99 102 151 + #331F99 #7A52CC 152 203 + #7A52CC #CC99FF 204 255 +} +MiniCyanblu // cyan-blue gradient +{ + #000000 #000033 0 50 + #000033 #001A66 51 101 + #001A66 #266099 102 151 + #266099 #66B3CC 152 203 + #66B3CC #BFFFFF 204 255 +} +MiniIce // more saturated Child of Ash HUD gradient +{ + #000000 #052433 0 50 + #052433 #1F4866 51 101 + #1F4866 #4D7399 102 151 + #4D7399 #8FA8CC 152 203 + #8FA8CC #E6EEFF 204 255 +} +MiniPurpur // blue-pink gradient +{ + #000000 #33001A 0 50 + #33001A #66004D 51 101 + #66004D #992699 102 151 + #992699 #B366CC 152 203 + #B366CC #DFBFFF 204 255 +} +MiniTomato // faded red gradient +{ + #000000 #330000 0 50 + #330000 #660000 51 101 + #660000 #992626 102 151 + #992626 #CC6666 152 203 + #CC6666 #FFBFBF 204 255 +} +MiniBlurp // blue-purple gradient +{ + #000000 #330F2D 0 50 + #330F2D #5C2966 51 101 + #5C2966 #734D99 102 151 + #734D99 #887ACC 152 203 + #887ACC #B3C0FF 204 255 +} +MiniPurb // purple-blue gradient +{ + #000000 #000033 0 50 + #000033 #1A0066 51 101 + #1A0066 #4D0099 102 151 + #4D0099 #9900CC 152 203 + #9900CC #FF00FF 204 255 +} // more colors will be added as needed over time // flash colors (flat, cut to black on outline/shadow) MiniFlash // "obtained" diff --git a/zscript/hud/swwm_hud.zsc b/zscript/hud/swwm_hud.zsc index 2fd82ae9f..26274510e 100644 --- a/zscript/hud/swwm_hud.zsc +++ b/zscript/hud/swwm_hud.zsc @@ -60,6 +60,22 @@ Enum EMiniHUDFontColor MCR_NOKOROKINYLUM, MCR_DEMOBLUE, MCR_DEMOPINK, + MCR_ORANGE, + MCR_GRASS, + MCR_MINT, + MCR_AQUA, + MCR_MAGENTA, + MCR_PINK, + MCR_CRYSTAL, + MCR_FIRE, + MCR_SULFUR, + MCR_WITCH, + MCR_CYANBLU, + MCR_ICE, + MCR_PURPUR, + MCR_TOMATO, + MCR_BLURP, + MCR_PURB, MCR_FLASH, MCR_REDFLASH, NUM_MINIHUD_COLOR @@ -1237,14 +1253,30 @@ Class SWWMStatusBar : BaseStatusBar mhudfontcol[MCR_NOKOROKINYLUM] = Font.FindFontColor("MiniNokorokinylum"); mhudfontcol[MCR_DEMOBLUE] = Font.FindFontColor("MiniDemoBlue"); mhudfontcol[MCR_DEMOPINK] = Font.FindFontColor("MiniDemoPink"); + mhudfontcol[MCR_ORANGE] = Font.FindFontColor("MiniOrange"); + mhudfontcol[MCR_GRASS] = Font.FindFontColor("MiniGrass"); + mhudfontcol[MCR_MINT] = Font.FindFontColor("MiniMint"); + mhudfontcol[MCR_AQUA] = Font.FindFontColor("MiniAqua"); + mhudfontcol[MCR_MAGENTA] = Font.FindFontColor("MiniMagenta"); + mhudfontcol[MCR_PINK] = Font.FindFontColor("MiniPink"); + mhudfontcol[MCR_CRYSTAL] = Font.FindFontColor("MiniCrystal"); + mhudfontcol[MCR_FIRE] = Font.FindFontColor("MiniFire"); + mhudfontcol[MCR_SULFUR] = Font.FindFontColor("MiniSulfur"); + mhudfontcol[MCR_WITCH] = Font.FindFontColor("MiniWitch"); + mhudfontcol[MCR_CYANBLU] = Font.FindFontColor("MiniCyanblu"); + mhudfontcol[MCR_ICE] = Font.FindFontColor("MiniIce"); + mhudfontcol[MCR_PURPUR] = Font.FindFontColor("MiniPurpur"); + mhudfontcol[MCR_TOMATO] = Font.FindFontColor("MiniTomato"); + mhudfontcol[MCR_BLURP] = Font.FindFontColor("MiniBlurp"); + mhudfontcol[MCR_PURB] = Font.FindFontColor("MiniPurb"); mhudfontcol[MCR_FLASH] = Font.FindFontColor("MiniFlash"); mhudfontcol[MCR_REDFLASH] = Font.FindFontColor("MiniRedFlash"); - tclabel = mhudfontcol[MCR_BRASS]; + tclabel = mhudfontcol[MCR_CYANBLU]; tcvalue = mhudfontcol[MCR_WHITE]; tcextra = mhudfontcol[MCR_IBUKIHUD]; tccompl = mhudfontcol[MCR_YELLOW]; tcsucks = mhudfontcol[MCR_RED]; - tclabel_s = "[MiniBrass]"; + tclabel_s = "[MiniCyanblu]"; tcextra_s = "[MiniIbukiHUD]"; minimapzoom = oldminimapzoom = 1.; LastHealth = CPlayer?CPlayer.health:100; @@ -2890,7 +2922,7 @@ Class SWWMStatusBar : BaseStatusBar int hcolor = MCR_RED; if ( round(ht) > 500 ) hcolor = MCR_YELLOW; else if ( round(ht) > 200 ) hcolor = MCR_PURPLE; - else if ( round(ht) > 100 ) hcolor = MCR_CYAN; + else if ( round(ht) > 100 ) hcolor = MCR_AQUA; if ( isInvulnerable() || CPlayer.mo.FindInventory("InvinciballPower") ) { Screen.DrawTexture(HealthTex[0],false,margin+3+ox,ss.y-(margin+19+oy),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,hw,DTA_ColorOverlay,Color(255,0,0,0));