From 0c018769a685158f26b4870cd8f1a17a55cae5a4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=D0=90=D1=80=D1=82?=
 <123451459+JustArt1m@users.noreply.github.com>
Date: Tue, 3 Sep 2024 11:29:24 +0300
Subject: [PATCH] Return Long2 and Long3 hairstyles  (#30963)

* Sprites

* Prototype_&_Locale

* sorted_in_alphabetical_order
---
 .../Locale/en-US/accessories/human-hair.ftl      |   2 ++
 .../Mobs/Customization/Markings/human_hair.yml   |  14 ++++++++++++++
 .../human_hair.rsi/classiclong2.png              | Bin 0 -> 1014 bytes
 .../human_hair.rsi/classiclong3.png              | Bin 0 -> 1068 bytes
 .../Mobs/Customization/human_hair.rsi/meta.json  |   8 ++++++++
 5 files changed, 24 insertions(+)
 create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong2.png
 create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong3.png

diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index 7d3467a610..9575cd5c2f 100644
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -45,6 +45,8 @@ marking-HumanHairClassicBusiness = Classic Business Hair
 marking-HumanHairClassicCia = Classic CIA
 marking-HumanHairClassicCornrows2 = Classic Cornrows 2
 marking-HumanHairClassicFloorlengthBedhead = Classic Floorlength Bedhead
+marking-HumanHairClassicLong2 = Classic Long Hair 2
+marking-HumanHairClassicLong3 = Classic Long Hair 3
 marking-HumanHairClassicModern = Classic Modern
 marking-HumanHairClassicMulder = Classic Mulder
 marking-HumanHairClassicWisp = Classic Wisp
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index aa983583c5..bd7bed25f6 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -1349,3 +1349,17 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: tailed
+- type: marking
+  id: HumanHairClassicLong2
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: classiclong2
+- type: marking
+  id: HumanHairClassicLong3
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: classiclong3
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong2.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong2.png
new file mode 100644
index 0000000000000000000000000000000000000000..4bf29c6c3c91b7dce52dd737144a5a4f4a669a8f
GIT binary patch
literal 1014
zcmV<S0}1?zP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000BKNkl<ZcwX&V
zJFX%z5S*72BO!4BG9nH@%mFwf2O#DEL}VNQ35l4TRXwRzCCeUndp&Q*dY*)VvHMe9
z-5%Wj8h-ipRpS5Ua`~)QtG`p9&*!k;?~7#pZ~bng)%o>$Jv<(dZy$aNgxdOD0KDJt
z4;-fB;U|FDY&I^L9tPa+_YcO$^k1*nVYk~2i^amF-#nPk-)^^IyWM_A915wp)Bq0v
z8UX53211q>1Tz2-emb2#aGsGyL=bU&0+841H5?8HcN8ojz<D^0+5=r$gE+q=4P5{r
z|56AOgei+5^Iri7@4foX06_T|#So$M`8+I_%Sl!Q)lb^9_#!B!#n=P@l!M+m=Q!?o
zJeuTMsL#~HC(;iEFqZ!W0W~UTr|LBuiu}jKlyEvv;ZuNs`hrNa0Bh6%04}i5qk9wp
zI89-2(2`#|PUl;rt>ai^@mp&BCnHc4xjb?y*7+&@Sq3ooEY4F&$()pdT>Dw<boo`M
z`F_Ba!un2<1mItzR}%5DIb3BhhD#xfvM!JK4fTr5&G}(Yff9#u%5yTAPLPAz6T1Kg
z3!mN-sN9=rHU)A<PW@aX&y|Ru)E)bdXO?0(djND9<SGP*!~5{N#d*vz17M}IbzBK^
zm<lM!yl1}aGmq@103aI>-53DYs4GBb06eJv)YuwqYZ`zWKz9IYpxCmE&VZJqSHt$s
zfEp;aETc1^<>=M0y)&Q&iY?3N3}`ueHEiz;C_$0CzMRWGU2gxaL|1H%?iA~D&(1aH
zxf#F)2)i_FPH=y|#0U>C>`$s*+<QAhMF6n>hYk%c?a|@;)F6b;(+TLsg|3jdJ8fbB
z9ESq#zlSG7!saAWqINoPcbMs>9U+3RZ8Q94IV@oU0K#}SKox6`4i0mR%F>eZ&>mwc
zQ+1?lK{{CX2i*XK{dn(*46oy3<Mq%4#?iJ(0Eit<K-6J`g=#e&r!4A@^$)GZ*vx<w
z08=>Tl{q;8T=&_OL^A@*VC_QZb)4e?fc6KG3b-sRFf%}vuopK)wfBOc2ei;Y^#;cT
zfOcW1#9C#&4wa5Cwb2a#44j+u1Wk|e=ox`AP)+9p6y4SU$hFV14A4J5R#Z!ATw`8%
zm?BpQvjFfdaIU!@f);j-bD$;x(Bmm8WUl!i)&YKpy<;cbMj6l={S^c~Q#6(a<`kH7
z@r$K_)m{?-tOIkWzcRpTs~Lb?F=_RA2cXr+)v~)Ypcay?%IOSfHFCA=?hL4fWUF#I
k16qw-ExUg`1O5QZ@G5RkCh4940000<MNUMnLSTXb04K}MWB>pF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong3.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong3.png
new file mode 100644
index 0000000000000000000000000000000000000000..6597c3a3d0ea1738dc7d0cba18a3d9b16ecac321
GIT binary patch
literal 1068
zcmV+{1k?M8P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000B>Nkl<ZcwX&V
zJ&y7)5Y6_~NJt!DJ1P!9%>g(g2cX^qP|<M!BqVBjR&S;E>3x<R&lqQuXq^Vw*z@z|
z%{ZHxkM56OA0_^OeSN)FtJS})_xruu?RG`7#@6pPTAg37*WK-Q`|;toK&Y+X1;F$9
ze8FKl9)1Fd&(BYnOb-LD*Xs-GWBSkMbGO}YyTxMR(r;c&=P#E_x7lodA`XRATxx&^
z01W{3DFY$P3xXK{2tOW=FF4Og!yq7z$N-SX<I(N+dv_EpAV3$KM(u$vtwG#hl7=n-
zn17%k9Vg`p!jQ#~`W1liyH~#%04VRH7$S5!ox0_6Imn5i`bm2hU(mj^7@Giqa?l&j
z;q!1f{I`$vgh8?U7K-<+LF(Z?(huy5<v&3{jq(J+1OW4&M#2!S_Mkr$>lK1j0|e9;
zM4AOyqYeOYfrTF3y#N4t3Ihw6UvOA+U%}9Iy1xVf)ss5^$p{oh9*-&8Vm4$Mz}yRq
ziy9XSPVFfLfw|5TfXA;o&F2H26xL^wBmnP5uf*BDJv?QwhCr|=>+u-Yp`0J)6ew{h
zr#vT<=>$0_Y_SVqu<+@30+o9*&89%k$f56R<n<&{K=^msg5S6-#c=WfgeMS>V*Fjd
zhrcb(V~-gCE1j+DN|?h`KtbkrK6mInkL+0iKsF${F#xPlSAfg_cu@VVwKdo_YXE8h
z-2kY8;+$nP2Fy8nHEeGTsDa{~Wi$rNIeIm0Zw#n`;+$nP2Fy8nHEeGTC_#~LeYux?
zy4?G>5?!%9>=L6tpqIBT=6WMUMeGu>OT*>_-_MsA;Q<EvwH3x*fVU$=ovsvM{|_A+
zT-u|<@1a2mou?Dfiwj*LZ+F@R033$`zJCuVL$p!BZf)&!;M?I?bA;e)+YEoR3`>{*
zfH2MmXe&y4ba0qG!mxMfp?GR-C>y_1wjdp>?+4ugg#CD($e@u{<z8SI1hPwqCLoKp
z4FW)FIKexT;&r-jeF^~2q==aT3IL4KQ5DVi8gFV-PKUC?x}bJhPa_imJoo7|ni0rz
z4or;+0Bz9zAfFE`AeaCEvdnL`qxh)>Z^-Dg5aSayhV6N6ki=}trJM<Xm=Y~?Iuwyp
z`0o7_$T=HRdffmp0`EF9#D2~arDmC8I!*HditgM1$faeL0s4>65EEdvnGg<B<O*RH
z02Ut)t!g{vkr#H2b9<8j=y-|>8R{u7XQ=f)>j2lo-o7H;%YeDjpH6$yz?=e8E`A|9
z$N~#nO#rYCSOi+BI^?=s<yYNi0ERSpOxX>9G0~rb?#6&AL}5%D8Uw~ee+s%A1Evs#
mF>PoJ7!&;|=>GEz_y$b&dTthiaOMC2002ovPDHLkV1fX|K;l>c

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
index 8fd4f5e1b9..d6cd1e11da 100644
--- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
@@ -782,6 +782,14 @@
       {
         "name": "tailed",
         "directions": 4
+      },
+      {
+        "name": "classiclong2",
+        "directions": 4
+      },
+      {
+        "name": "classiclong3",
+        "directions": 4
       }
     ]
   }
-- 
2.51.2