From fd0389c34c395be73adb9f4fc7c0662579ebb2ce Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Wed, 14 Aug 2024 23:49:35 +0300 Subject: [PATCH] =?UTF-8?q?[=D0=9F=D0=95=D0=A0=D0=95=D0=9D=D0=9E=D0=A1]=20?= =?UTF-8?q?=D0=BA=D0=B0=D1=81=D1=82=D0=BE=D0=BC=D0=B8=D0=B7=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8F,=20=D1=80=D0=BE=D0=B3=D0=B0=20(#241)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Описание PR **Медиа** **Проверки** - [ ] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [ ] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [ ] Я запускал локальный сервер со своими изменениями и всё протестировал. - [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** - add: Добавлены рога, кастомизация --- .../Mobs/Customization/Markings/sponsor.ftl | 35 ++++++ .../Mobs/Customization/Markings/sponsor.yml | 107 ++++++++++++++++++ .../Markings/horns/head.rsi/durak.png | Bin 0 -> 440 bytes .../Markings/horns/head.rsi/horn1.png | Bin 0 -> 222 bytes .../Markings/horns/head.rsi/horn2.png | Bin 0 -> 170 bytes .../Markings/horns/head.rsi/horn3.png | Bin 0 -> 250 bytes .../Markings/horns/head.rsi/horn4.png | Bin 0 -> 220 bytes .../Markings/horns/head.rsi/horn5.png | Bin 0 -> 204 bytes .../Markings/horns/head.rsi/horn6.png | Bin 0 -> 275 bytes .../Markings/horns/head.rsi/lord.png | Bin 0 -> 1154 bytes .../Markings/horns/head.rsi/meta.json | 59 ++++++++++ .../Markings/horns/head.rsi/oldpain.png | Bin 0 -> 386 bytes .../Markings/horns/head.rsi/tavrhorn.png | Bin 0 -> 410 bytes .../Markings/horns/head.rsi/telehorn.png | Bin 0 -> 307 bytes .../Markings/horns/head.rsi/vampirehorn.png | Bin 0 -> 443 bytes 15 files changed, 201 insertions(+) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Customization/Markings/sponsor.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/sponsor.yml create mode 100644 Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/durak.png create mode 100644 Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn1.png create mode 100644 Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn2.png create mode 100644 Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn3.png create mode 100644 Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn4.png create mode 100644 Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn5.png create mode 100644 Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn6.png create mode 100644 Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/lord.png create mode 100644 Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/meta.json create mode 100644 Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/oldpain.png create mode 100644 Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/tavrhorn.png create mode 100644 Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/telehorn.png create mode 100644 Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/vampirehorn.png diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Customization/Markings/sponsor.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Customization/Markings/sponsor.ftl new file mode 100644 index 00000000000..8b20da11ae5 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Customization/Markings/sponsor.ftl @@ -0,0 +1,35 @@ +marking-ADTAllsuccubus = Суккубус +marking-ADTAllbasarab = Басараб +marking-ADTAllcrayfish = Рачок +marking-ADTAllhank = Хэнк +marking-ADTAllhonor = Герой +marking-ADTAllmadscientist = Безумный учёный +marking-ADTAllmonday = Понедельник +marking-ADTAllnemesida = Немезида +marking-ADTAllpunk = Летов +marking-ADTAllturanga = Туранга +marking-ADTAlldurak = Дурак +marking-ADTAllhorn1 = Дьявол +marking-ADTAllhorn2 = Лукавый +marking-ADTAllhorn3 = Чёрт +marking-ADTAllhorn4 = Бес +marking-ADTAllhorn5 = Шайтан +marking-ADTAllhorn6 = Окаянный +marking-ADTAlllord = Лорд +marking-ADTAlloldpain = Лорд Боли +marking-ADTAlltavrhorn = Минотавр +marking-ADTAlltelehorn = Телерог +marking-ADTAllvampirehorn = Рога Вампира +marking-ADTSharkTail = Акулий хвост +marking-ADTSharkFin = Акулий плавник + +marking-ADTAllAyanami = Аянами +marking-ADTAllBubbleGum = Принцесса Буббль Гум +marking-ADTAllCloud = Облако +marking-ADTAllMavis = Мавис +marking-ADTAllMorningHairstyle = Утренняя прическа 1 +marking-ADTAllMorningHairstyle2 = Утренняя прическа 2 +marking-ADTAllPonytail = Конский хвост +marking-ADTAllPrinceCharming = Королевское очарование +marking-ADTAllShavedFemale = Распущенные волосы (жен.) +marking-ADTAllShavedFemaleUnisex = Распущенные волосы (унисекс) diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/sponsor.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/sponsor.yml new file mode 100644 index 00000000000..c714c9103d9 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/sponsor.yml @@ -0,0 +1,107 @@ +- type: marking + id: ADTAlldurak + bodyPart: HeadTop + markingCategory: HeadTop + sponsorOnly: true + sprites: + - sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi + state: durak + +- type: marking + id: ADTAllhorn1 + bodyPart: HeadTop + markingCategory: HeadTop + sponsorOnly: true + sprites: + - sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi + state: horn1 + +- type: marking + id: ADTAllhorn2 + bodyPart: HeadTop + markingCategory: HeadTop + sponsorOnly: true + sprites: + - sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi + state: horn2 + +- type: marking + id: ADTAllhorn3 + bodyPart: HeadTop + markingCategory: HeadTop + sponsorOnly: true + sprites: + - sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi + state: horn3 + +- type: marking + id: ADTAllhorn4 + bodyPart: HeadTop + markingCategory: HeadTop + sponsorOnly: true + sprites: + - sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi + state: horn4 + +- type: marking + id: ADTAllhorn5 + bodyPart: HeadTop + markingCategory: HeadTop + sponsorOnly: true + sprites: + - sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi + state: horn5 + +- type: marking + id: ADTAllhorn6 + bodyPart: HeadTop + markingCategory: HeadTop + sponsorOnly: true + sprites: + - sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi + state: horn6 + +- type: marking + id: ADTAlllord + bodyPart: HeadTop + markingCategory: HeadTop + sponsorOnly: true + sprites: + - sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi + state: lord + +- type: marking + id: ADTAlloldpain + bodyPart: HeadTop + markingCategory: HeadTop + sponsorOnly: true + sprites: + - sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi + state: oldpain + +- type: marking + id: ADTAlltavrhorn + bodyPart: HeadTop + markingCategory: HeadTop + sponsorOnly: true + sprites: + - sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi + state: tavrhorn + +- type: marking + id: ADTAlltelehorn + bodyPart: HeadTop + markingCategory: HeadTop + sponsorOnly: true + sprites: + - sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi + state: telehorn + +- type: marking + id: ADTAllvampirehorn + bodyPart: HeadTop + markingCategory: HeadTop + sponsorOnly: true + sprites: + - sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi + state: vampirehorn diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/durak.png b/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/durak.png new file mode 100644 index 0000000000000000000000000000000000000000..4637182deb00127a8f062cda95dc5803744f4d11 GIT binary patch literal 440 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%s0|R50 zr;B4q#hkad46_dfh_F7GoZ+>xS3oAq>A*i><16uNWkt3)-#L@V?s;HY_j=z09{K9g z8$A{s%X;~9n!t`b#rL^WD)|+Z7X8hfr8fI~eQNc^`byy~dzvm5Xl#3Yz<@_%=?A0v zi{Dlq{+^|H;{ z#(R3xg4b4;Ok53SDtHPp9B^K~`0K7%#)jQ#!r#}5X*bZ~F7)b3UK;+`syNlpWAyAo#F6>^|F>b8`Fm zUr4_w|Ehg;2s#j*|@bOckrQUVHz{-ZE|4DlMbU z?k*{5>sM`!X9Vg8f&=Dnb6CRe&3eVWuFRY%c|Jsx!KR4mijLG(1MgTPkcg+NpUXO@ GgeCxr_%f#e literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn3.png b/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn3.png new file mode 100644 index 0000000000000000000000000000000000000000..d173fa4404a3535fce62fad2f12b19e092b3319e GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sP;iZ> zi(^Q|oVT|e`I-y_SOX?x*ff2&=iL5)BX)B_x=gtnr}S+m$NRT^Cx7!-ySvqQvZ9jS z=3ldl{noYq$vgd_`2P2g`^?sdpL?J6Y`)RAJMD=-B4%9IuD){Se-%USZ8xu%rEirV zO$$1e_aNhEx02FxwZA@gKx={E1N*i=(i_~$KCXUste$yQx;THr`RzZYZXRWxv25jz qPTS4h>;`?wg~IMum!)$)|2|P%{qY)>?ystIanU*b$@Izf&%2*81I-2k{!f-pFHE~6 zE%GSsE!CswbY^r!6>iphwRf+f~MyG~rfCM~U{an^LB{Ts5A^1qB literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn6.png b/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn6.png new file mode 100644 index 0000000000000000000000000000000000000000..84a0943f6f8eef30445290de8b3666d9af39357a GIT binary patch literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1Gay zi(^Q|oVU03avd@dX?vKgZMEZx-;t|v?au2rG%x%f6ys$q)}6BP($W_K>W+ckyiR{B z=NmpeJ^f*iJIngp(^4;#?q9v?r2cnjmz2q=dRK47&R-g}+jrW|^qKze-pj0X?=jpo z<9vQmpong-q21rTym$G5wnD)Hd(BUO@&Xe%R$g0oqWFFNm$(T#HeBlp^19|}^r`l- z?3AFSwO`Nm*EY8=E^jyWypy~V4j<$ouJYD@< J);T3K0RTAeZ;Su{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/lord.png b/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/lord.png new file mode 100644 index 0000000000000000000000000000000000000000..bb6cf9911a109ad06a57ebeef7b5307c102588c1 GIT binary patch literal 1154 zcmV-|1bzF7P)r=c#(A?mj#XFyA+#c3@v$ALTd>JkR6d;Q{00aFdghBo>RIx3`z zrBD<_^BhXm)hurT2qB81C@`DNnigQST9HntHO+a8UayDAWYRQ;=lS9kptZGCsjjYW zsi~=fBuR8_ZH;%k-LFRO?ChkGNaW|~>1iqm0va0|t2M3q4Gj$qzt+~)LXsp30QvF* zfFwz@w6qk1gM-C+35uflhtui&DV0j$;NT!*x7%MGCkO(Lj*j*@j)T+btP(}>FEtA& z#N~4R{*-@yexBybzqq(a4F&@m8ylT!x~e0D=v*#W z_Lb@H_HXBB7=~dOhG7_nVHk#C7=~e({{hu~fhQi1hjTa_irsEUJRXN22-dc?ws*I| zzsADC!jBgh7axsABNB-O{C>aY{S@pBea`Fk8q3Se6`f9p%gamHY&IMp9~Y$!u2ol8 z*DnVL2OpoBr-C5B=ksaqNNXy9UawCZ3I{^T%*ZafG&CR{qPHZt{G8xFS zj6fhj0Ko6}lcl94n#<)h#Zi3%R##W84u=DGcXywz1%ttiBuRu)s_7&ZLm&_!k|aHQ z=Hu}=^m;wKUhfCBaa1pylgQe!Qi()0A(P1<7!0cJ5NkTREiElvGMPkOT^)QrA6;Kx*8y+;wD3=Q z%DKM2uJiePw63lWMxznK!^4_Bg_^&c05CN*MeTMwVzC$!i3CES&{xHIFSpxGtyU}Q z>+5lLcBbk7z;}y8A|IBQm%sVT?@Pb%707*qoM6N<$g74KT*#H0l literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/meta.json b/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/meta.json new file mode 100644 index 00000000000..de579a6752c --- /dev/null +++ b/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/meta.json @@ -0,0 +1,59 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:JayJacobs#1187", + "states": [ + { + "name": "durak", + "directions": 4 + }, + { + "name": "horn1", + "directions": 4 + }, + { + "name": "horn2", + "directions": 4 + }, + { + "name": "horn3", + "directions": 4 + }, + { + "name": "horn4", + "directions": 4 + }, + { + "name": "horn5", + "directions": 4 + }, + { + "name": "horn6", + "directions": 4 + }, + { + "name": "lord", + "directions": 4 + }, + { + "name": "oldpain", + "directions": 4 + }, + { + "name": "tavrhorn", + "directions": 4 + }, + { + "name": "telehorn", + "directions": 4 + }, + { + "name": "vampirehorn", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/oldpain.png b/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/oldpain.png new file mode 100644 index 0000000000000000000000000000000000000000..5ef97aee727f72c33fc57db0a5555fbcbb7ae943 GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%s0|TRp zr;B4q#hkad4D*@|M2>yb&urIw+Yr*JXeS)r`9yWP$B{#t5=!!l!t9NWijlW?7wz&^ zUbrQcdxvA@zx|w%pT5uINvfQdcSk2=Lh-rz^CqisPWyfR=l6w8U5hRxZJc1J7V<~s^RVDj;cy=x{R5iJ0->UhkGymts2RuJoAN4=~Dg! zS$^*4)hyGKiV@lAzL#GVSY&L!eV6yFWU1>i4X&-Z)@n&p{?_Sx-pVn{pKJlaJ?|V5!{Akh(wpY9UZMn8edj8+*fBZf_ z{wNWVeV!qqw{fG`F^Lz893rQExR*RPb?&b3Z?CxrwwU-TE_G2-ePq$bP*BD<`DBXO zT))+?cey_=&uf@+Npoq79#>BjL!yKe2V?Tv{)e;ArfoTAbg_z`p<^BQc@W#79l zCgbo&iO|s6CzX9qi!3X;7Wd!Hd){mKA@}xf_w~{XrrbLJy!hfAKaRuu?iW}nvdk&2 rh+ZpK#Be`j?PB-$jY#&rFpsZ1d1C#vU-u3G1DnCq)z4*}Q$iB}WGupp literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/telehorn.png b/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/telehorn.png new file mode 100644 index 0000000000000000000000000000000000000000..ccd4901fc2cf8cd066eaadae3b4216c10931603d GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1Gdz zi(^Q|oVT|O^I8l9S|1iJv7LT**P?l17Yo_f9c0|WQ7k2YINHU-(}m%5;>|bz;$Keu z!&Ysj++_6G=K0!EPd+$x^K1!q}jMDEl1)4lI~@%7SB@yHxW+t9s#7-lUy ssic&9`<|TKKc4(g=PxkBOkw!fY+a*Y6|KFiB?Tnr>FVdQ&MBb@09G=6>Hq)$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/vampirehorn.png b/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/vampirehorn.png new file mode 100644 index 0000000000000000000000000000000000000000..cc9118538e506cab9980b51f92a729a8ba839e47 GIT binary patch literal 443 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%s0|R5O zr;B4q#hkadHg+9y5MX-{_|afn(^LhqCia8kA5P}zm$QW+^p7XZCrYz?5&J9<$Ki!nMOHM#A@!7xf z?5NjYrV3QveAV3%a&z{Ko$|*wZhYJM_=Zbh%H7YaG`f7|{aaTWJFnqQ)n2>UlxOog zE)-b2X-$lHC2+{VWb@56A20iEds@A0V!5*M_VV3x{Vq@W_S^RC^UuF;J}t^T_Smp= zckC>`?-ULrd@cP^N9bp;+ c!-4%DI7=GlZ7J4!SOpUIboFyt=akR{048