From 79ba548a9880e968eba79c0881ced9d711fe87a6 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Wed, 26 Mar 2025 01:05:27 +0100 Subject: [PATCH] Fix up blood decals. --- decaldef.txt | 169 +++++++++++++---------------------- graphics/Decals/blslide1.png | Bin 270 -> 384 bytes graphics/Decals/blslide2.png | Bin 255 -> 268 bytes graphics/Decals/blslide3.png | Bin 139 -> 233 bytes graphics/Decals/blslide4.png | Bin 168 -> 346 bytes graphics/Decals/blslide5.png | Bin 196 -> 151 bytes graphics/Decals/blslide6.png | Bin 311 -> 358 bytes graphics/Decals/blslide7.png | Bin 390 -> 333 bytes graphics/Decals/blslide8.png | Bin 189 -> 360 bytes graphics/Decals/blsmear1.png | Bin 0 -> 1605 bytes graphics/Decals/blsmear2.png | Bin 0 -> 1339 bytes language.version | 4 +- 12 files changed, 64 insertions(+), 109 deletions(-) create mode 100644 graphics/Decals/blsmear1.png create mode 100644 graphics/Decals/blsmear2.png diff --git a/decaldef.txt b/decaldef.txt index 41fd58154..5b0bb0777 100644 --- a/decaldef.txt +++ b/decaldef.txt @@ -639,6 +639,22 @@ decal DemoSpray } // replace vanilla blood +stretcher BloodStretcherExtra +{ + StretchTime 35 + GoalY 1.5 +} +slider BloodSliderExtra +{ + SlideTime 35 + DistY -16 +} +combiner BloodSmearerExtra +{ + BloodStretcherExtra + BloodSliderExtra +} + decal BloodSplat1 { pic blsplat1 @@ -711,6 +727,15 @@ decal BloodSplat8 randomflipx randomflipy } +decal BloodSlide1 +{ + pic blslide1 + shade "BloodDefault" + x-scale 0.875 + y-scale 0.2 + randomflipx + animator BloodSmearerExtra +} decal BloodSplatX1 { pic blsplat1 @@ -721,14 +746,14 @@ decal BloodSplatX1 randomflipy LowerDecal "BloodSlide1" } -decal BloodSlide1 +decal BloodSlide2 { - pic blslide1 + pic blslide2 shade "BloodDefault" - x-scale 0.875 - y-scale 0.875 + x-scale 0.9 + y-scale 0.225 randomflipx - animator BloodStretcher + animator BloodSmearerExtra } decal BloodSplatX2 { @@ -740,14 +765,14 @@ decal BloodSplatX2 randomflipy LowerDecal "BloodSlide2" } -decal BloodSlide2 +decal BloodSlide3 { - pic blslide2 + pic blslide3 shade "BloodDefault" - x-scale 0.9 - y-scale 0.9 + x-scale 0.925 + y-scale 0.25 randomflipx - animator BloodStretcher + animator BloodSmearerExtra } decal BloodSplatX3 { @@ -759,14 +784,14 @@ decal BloodSplatX3 randomflipy LowerDecal "BloodSlide3" } -decal BloodSlide3 +decal BloodSlide4 { - pic blslide3 + pic blslide4 shade "BloodDefault" - x-scale 0.925 - y-scale 0.925 + x-scale 0.95 + y-scale 0.275 randomflipx - animator BloodStretcher + animator BloodSmearerExtra } decal BloodSplatX4 { @@ -778,14 +803,14 @@ decal BloodSplatX4 randomflipy LowerDecal "BloodSlide4" } -decal BloodSlide4 +decal BloodSlide5 { - pic blslide4 + pic blslide5 shade "BloodDefault" - x-scale 0.95 - y-scale 0.95 + x-scale 0.975 + y-scale 0.3 randomflipx - animator BloodStretcher + animator BloodSmearerExtra } decal BloodSplatX5 { @@ -797,14 +822,14 @@ decal BloodSplatX5 randomflipy LowerDecal "BloodSlide5" } -decal BloodSlide5 +decal BloodSlide6 { - pic blslide5 + pic blslide6 shade "BloodDefault" - x-scale 0.975 - y-scale 0.975 + x-scale 1.0 + y-scale 0.325 randomflipx - animator BloodStretcher + animator BloodSmearerExtra } decal BloodSplatX6 { @@ -816,14 +841,14 @@ decal BloodSplatX6 randomflipy LowerDecal "BloodSlide6" } -decal BloodSlide6 +decal BloodSlide7 { - pic blslide6 + pic blslide7 shade "BloodDefault" - x-scale 1.0 - y-scale 1.0 + x-scale 1.25 + y-scale 0.35 randomflipx - animator BloodStretcher + animator BloodSmearerExtra } decal BloodSplatX7 { @@ -835,14 +860,14 @@ decal BloodSplatX7 randomflipy LowerDecal "BloodSlide7" } -decal BloodSlide7 +decal BloodSlide8 { - pic blslide7 + pic blslide8 shade "BloodDefault" - x-scale 1.25 - y-scale 1.25 + x-scale 1.5 + y-scale 0.375 randomflipx - animator BloodStretcher + animator BloodSmearerExtra } decal BloodSplatX8 { @@ -854,15 +879,6 @@ decal BloodSplatX8 randomflipy LowerDecal "BloodSlide8" } -decal BloodSlide8 -{ - pic blslide8 - shade "BloodDefault" - x-scale 1.5 - y-scale 1.5 - randomflipx - animator BloodStretcher -} decalgroup BloodSplat { @@ -874,7 +890,6 @@ decalgroup BloodSplat BloodSplat6 1 BloodSplat7 1 BloodSplat8 1 - BloodSplatX1 1 BloodSplatX2 1 BloodSplatX3 1 @@ -887,7 +902,7 @@ decalgroup BloodSplat decal BloodSmear1 { - pic blslide1 + pic blsmear1 x-scale 0.625 y-scale 0.625 randomflipx @@ -896,76 +911,16 @@ decal BloodSmear1 } decal BloodSmear2 { - pic blslide2 + pic blsmear2 x-scale 0.65 y-scale 0.65 randomflipx shade "BloodDefault" animator BloodSmearer } -decal BloodSmear3 -{ - pic blslide3 - x-scale 0.675 - y-scale 0.675 - randomflipx - shade "BloodDefault" - animator BloodSmearer -} -decal BloodSmear4 -{ - pic blslide4 - x-scale 0.7 - y-scale 0.7 - randomflipx - shade "BloodDefault" - animator BloodSmearer -} -decal BloodSmear5 -{ - pic blslide5 - x-scale 0.725 - y-scale 0.725 - randomflipx - shade "BloodDefault" - animator BloodSmearer -} -decal BloodSmear6 -{ - pic blslide6 - x-scale 0.75 - y-scale 0.75 - randomflipx - shade "BloodDefault" - animator BloodSmearer -} -decal BloodSmear7 -{ - pic blslide7 - x-scale 0.775 - y-scale 0.775 - randomflipx - shade "BloodDefault" - animator BloodSmearer -} -decal BloodSmear8 -{ - pic blslide8 - x-scale 0.8 - y-scale 0.8 - randomflipx - shade "BloodDefault" - animator BloodSmearer -} decalgroup BloodSmear { BloodSmear1 1 BloodSmear2 1 - BloodSmear3 1 - BloodSmear4 1 - BloodSmear5 1 - BloodSmear6 1 - BloodSmear7 1 - BloodSmear8 1 } diff --git a/graphics/Decals/blslide1.png b/graphics/Decals/blslide1.png index eae7007605d46d95e30a0e99c2525d842ed47543..a9cb5f05d17df47ca56698d30dcd022353a7c6d4 100644 GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0y~yU{GRUV9?=UVPIfb<+8|czT9^W?`SoC+B^UK>@!M8O1%8)t#8dKTW6RdZ*x;zY|)V`7Ay;n=QGL zQs?39SWZFVS3VshPYXk6`bQF7vx^n)j)4E>Fs z`Yw=B)8x&s-&FL|s*7u{WjNDstE|H+q8qsvt+*)7+o;0AG(GCDm1KP0esJ;of)3bPd_eEGjv{*7=~%+A|)t}rk#FnGH9xvXw)yZ{KF+9XdlQCpJ3UU50yWt9Nm+OVuqS zb#A(T#rMo)rG4z1CwcWuYVBl~t;(13Y;g+mOxm(!`dghfb2tV2j78Z#em+vL=V$(3 Y)=*0yZT80xD?py|boFyt=akR{0FY&FC;$Ke diff --git a/graphics/Decals/blslide2.png b/graphics/Decals/blslide2.png index 819edfeb19d7d3a4a67302b2c723bd6bbffe40fa..7f73dfc5a7e9c4a2fd26f8637bc11e01226ce80d 100644 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0y~yVBlw9U{K;z`!8Nz`(%0 zH*bv$0|Uc;PZ!6Kid$Xm{Syx$K^pgL|trdEZCrzQ1$Mdb>zf(JPYwvye$*B2k>XU|9OB>ebyxkbJ znsNWG@wS9f~t$xe0CzWvo<1+t$rl8>a<{60F9b-JPdw*>Ly z{k~fFlAa~Fld80W zQnGm0@?8|Hd8;OT#KI|2PE)&S=ceNd#i^^^XZY`MG3$O}ZrP-1{#yF-M365$UHx3v IIVCg!0Ff19^#A|> diff --git a/graphics/Decals/blslide3.png b/graphics/Decals/blslide3.png index cb4fd07235ac0aab27c370530d7b26451255c87f..7fa9303cfae106586f7fa9538e35ef035eed8e23 100644 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0y~yVBlb2U=ZVAVPIegza{z_B#>U@nDqbu|33^2417B( zrPLW180L7oIEGZ*YCU0?btpli;o))pEv-r1nVRcjtK0bW?w!Bf!Cvr{rB9E~O0~_y zq+VpYfOuu)bakumpKjmGWt=hVhp`eva^kbq?eW4}n{|2)?B^-Ae<)mI9UbYdcwn_x zVy1kN!@IlfdV3n(mIVlLZ7>L1$!Q%>bsQL8&HZCl#= tKeSvw`QFx?+Y29^-1JxF-mPC@opa8z*gv}|ZhsDBqNl5$%Q~loCII&$H2nYo diff --git a/graphics/Decals/blslide4.png b/graphics/Decals/blslide4.png index 4f2edf028c0b29e7ef7b00dc3a9eaf3a6bda356b..2d1239d97c7d8d37326613f81db3d2264ccbe995 100644 GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0y~yV9;S;U{K{?VPIgG+;rH9fq{V|y~r_%fq_8?#GdA^ zxQ&5m);AnI-!`{v?y_l4rx+ewYF1bOSYY&7>F8nCjRkW2+n43tJ#tuid6ll7 zL0_}=UVhnk7mgnEo^SRb_R{f#HI|0Xiv>8>|7lQ8dbnnzYgd~!?~6qb7lm#xSaVVF z&cT3dCXciF<>IoZ_P)K=x#GMOFTbgTNlO6Hln z?g#cVEqL)Y?`-=a$-f7?eSCOy7T;L=IVYA`Z(nBve|2b<&a*RWb%hi62=Y(f8~j-0 zWa-?aCm+o}cykrsnO)Z&`O417)!ng{*?iW+5Av1;ktgS9ux)2xU|{fc^>bP0l+XkK D(Vmwm literal 168 zcmeAS@N?(olHy`uVBq!ia0y~yU{GdYU|{87VPIfLRh|2jfq{V|y~r_%fq{XCfq{X+ z-KQa)fq@~~)5S5Q;#TYVK(+%00xb^{b-kwuD2l)M+yBE{DI`Hzdqx3Q?`*F{6YWh8d$!L!aFM5fm%dY~v5EEj(El?#A1Ym#cjM#Fy?$~= W8#ege_WcnEvd+`h&t;ucLK6U6f;q(i diff --git a/graphics/Decals/blslide5.png b/graphics/Decals/blslide5.png index d51eb12b8ff6b8aa9de724f503538b0cdfcfc328..a34e6392e341e9b7d767aeafea9aaf0616a4807b 100644 GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0y~yU|?ZjU{K%yk@JrVUS(il;7BiWOk!YQ;9+23;Ix}y zahQRD!OPRdF{I+w)zgNe4F&=SE=;kDIN&DERwgF1fSGf}0fn?n5ASup_}0#{u}fhZ z%i{!2k^0pSR+*(Axvf3xy7Gse?DOuNck#~Y^jyMhe77b1!IE{Q3=9kmp00i_>zopr E033NTwEzGB literal 196 zcmeAS@N?(olHy`uVBq!ia0y~yU=U$oVBq9nVPIgGapK5f1_lO>^diS31_lOU1_lO( zrGFYs7#JAJJzX3_DsJ`mU1Vc+zopr05;rA AdjJ3c diff --git a/graphics/Decals/blslide6.png b/graphics/Decals/blslide6.png index 60093c912ed5b6c0338712a53e4d278b1601d84b..84e91e8815714de154466d62ad48055364623b3f 100644 GIT binary patch delta 344 zcmdna^o(hOc)dIa3j+g#eTVyJ1_lO>^diS31_lOk1_lORy|YoC3=E8to-U3d6}Q%2 zviD+k6gluPKV3K}L?oA0`h7xTqT;rD2bekUdF^SM8WF*IWW^8tn`ixwUCO<5=3M@- z{_hpSlakhZT~^Tu-SB)uK#z6d!xMgz8-lDqzd4*QX|S^}XHEU2Qw_@7?cUA~$U5}m z;<^Z~o@Hrqe|gxKyKOTt|Nbml!{VCd*7jrD-JBg%w`;Fu-#T&Ywdo!Ko>`T5cZ==y zj)?GL;k^CnSK0FmUQ=AOI~k^ZvMN})k*(x^g8KS%lT{t+4|&BMJj3OX#9*{fZ6#aXOSuf4MoRUpF$S}o{YtPg<8#X<4*`Fn0 zajd84{xVUUya>z9DM8;(aof*6pt8P9SmJc;8+&QtW|d1Z!qXWT7#KWV{an^LB{Ts5 DV561` delta 297 zcmaFHw4G^!cs(Bn3j+hgccy7)85kHi(u*9E7#J9&85kHCruLlv%D}+z%G1R$q~g}v z%NyI79Yv0RJTB2@%9Guh+F9Td;kQFgCi7ZhO!1o6>-{Qoic^10sQ)ore)E#MGk#R9 zpYiCh_Avt)$IBN#JFd=pIbTa1*L9KQGcOyCE~KMN9%%D5;qfEqO`W{2r?*CdiFWAeQMLZ zPJ?VPIg${a38bz`($fUgVg>z`(%Az`(%i z5|F)^fq{|1)5S5Q;?~sjJ9A|m1==oN-+HT+&zY&@$0wE(fihgqg&N9B7YJk+@iwWP zuuWgq9VWfx;JkmQ>V5=H+-*{oXcTk9urDp(i?#{Np6{XSWqCynX4Za*dU)MCL^j6i z#bjLpGX>G(=iIM9d+zOHCi}(FE?#TZm#XMEy;OEl^`#3LUM%=>EINLHuIOI1`y%`T z)23?F9?O?L#N)KS;KRA8H~$B$UA=2#dGhOh3m1j&F#ehMP5p^ih^)?~_|H{GIMe_C zk#Ka6k-5{ifHmEI?%`irYVL+jLYvu(oi_^U=GnHH1eu;RxR$iuY|1ayORmmhuf5Wj ow|!e3s49^!^VGuYF-HZ{zopr0Lqkt9RL6T literal 390 zcmeAS@N?(olHy`uVBq!ia0y~yU{GaXVBqIqVPIf5x!~Ll1_lO>^diS3kOBq<28Jq~ zmDd><7%e?r978H@Ej=HYE)&Sm_E5dJOd@h~@7gO|J6FX_zcl~i{yX*oRk6HNqoReC zvn8ziY|kxub5>ww&y&4>^yKz!cK6bD=egG8CGyos;Q`myYe7q|NZ2y0Nb$b8L12x* z7p>_{+RgXYGB2=r+uYl)ccCLnIK=zfH=Pt&qeXsC zA}5RzzBsD>;w?xrbBotuT|0H{cP)mSdsnnFUA}XBXK{8`$-1p&?Z?8+>t60LF1>JC z*z|1u*DQBYh3-wwy)SN=&)>2x*XHt}%jZfbdD|*BdoX6dwjs}EkQ;%ik85y+W1b&{;avjE8pNw=&Vm0zm5oG<(KqSedM u>8%2%(fZ{=KkS(_J{Ymh+#b9*@-OpWrp9wDoR`c%f$8b$=d#Wzp$Pyd1*MAs diff --git a/graphics/Decals/blslide8.png b/graphics/Decals/blslide8.png index 301b5166595c87b463ae90da12fceb1f041b7883..cbcb01b75f0205c6698a0dd31d4a5d8ec5f3831d 100644 GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0y~yU{GXWU{K~@VPIg`pt|}!0|Ns`dXZxi0|SE)0|Ns$ zzh40l0|TS9r;B4q#jT|mtg~bsMcOW24oyxjFlY=+=-JC;Z5Y@4QErcQbMjipl@6T_ zTwmOb7q48mI>b@DB)s0-{!h%qvw!>g6JM&{WSF$xuV(w68^_uO9_9b(?3kZ;@u|cl zcXytDKc8N?y|O8M~S($=|0 zb0-|w+?->w_*$2E^z&L4=8BEwioZITx|*9`{5~oe;$ODch4rfA)xbj>PKKAZD;-#% zu~)lcjny|H#(UhQvV~6ej3Uw-`&Mwh?$CCBY?ZX1!DDTF%g(FE^wWgj*W?MN2_L>C z`Y>%)$ITSisNb$fYclF9bD`NBsQxlPaJl)EOR$b3M+>XydqumHvfqDFm-|1Q_b S+t0wjz~JfX=d#Wzp$P!woS2LN literal 189 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