From 8d8da049f7b62ef2a045ad00cad03b48833773d4 Mon Sep 17 00:00:00 2001 From: mc776 <24984517+mc776@users.noreply.github.com> Date: Tue, 14 Feb 2023 06:13:57 -0800 Subject: [PATCH] sprites: new armour pickups. (#860) * sprites: new armour pickups. At this point they're not really just "vests" anymore so I've changed the pickup message as well. * sprites: darken armor pickup shadows. The darkest bits were far too light, making the sprites look floaty and billboardy compared to typical (Free)Doom assets. --- buildcfg.txt | 8 ++++---- lumps/dehacked/dehacked.txt | 4 ++-- sprites/arm1a0.png | Bin 786 -> 939 bytes sprites/arm1b0.png | Bin 867 -> 1003 bytes sprites/arm2a0.png | Bin 1030 -> 1131 bytes sprites/arm2b0.png | Bin 1090 -> 1195 bytes 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/buildcfg.txt b/buildcfg.txt index 689b9427..e9658621 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -2244,10 +2244,10 @@ MANFB8B2 35 18 ; These are normal items that appear in both Freedoom and FreeDM. AMMOA0 8 16 -ARM1A0 15 17 -ARM1B0 15 17 -ARM2A0 15 22 -ARM2B0 15 22 +ARM1A0 18 28 +ARM1B0 18 28 +ARM2A0 18 28 +ARM2B0 18 28 BAL1A0 8 12 BAL1B0 8 12 BAL1C0 17 21 diff --git a/lumps/dehacked/dehacked.txt b/lumps/dehacked/dehacked.txt index 3c4dfbbf..11f9c2e4 100644 --- a/lumps/dehacked/dehacked.txt +++ b/lumps/dehacked/dehacked.txt @@ -142,8 +142,8 @@ STARTUP5======================================================================== #else STARTUP5============================================================================\nThis is Freedoom, the free content first person shooter.\n\nFreedoom is freely redistributable under the terms of the modified BSD\nlicense. Check out the Freedoom website for more information:\n\n https://freedoom.github.io/\n============================================================================ #endif -GOTARMOR = Picked up a light armor vest. -GOTMEGA = Picked up a heavy armor vest. +GOTARMOR = Picked up some basic infantry armor. +GOTMEGA = Picked up some heavy assault armor. GOTHTHBONUS = Got a 1% health bonus. GOTARMBONUS = Got a 1% armor bonus. GOTSTIM = Picked up a small health pack. diff --git a/sprites/arm1a0.png b/sprites/arm1a0.png index 3e12c7449b3e4c19bedabe4a5be40dcdd71329ae..98f2ed37538caf409503f9263d09bbe3a8859026 100644 GIT binary patch literal 939 zcmV;c162HpP)spBM^uPL<9nXSb;2&&-)f$h-{~s*R^RU@$!eX%qlgT7xS=I;&d;IVx4)N}W84Ly%V6|FV(AU@3 zfR6T7Fzmb^afnA;bd9T{0JH>1lB5(8ApN8hz7OIs>OWny=w;*mh~wklTs1iz4u`PY z?aC^}aU9z1b_t?{=<8a>1&AMdRg1X97hEHt?RIN>L6ssf)exiysq15hz4XK(9&v91 zV_-I$nUR1H?j|i^uh+AgYdNYQRULvoep))>DK>e?N8T$iIcOFh2tkh{cFdea!?as2 zALhO8dQ#OyiLLcnz^u@75gfM69>&5?uvVLnO;z zLT}V96Apj&Eg>`B@Au(&JX%X1J>vqy4}Zm~=Fq(b2Rv3SofJ8Fft;DL6iSAS-m@^D z&kf|gxFr8Xk+t;EGcGXv@V82zSEedD(HEQDpBQK*?1|3HH=8X9R3(I}P$7VdXx7q4 zFB>YQz3Df%-{jodqqGz1@hh$MSD`aISTcE($MH#)>7`jFufCd$}F5Wl+dN={0 zXIvL0Nuy|QlBS`Q!sHC~asBo+*;7hb0-pO44^JgdP@^(AAjl`w-YWT7xdu==fqH29 zFOkmcfwQlL;m|G9M=1gWic1>1@x&C3bE^kS7i%+ci?c`X_xGM}Z(gi@{P^*BXJz|l{p-7(%m3$RyQ{yx9sd8h_y7Od z<^I~<=F-m2&dtrun>TO1efxHOeZ94{bvFaUV+Mx*^783G(%ybQ14A?eLp=k7x3_nB zdHHe%hRKsBXJ=?NMQuIvw)`2;O^w$_Dx21?s|x;TbtoX_p&3_h$N(0Y+vRT*3sh=l(2;aRX`kA}o^Be{;c zu!UDRSUZlM5LoLe=WebhyG*TVd!@QW%UY(G&_!I4Iv*7J-no5WEdAp{hi=Nk%cAW5 zk587cDI9K^(oyuCGdOHfiols=|9<>bX9`}V6&Pf$?>l$Fq==&jETe)Nd1slgKYJ%3 zaq1QEeM^=!U(4S*drDA9-2LEFu_n4dJ6Hd9U9Nrm>EUS}nqMCss%M`wDQjnxUM#1# z~x-~E){$}38V%arnw~v->;=050Z^6&J`?nV6ez#tCaKB97sTGeO z#{6Pp_mR6Dv!(eIFmzQ*Tq8h@rWashO3bk*`-!(uH00)|WTsW()*!S=6BL;Yp00i_>zopr0NHgcQ~&?~ diff --git a/sprites/arm1b0.png b/sprites/arm1b0.png index 81dcb7c8eda6be87d386d99f321e5bd771ce7b05..27765594a2fb0931998ad58e44619df5241950e1 100644 GIT binary patch literal 1003 zcmVJNR9M5!mLYc2yj#v7UYG#}EFlhDp=Z z9W0kiciL*Tj5+kBV5|%G;Rk>CWv+B~BuR210MbrwY?Q{km4M|diJSw_>*tq5RbSgVA`Ok2!W9A z_d}bHdo~@U{^SJeHfwnaDUU>@!_GR^vyc7wk}g*2`L~zUHDl(nvyS!5v;Q2JViF$?2MTWmh7gYb0wU;YKDJ~WTl4LqFgT8IN2^7Q;Chyr#W+b)0J2WA#$ z^5&W`!LbPpVLyKGmxGPEd23KFgU7R_n}VSzkW+#p%4wh#yy=IBilwH``Y>YeIWJp&_KAsA&Lm}hN1--BhEG4m=L z=SV%;wgko*6CBOZ!LmN39>qL%o*W>8`g=716Abfc zq*SJWB3mDUQ8KiEyrXCRhhR}O$zD+-=2?aRp+~%S~u59u8Xl5w^Ojo~n`;K13*Z#uW7?u>#xx>yn2|002ovPDHLkV1i#5+TZ{H literal 867 zcmeAS@N?(olHy`uVBq!ia0vp^@<1%e!3-pYs@ki86id3JuOkD)#(wTUiL5}rLb6AY zF9SoB8UsT^3j@P1pisjL28L1t28LG&3=CE?7#PG0=Ijcz0ZRM{@Ck8c`2Tx&C3bE^kS7i%+ci?c`X_xGM}Z(gi@{P^*BXJz|l{p-7(v)$G2r}O`x@BF`B`g5`P z>2UUbZEbIJX=i8W=H}+jn>XLSeY?KCelr8ZV+Mxn3=HM*_SV+c?->~W%gg__xBp*V z{XagwKi)jpUVgGZ!)XSFc4Y>Ab9rTLesg8vVg`og3=H)Q48iQ|`qJFd3=HYP_RF)g z%l);x85kx{p4^-rzI}dsd3m|AvT}HMxVyW1Hc<9|zO=NozP>&%0FJx=mH|?XB|(0{ z3=Yq3q=7g|-tI2JRq3*9Kn{C}r>`sfLuNif3!bfYVV{B0;hrvzAsXj%`(FkfG7xEX zUg+sDtHsI5OHr@mRM5pH>AVFxO*w~t+xHaC6uglC?A{$q_2~r&Y>$js>iY*9 zV)W!g`}{XF>ZFz)J(#&QET7@T1_dU!^s{L!=bZx+1WaD}eSNf?DOgE|#UO8M^v2g* zNg~X%Gdx+3P2EvjDH^`6H!vvw=OiJgygX~O`#ZJoYP&won|G=G`0_lFuk+$}yxlSP zefG(nMi=gGe%mo6===6Rau24oG(XHRk>YDvD6=Q;=K^g@S^s-#!q&;IU;A?HO?IEm z%oRJIb$Q9&gYqWx^{4%i)fX>bcX0ojYib6suP*z-SjVR-o3z6{2^i|CC9V-ADTyVi zR>?)FK#IZ0z|dURz*yJNB*f6%%GAut&`8(7+{(Zp`TfLOC>nC}Q!>*kacdCTqzQ^- N22WQ%mvv4FO#nk|J*ofz diff --git a/sprites/arm2a0.png b/sprites/arm2a0.png index 1ff0fc599cc3ec3c7e46d7e908007b0b9001ca91..c69927305f5971b1860729b2c8e6a68c90b3d5c0 100644 GIT binary patch literal 1131 zcmV-x1eE)UP)(MAZ zo}H!p*(}}Eb^3IAnyLeS(8C8ma*$WO=XZ5-k~Z_X3GMTDTU9pR3Jf~q z5Ecm#LT1e<&9b#~-&@Yd>0&ueSM4l)f1IbM&r_ROv(Gtn(8CA+RRDId#{}r5?~NJn zAow&}&OjkbI7886U#GivJF{k=bLhkafA43=JqVaA`Ehrbp1RH~15^n}3T~RpyaXs_ z)(Y2XT>Kdx5$NHYdoCdl zxo-l-!Fn<=A^~DNG|iA#D8q7;Z8n?q^6kMY3VK4q%$j|GUw0pj9zNw0@+2F2^r80; zU@&li6(t}B`<%;il3BoBUtd%Db)HhXw)y$_*#Ox;R~tl8%rIs=sXqTvyk);r#U0gI(vjB#zbmT90x(aHyj zdpjNvw9Kserbn&3uStiD-=~9b>8NB0?pN22U^pWr&|$s6U>&aKoE#!_$|ZSSz~nK7 zw$y=M^eYnPEiuI0Kmo`ZoD-JL0qM$s=RWWK%p*;wHnTS6g}2~W9;!&nTpR!yDEf*s za40}Rj=W!+mH{n_XsXDJz-^uPC|-|Jnm|LfimzobM5DP zfgJ6rRcL;CDF~dd81@J^9;gdodQL}RfWnA_L0K3wu-ND{R^ftHd3T=3fDfke9g_7rZm2C-%zFF|+o-z_!LA?b@JOa#ceUZ?=G zzi1w6<{J+i-^e=}lv)BFi{K(a0c*Vi)vHtxyi#=m$L9R5pIXA@<)wiu0WvH1qPGNy x3Kg)OXUhNhMR2kD;&TTY(d!zDZ}`8-{|#I$ql|}@0+j#&002ovPDHLkV1o3N3hn>^ literal 1030 zcmeAS@N?(olHy`uVBq!ia0vp^@<1%c!3-q%>$e{UQY`6?zK#qG8~eHcB(ehe3dtTp zz6=aiY77hwEes65fIKPe?Ck#j{@vZ(lP6DJzI^%i?c0wZKR$o{e06noWo2b)Y3Xc!eqmwZ zgxZqX9u&hr*m^RH#gTyOLr?PmzS64=jXe-yK{4M zv$L~1J3Fslz54m{=jP_-vyF{+hlgJ-E?)2M9v&WEUtho2+WL5MvOfdE>*>?)x3@RT z%P+ULf8O6;EG*owt-X2k=Iaa$j~N*LGcdR_Fih9ik7sA!%)n63z|hUW5DoO1F~54S zbo73Ie{1dhaOdXi@a6sG+vm5-JB!;l>zDt}pWmL}T^#Mqz+i6v-&|SPUR&DVS~)$~ zzB<|e)wEm3fPuwW666=m;PC858iFdh=kX=ZSUv@#;j7vc2 zcb+beAsXjnFXo2NHjrR@z#^w{$&6Dm!ZhMZYG2Tb(>-3Le5F?Rm!I4I|G$4&)t0KV z=W}XKl)iiJEY~7-u#IzCZsW~^FN)`=ZomCn*+*mZ-kT4560f{3y{o!BHNGQZr}>M^ zQ?HuloEBKWcHM=43%1K}JXBWkIkZA@$K6u1o`l8n&L%0ZW6cdTm6thiE|E+=@*(-) zjp=9C&sIxT`o?=GVwzJ^(X3^X&+n}`@OVHgDraflzIS=?u5AZaE#7sldfTk4mac0*U*nB;u(@l0WBxIP zn#HC6-r1aWeC6TC#%|BYCcLs;=#%7mSwkiV{_kPO?3*j?R}>oBEMaIl``_QR)N|>v z-L6k%WMwTwH`?}z=)QJ4Ya4Q}qb;n{Tie3Ul5b5?Oa!lNrIt%Rv&rY2y{4BczpiH5 z8+>is@h{P`ir%fJ+_~D9F>$fwJ0IV>^Ka+g!s(UYf4%zjsODj1(9!a~lI3jzhi3RK zEfx>=+*dG3{a@{e0M-fr&nkY9Z>qLGdGe6_{CV+l)*TFsyNnc8eE#+6&zFvW{Eu^Q zJYQbFTi)^A;q&#Dz{H?h;u=wsl30>zm0Xkxq!^4049#^7%ykVdLJZBV3{9pZuQr>B-3@Su+!_V~eH_MT^Ua$>8&z@1j%n=$gOz|c$W@Pj|b zM*(6-0)&%((XoEm?I6yL23@-v^=wx5?fZIQkGDOSjG1R0J@m1|ewF|`m@xr*swy{T zmpDERJLe@JL0BWuy2@=??j&R8Sw~Mc*jI54zXt)+PJS+z_BbBbsY?NMx>=o;>mqZO z0EJ|%bfK35Qws5me`VqzKwmB{{D2aKG~k%jRAHwu(e3T#0R$K%W9C^$4}I(g@hssF zzi$G@!s6`Al>~_Qz9{N*MKE?gAAhjLVqvS*%5N0E}i| z$eV7r{zfuR*U`rgdu_fg2H#41=G2A{s8`ia!LWwI-!D_YUFmM00uycNV?JdWJM8g; zzh(^duw@NA&K4h=&E_>gkc>eN_3RYK)Rpw?*=%NZdu#Uc^7=9k^XXZ^4txCI55H~k zYCsN(x2xZ6I#=kWr9ed#soMr9709~? z2+-TemTDof$cEzAhg~-zJ>Y4@9}b5$4m+77z}i?tdQ%v>1>IPc4hI$36kA>}NtH++C1eXym}wt++PdxwMx&LXLA zt4YkW4ydDAWZgah5Y%@#pW5bO>1m=`6A;O~I)XgUYhXy)7Z^t}W?db~!JtOPSzQ*m zDM-LkSOJzw7=%?AAgFGyx5TlX7BGP#69U`xQRVsL<{KUc5Ly3PxMY4WPrI#;n-WFD6Acl6&a6;h?L$(qUppwyr1 zc6py4F9`BFrj2g^9t}z*0R~cVO@IIsQ`8{!Yuvc!=jXjzsN(#tN5H1jsRwNWMDlW$ zbnDa>0f=%SV0&%K|9Did>Q*P*JP#J6m_SGRu#*02G=DLg&mUOC@eW}7LJ9x?002ov JPDHLkV1lQ*EP4O{ literal 1090 zcmZ{iYc$&j7{=eY^smAR(@iIJ!ug+}3rk$OM1sgd!%U)K%QS6?xGr|0qs_=E*0c>m zqsJ_Y%4o?pHB(k~n=@)!EnQtUm(!`XC_Ph3+LcuH@5g=EhxdKX^PKa0KRo9xjN)-^ zt(~j^z&1QAM1Uy?o42gYu}#Qp@5jU06A^|`KJIju_*sB zz%eSoay$T|0>Ck&y7NE)0L~}sqnJ=InQlp?5fKqgCX+&;$Q>O;2*T&{)oOKFS(#q1 zZ*OlO930f?bnfo%D2ft^L@9yb;NT#UNJJu$R4UbKwPRyrt$hBBLSd?^ibjwWJYK0( z<`Ic%6qU>6GMS9a<>K*p1VK0)PGe)^;^HEWMyvAm?Gg&dGBcaGT%k~ymzQ^u$sCkO z_yA9|+F6xK51?nU7B!ko2L~mIq@_@L0d4`b0%*u&t}ogv5}8OOQ(RmXfQiL2DHLh| zF2J7vaR~Ah;2}T?c0?+TNWCqor==(bhwn;7)6`waYFi}!YU!o4qSR8G>5gy8 z#cr2vu9qMCP%M{q6^_ijFj;)cpy@$nTKP~g zyJGk8Tn|@k53Ofr)3tb&ce~&q<>B&g4GF82S2_+1%o_v)Nw;zNX$A4a`yllYToYe_!9p{$VWsRKRR*OOt({)7c`cwZKUW-17jPfSJCRf{y1-?7!e# zKhd(+5J*5EVfp1RkLrG2%b_hV*Xg^bKF+ziaYB<|6}(bIu|-!@GNiw!C#rb=tI5*r z>V%&%Ix{B3TNCn|^r^z<=P$lj9Yi;n-8lUvsbq|>L}xs6_T~n`xiBJOo>s9NdyjXrLO;z)6lWzdBwr+90zOo4nirMk`^QuN1AHz^OiRxGe?VQ6K8^tp9?A>(@q_r2{{mJ3zkdJ#