From d0bdbc875e6c0ada328ec487f7647d2102999228 Mon Sep 17 00:00:00 2001 From: Farrellka <104170263+Farrellka-dev@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:49:04 +0300 Subject: [PATCH] Elf Ears (#33572) * Elf Supremacy * Delete old ears * Review Fix --- Resources/Locale/en-US/markings/ears.ftl | 7 ++- .../Mobs/Customization/Markings/ears.yml | 57 +++++++++++++++++- .../Mobs/Customization/ears.rsi/long_ears.png | Bin 186 -> 0 bytes .../ears.rsi/long_ears_small.png | Bin 0 -> 753 bytes .../ears.rsi/long_ears_standard.png | Bin 0 -> 686 bytes .../Customization/ears.rsi/long_ears_tall.png | Bin 0 -> 826 bytes .../Customization/ears.rsi/long_ears_thin.png | Bin 0 -> 601 bytes .../ears.rsi/long_ears_upwards.png | Bin 0 -> 789 bytes .../Customization/ears.rsi/long_ears_wide.png | Bin 0 -> 675 bytes .../Mobs/Customization/ears.rsi/meta.json | 25 +++++++- 10 files changed, 84 insertions(+), 5 deletions(-) delete mode 100644 Resources/Textures/Mobs/Customization/ears.rsi/long_ears.png create mode 100644 Resources/Textures/Mobs/Customization/ears.rsi/long_ears_small.png create mode 100644 Resources/Textures/Mobs/Customization/ears.rsi/long_ears_standard.png create mode 100644 Resources/Textures/Mobs/Customization/ears.rsi/long_ears_tall.png create mode 100644 Resources/Textures/Mobs/Customization/ears.rsi/long_ears_thin.png create mode 100644 Resources/Textures/Mobs/Customization/ears.rsi/long_ears_upwards.png create mode 100644 Resources/Textures/Mobs/Customization/ears.rsi/long_ears_wide.png diff --git a/Resources/Locale/en-US/markings/ears.ftl b/Resources/Locale/en-US/markings/ears.ftl index 62921f5e44..4c35ed9f41 100644 --- a/Resources/Locale/en-US/markings/ears.ftl +++ b/Resources/Locale/en-US/markings/ears.ftl @@ -1 +1,6 @@ -marking-HumanLongEars = Long Ears +marking-HumanLongEars = Long Ears Standard +marking-LongEarsWide = Long Ears Wide +marking-LongEarsSmall = Long Ears Small +marking-LongEarsUpwards = Long Ears Upwards +marking-LongEarsTall = Long Ears Tall +marking-LongEarsThin = Long Ears Thin diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml index 6e35088032..c32348b273 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml @@ -2,9 +2,64 @@ id: HumanLongEars bodyPart: HeadTop markingCategory: HeadTop + forcedColoring: true + followSkinColor: true speciesRestriction: [Human, Dwarf] + sprites: + - sprite: Mobs/Customization/ears.rsi + state: long_ears_standard + +- type: marking + id: LongEarsWide + bodyPart: HeadTop + markingCategory: HeadTop forcedColoring: true followSkinColor: true + speciesRestriction: [Human] + sprites: + - sprite: Mobs/Customization/ears.rsi + state: long_ears_wide + +- type: marking + id: LongEarsSmall + bodyPart: HeadTop + markingCategory: HeadTop + forcedColoring: true + followSkinColor: true + speciesRestriction: [Human, Dwarf] + sprites: + - sprite: Mobs/Customization/ears.rsi + state: long_ears_small + +- type: marking + id: LongEarsUpwards + bodyPart: HeadTop + markingCategory: HeadTop + forcedColoring: true + followSkinColor: true + speciesRestriction: [Human] + sprites: + - sprite: Mobs/Customization/ears.rsi + state: long_ears_upwards + +- type: marking + id: LongEarsTall + bodyPart: HeadTop + markingCategory: HeadTop + forcedColoring: true + followSkinColor: true + speciesRestriction: [Human] + sprites: + - sprite: Mobs/Customization/ears.rsi + state: long_ears_tall + +- type: marking + id: LongEarsThin + bodyPart: HeadTop + markingCategory: HeadTop + forcedColoring: true + followSkinColor: true + speciesRestriction: [Human, Dwarf] sprites: - sprite: Mobs/Customization/ears.rsi - state: long_ears + state: long_ears_thin diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears.png b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears.png deleted file mode 100644 index 6779427f10a258cdba250d689807facf126133d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|N<3X0Ln`LH zy|t0^Z~za>h0{XvHm%>~or5|43Hd!eXHl3abh!GhqTk*r3Tc%G+iM@XMbNP*WrehM3)1LmDd+yzr{SV9` bs(u`kF4>WGs!jRi3Xp)OtDnm{r-UW|q1j2p diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_small.png b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_small.png new file mode 100644 index 0000000000000000000000000000000000000000..c6cdebef00521c119c35fbefe0efc9c82d6b4b29 GIT binary patch literal 753 zcmVEX>4Tx04R}tkv&MmP!xqvQ^g_`1v`i+WT;MdQ4z;lg(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yULJ2)x2NQw6)g%&YBxV(?^-Z|WNA0RX;OtZS;fTr7K zI++l&xmB^}6(NK%Ks72e%b1g-6nxj$Jpz2ci}5V~dw;GzHE%H>AQH!!VcNtS#50?= z!FiuJ!b-AAd`>)JQiH^gTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpSP&II3zo)|5Tqat9cCGGtSBr6841C;;zg^i4Tn@D}J@^XAq%$LRx*p;@JFfP+I| zyhz#WKJN~7&h6hjt@-@`ULSWNx zf)4Io{0hE&*jm4WOZE&E(j}5kMhHzIAjic>3`7$Wwd()31@6sr?mc%r5&-;T?z086 z=|sbQ&x-HE^KtE-hdcjm-SRPZl5~1`-KoH8eq9aa>>|HOwrf&E7RHif+s6lT&eiTQ zGh59UlH>*>ueUCh^NYI6Wtf>HnIyH%-)OREF!B@yzI*+7t<`*?DDZndd^JB$QdN84 zoKv2pUzQI500000000000KZ=FQEDoj?TumxjWR>-p)s}65oCSd6L@m(^663x9YrW`w|K#7gt)R3%I|%k<@)8 j2LJ#700000fIsX7D^!sPg4vV500000NkvXXu0mjf7kgDr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_standard.png b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_standard.png new file mode 100644 index 0000000000000000000000000000000000000000..38d7137e61b3d457bc55880eb9ae2caa0b210bd5 GIT binary patch literal 686 zcmV;f0#W^mP)EX>4Tx04R}tkv&MmP!xqvQ^g_`1v`i+WT;MdQ4z;lg(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yULJ2)x2NQw6)g%&YBxV(?^-Z|WNA0RX;OtZS;fTr7K zI++l&xmB^}6(NK%Ks72e%b1g-6nxj$Jpz2ci}5V~dw;GzHE%H>AQH!!VcNtS#50?= z!FiuJ!b-AAd`>)JQiH^gTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpSP&II3zo)|5Tqat9cCGGtSBr6841C;;zg^i4Tn@D}J@^XAq%$LRx*p;@JFfP+I| zyhz#WKJN~7&h6hjt@-@`ULb7kh-rFMN+8^##XzBzY&+k|tKySq^5YLQpf z)^Bv_?4i-6S+YI=00000000000Q|Jx^Ybi@#Np@-o)K8nm|2EVvN-BJqhHfk<^!IK zU}pd}w*YmnCd~)zh6ep06h)edN-J5U$>u(RB28qamE4~_erx~$00000006i>0AZ`i U|6;tX>;M1&07*qoM6N<$f&!T?2LJ#7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_tall.png b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_tall.png new file mode 100644 index 0000000000000000000000000000000000000000..f42a86613a91e271169c6539cca1b69bd1e56120 GIT binary patch literal 826 zcmV-A1I7G_P)EX>4Tx04R}tkv&MmP!xqvQ^g_`1v`i+WT;MdQ4z;lg(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yULJ2)x2NQw6)g%&YBxV(?^-Z|WNA0RX;OtZS;fTr7K zI++l&xmB^}6(NK%Ks72e%b1g-6nxj$Jpz2ci}5V~dw;GzHE%H>AQH!!VcNtS#50?= z!FiuJ!b-AAd`>)JQiH^gTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpSP&II3zo)|5Tqat9cCGGtSBr6841C;;zg^i4Tn@D}J@^XAq%$LRx*p;@JFfP+I| zyhz#WKJN~7&h6hjt@-@`UL?m{+ z>d?KPqAwpd#@)%q-629i2xRL?4+A}rr;CwTt#?Tyk^29wUha9x#pOAG=%g%8k;SQ$ zd`7Z3{TJ~803ss3Nn~*Z@CskVSvSW1ORCFx+mA> zzc0okL}7p^4E|hrai4at`|F-j80_NL6?^YH{QCHW&l}jTtNni{kH0;Q$4+Ra_${AB zok1VV=>!0jW2stBC+H0NwKgD+pUh{LaxyooHLNzuYU5oz;GXv%boJrs8SP#dxA%7kbNVJ5V70+!wMH_Z zc^6-*0Y5*7$CtN@YCwLCr%drgL_|bHL_|bHL_}BS8_B69Xc=)$qyPW_07*qoM6N<$ Ef=F$8X#fBK literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_thin.png b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_thin.png new file mode 100644 index 0000000000000000000000000000000000000000..a910e67f6d07167dd7bdcc25745d90da09a95c24 GIT binary patch literal 601 zcmV-f0;c_mP)EX>4Tx04R}tkv&MmP!xqvQ^g_`1v`i+WT;MdQ4z;lg(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yULJ2)x2NQw6)g%&YBxV(?^-Z|WNA0RX;OtZS;fTr7K zI++l&xmB^}6(NK%Ks72e%b1g-6nxj$Jpz2ci}5V~dw;GzHE%H>AQH!!VcNtS#50?= z!FiuJ!b-AAd`>)JQiH^gTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpSP&II3zo)|5Tqat9cCGGtSBr6841C;;zg^i4Tn@D}J@^XAq%$LRx*p;@JFfP+I| zyhz#WKJN~7&h6hjt@-@`UL>rFpo zZfx@b00000000=X?EbuK+K7nH_3v+Z{1*@rsi?}Vy_4J_*8@|;rGuZ&XFqd`$6Xz# n{UH{sW%8y0000000G>Dliy|+{59 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_upwards.png b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_upwards.png new file mode 100644 index 0000000000000000000000000000000000000000..8454708d9e41e25fcae454885b23a85f80053214 GIT binary patch literal 789 zcmV+w1M2*VP)EX>4Tx04R}tkv&MmP!xqvQ^g_`1v`i+WT;MdQ4z;lg(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yULJ2)x2NQw6)g%&YBxV(?^-Z|WNA0RX;OtZS;fTr7K zI++l&xmB^}6(NK%Ks72e%b1g-6nxj$Jpz2ci}5V~dw;GzHE%H>AQH!!VcNtS#50?= z!FiuJ!b-AAd`>)JQiH^gTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpSP&II3zo)|5Tqat9cCGGtSBr6841C;;zg^i4Tn@D}J@^XAq%$LRx*p;@JFfP+I| zyhz#WKJN~7&h6hjt@-@`UL#eG)o>TsHRYBl7zn^a&?*FZ|znA~>^!$3#!VmKU*ZFhIz;%xD zPtD%Dr@lYGq|Oc$b)7#0Y`&_>;U?Sf+T>5_6iw$diF{8)#8i};$oFJApLKcxZ2o4o zGx|vRN&A$p-)c00000006+n>E*rqz;m3m2+$EPzTdeOZ(((e7s2)h zG;L34)E{6~^$852Jf|l80hPBvd5}CwB@1Jdg|YP12-5mwW??K@7@IsvYcIa`Gr$g3 z^a#k+-K`nh39xgDe6LYwNTY?6Z->Xl%Tc4kkSE~d{jJf?0{{R300000aDjdRWC-8- TTJhfo00000NkvXXu0mjfU0HEx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_wide.png b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_wide.png new file mode 100644 index 0000000000000000000000000000000000000000..2a643bf6c61c3eb38eddf9c80e635360a6a451ed GIT binary patch literal 675 zcmV;U0$lxxP)EX>4Tx04R}tkv&MmP!xqvQ^g_`1v`i+WT;MdQ4z;lg(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yULJ2)x2NQw6)g%&YBxV(?^-Z|WNA0RX;OtZS;fTr7K zI++l&xmB^}6(NK%Ks72e%b1g-6nxj$Jpz2ci}5V~dw;GzHE%H>AQH!!VcNtS#50?= z!FiuJ!b-AAd`>)JQiH^gTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpSP&II3zo)|5Tqat9cCGGtSBr6841C;;zg^i4Tn@D}J@^XAq%$LRx*p;@JFfP+I| zyhz#WKJN~7&h6hjt@-@`UL