From 1d233226bbb44c044c039caaffb5ab7c6ef24588 Mon Sep 17 00:00:00 2001 From: Litogin <139079015+Litogin@users.noreply.github.com> Date: Sat, 4 May 2024 13:31:14 +0300 Subject: [PATCH] Animation of tails (#128) Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> --- .../Customization/Markings/tiefling_tails.yml | 31 ++++++++++++++++-- .../tiefling_tails.rsi/meta.json | 14 ++++++-- .../Customization/tiefling_tails.rsi/tail.png | Bin 0 -> 263 bytes .../tiefling_tails.rsi/tail_spades.png | Bin 1006 -> 321 bytes .../tiefling_tails.rsi/tail_spades_waggin.png | Bin 0 -> 1006 bytes .../{tail1.png => tail_waggin.png} | Bin 6 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail.png create mode 100644 Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_spades_waggin.png rename Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/{tail1.png => tail_waggin.png} (100%) diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml index cce02f97bd..dc15a65e08 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml @@ -7,7 +7,7 @@ forcedColoring: true sprites: - sprite: _CP14/Mobs/Customization/tiefling_tails.rsi - state: tail1 + state: tail - type: marking id: CP14TieflingTailSpades @@ -18,4 +18,31 @@ forcedColoring: true sprites: - sprite: _CP14/Mobs/Customization/tiefling_tails.rsi - state: tail_spades \ No newline at end of file + state: tail_spades + + + + +# Animation + +- type: marking + id: CP14TieflingTailAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + followSkinColor: true + forcedColoring: true + sprites: + - sprite: _CP14/Mobs/Customization/tiefling_tails.rsi + state: tail_waggin + +- type: marking + id: CP14TieflingTailSpadesAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + followSkinColor: true + forcedColoring: true + sprites: + - sprite: _CP14/Mobs/Customization/tiefling_tails.rsi + state: tail_spades_waggin diff --git a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/meta.json index d952a90435..fe836c7f5f 100644 --- a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/meta.json @@ -8,7 +8,15 @@ }, "states": [ { - "name": "tail1", + "name": "tail", + "directions": 4 + }, + { + "name": "tail_spades", + "directions": 4 + }, + { + "name": "tail_waggin", "directions": 4, "delays": [ [ @@ -54,7 +62,7 @@ ] }, { - "name": "tail_spades", + "name": "tail_spades_waggin", "directions": 4, "delays": [ [ @@ -100,4 +108,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail.png b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail.png new file mode 100644 index 0000000000000000000000000000000000000000..9c18fa7188a310c8e2171ec897b7059602d65999 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|mV3H5hE&XX zduyZMVFQlV#5pIobfzT>zjt(9XgNjcxnAq}M@|-hg+kvfm1HzHM9-3y6(uM#0W|`F z&cdzNqO^NDY_+jByjar3vTGq+w$KKFUboX=BKbY?cx-Z!7PbLxj_L0#Dlme1=< z+q^{+(!!_3m&qJYOS^n4F>>wJy5A~$ZgY9pvD81l)Mx1SeN(sLz1@F8x7Hta-4Sqg z-Ky_4HW14g82%?b{r^sRBmY^p`epj}-ZQ#Q399NTtVsBj&Xlz_n!_>3>m5*V#>^#C zR9Y0aUOQ_o$H1`fhVYHsslEETAC?1+;Y*G1O!M_+&;qhKpvGPbo(y7ny85}Sb4q9e E0NsXr82|tP literal 1006 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58aUX1(0r%WME)k;pyTS zQZeW4UBjZ)9wMv(Gjex$b^T)#u}b39C^~WL2B+XcGY6LgRx=K?x~FFUd(oexXZAeA zvhcxmle_(G2exZ~jK=`)u9n`NBgedi=kSLQzy7~AW-B`VvgFsNvzC32!>9kyRKW>vjX0{vAlSPE7%&prSAQGtcX^wUdgp5)iF`(Acg zf045zb~D4~OP}Z4H43ING8mS|W;<9vW86~wl63(i*qi9?cyltnMR?W!|Jm<%{xf3x zD*w5_;)VZ=miHmwcYRwQzhCKM%3*^uwfB#|(ogod8s~Fa#FMqk--nLQQaZ{O* znD)*ex3|sRF2I?_vwqtJj>XL$cUww6dzSvw)!Cujqgctm&elr2d@s|V@GIp;%WGtg zpDb=V^FXY}n*Z*$s?){8&{FeU=6S+F8 z`@^-fxwDqp$n|IQK6HM&*L1Tf)|E_zztMaGBmNfM}S3Bm-n|Dp?zvE?-r=LF;uPIx^7#bS-tu~(L z@P=R2ABxVte?1QzqHB!W3S}OzSB$-W_OZpf_#L^oD}P4r|CPOb|GK@ct4flCdKPh_SOC1DmQP)oV94Sf>29^ z>fMGX2S19w%VP))of>_EW#z4vY+F?R_dJ$3xp=zufwU#U1=rVA&$ZuC_BJ}%!|cKI z>EgW^?}K;~xH*q_Mtd&3d#XlYQWe)5&2Lf_>1SCY5}H{GnXowoDE6dwxyH}kmm44M z_Q*d_()DeA%zm~5%d>8q%~FaH`N=z@Ym$D~^|SxgudiqPlhCQLd0FPELYc*lt4{Ln zXnhtQ8ah+v@H^GbZ+5SnJ>B4P%Cy8Ho|C~IR!(y_lr&`A-u8Lgqcg#uC*JCiVraQq xYP;Ml>C+c>k@d^_*3M~Y5M8>z7UZg&i}(M`KE5E|YRwT4*VEO{Wt~$(698L7(Psbv diff --git a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_spades_waggin.png b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_spades_waggin.png new file mode 100644 index 0000000000000000000000000000000000000000..df360c4f3aea9e352e81bebb006ebe647ab490d6 GIT binary patch literal 1006 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58aUX1(0r%WME)k;pyTS zQZeW4UBjZ)9wMv(Gjex$b^T)#u}b39C^~WL2B+XcGY6LgRx=K?x~FFUd(oexXZAeA zvhcxmle_(G2exZ~jK=`)u9n`NBgedi=kSLQzy7~AW-B`VvgFsNvzC32!>9kyRKW>vjX0{vAlSPE7%&prSAQGtcX^wUdgp5)iF`(Acg zf045zb~D4~OP}Z4H43ING8mS|W;<9vW86~wl63(i*qi9?cyltnMR?W!|Jm<%{xf3x zD*w5_;)VZ=miHmwcYRwQzhCKM%3*^uwfB#|(ogod8s~Fa#FMqk--nLQQaZ{O* znD)*ex3|sRF2I?_vwqtJj>XL$cUww6dzSvw)!Cujqgctm&elr2d@s|V@GIp;%WGtg zpDb=V^FXY}n*Z*$s?){8&{FeU=6S+F8 z`@^-fxwDqp$n|IQK6HM&*L1Tf)|E_zztMaGBmNfM}S3Bm-n|Dp?zvE?-r=LF;uPIx^7#bS-tu~(L z@P=R2ABxVte?1QzqHB!W3S}OzSB$-W_OZpf_#L^oD}P4r|CPOb|GK@ct4flCdKPh_SOC1DmQP)oV94Sf>29^ z>fMGX2S19w%VP))of>_EW#z4vY+F?R_dJ$3xp=zufwU#U1=rVA&$ZuC_BJ}%!|cKI z>EgW^?}K;~xH*q_Mtd&3d#XlYQWe)5&2Lf_>1SCY5}H{GnXowoDE6dwxyH}kmm44M z_Q*d_()DeA%zm~5%d>8q%~FaH`N=z@Ym$D~^|SxgudiqPlhCQLd0FPELYc*lt4{Ln zXnhtQ8ah+v@H^GbZ+5SnJ>B4P%Cy8Ho|C~IR!(y_lr&`A-u8Lgqcg#uC*JCiVraQq xYP;Ml>C+c>k@d^_*3M~Y5M8>z7UZg&i}(M`KE5E|YRwT4*VEO{Wt~$(698L7(Psbv literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail1.png b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_waggin.png similarity index 100% rename from Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail1.png rename to Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_waggin.png