From cfbfaf6ce5879a4aa5f384f5959d4bd9c0120992 Mon Sep 17 00:00:00 2001 From: RipZoro1 Date: Sun, 22 Sep 2024 21:33:12 +1200 Subject: [PATCH 01/10] =?UTF-8?q?=D0=98=D0=BC=D0=B5=D0=BD=D0=BD=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BA=D0=B0=D1=82=D0=B0=D0=BD=D0=B0=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20Rip=5FZoro?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/ru-RU/ADT/personalization.ftl | 12 ++++- .../Clothing/personalization_clothing.yml | 41 ++++++++++++++++-- .../Objects/personalization_items.yml | 26 ++++++++++- .../rip_zoro_katana.rsi/icon.png | Bin 0 -> 334 bytes .../rip_zoro_katana.rsi/inhand-left.png | Bin 0 -> 400 bytes .../rip_zoro_katana.rsi/inhand-right.png | Bin 0 -> 387 bytes .../rip_zoro_katana.rsi/meta.json | 22 ++++++++++ .../rip_zoro_sheats.rsi/equipped-BELT.png | Bin 0 -> 546 bytes .../rip_zoro_sheats.rsi/meta.json | 25 +++++++++++ .../sheath-katana-equipped-BELT.png | Bin 0 -> 594 bytes .../rip_zoro_sheats.rsi/sheath-sabre.png | Bin 0 -> 519 bytes .../rip_zoro_sheats.rsi/sheath.png | Bin 0 -> 447 bytes 12 files changed, 120 insertions(+), 6 deletions(-) create mode 100644 Resources/Textures/ADT/Personalization/rip_zoro_katana.rsi/icon.png create mode 100644 Resources/Textures/ADT/Personalization/rip_zoro_katana.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Personalization/rip_zoro_katana.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Personalization/rip_zoro_katana.rsi/meta.json create mode 100644 Resources/Textures/ADT/Personalization/rip_zoro_sheats.rsi/equipped-BELT.png create mode 100644 Resources/Textures/ADT/Personalization/rip_zoro_sheats.rsi/meta.json create mode 100644 Resources/Textures/ADT/Personalization/rip_zoro_sheats.rsi/sheath-katana-equipped-BELT.png create mode 100644 Resources/Textures/ADT/Personalization/rip_zoro_sheats.rsi/sheath-sabre.png create mode 100644 Resources/Textures/ADT/Personalization/rip_zoro_sheats.rsi/sheath.png diff --git a/Resources/Locale/ru-RU/ADT/personalization.ftl b/Resources/Locale/ru-RU/ADT/personalization.ftl index 73156525664..42316554f88 100644 --- a/Resources/Locale/ru-RU/ADT/personalization.ftl +++ b/Resources/Locale/ru-RU/ADT/personalization.ftl @@ -30,7 +30,7 @@ ent-ADTClothingShoesKivchikBoots = ботинки возмездия ent-ADTClothingBackpackKivchikSatchel = сумка возмездия .desc = Красивая чёрная сумка с золотими застёжками и красными линиями. .suffix = { "Именное, Kivchik" } - + ent-ADTPlushieEvgeniy = Евгений .desc = Мягкая игрушка Женьки Металлиста, созданная по его образу и подобию. Его глазки смотрят так, что прям и хочется его взять на ручки и затискать. На его халатике есть маленькие кармашки, которые могут использоваться как держатель монет или флешек. .suffix = { "" } @@ -325,4 +325,12 @@ ent-ADTClothingUniformPushnoYJumpsuit = Аккуратный костюм Кур ent-ADTClothingOuterCoatMaki = Пальто Хонкоматери .desc = Пальто дарованное самой Хонкоматерью одному из её лучших клоунов несущих веру Хонка. Оно такое же вычурное, как и сами клоуны, а жёлтые элементы выполнены из чистого бананиума. От пальто исходит лёгкий запах кремового пирога. - .suffix = Именное, Maki_gg. \ No newline at end of file + .suffix = Именное, Maki_gg. + +ent-ADTZoroKatana = Катана Зоро + .desc = Катана легендарного фехтовальщика... + .suffix = Именное, Rip_Zoro. + +ent-ADTClothingBeltZoroSheath = Ножны для катаны Зоро + .desc = Ножны для катаны величайшего фехтовальщика... + .suffix = Именное, Rip_Zoro. diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml index 3ef3af178bf..5126084afde 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml @@ -396,13 +396,13 @@ - type: Clothing sprite: ADT/Personalization/bolper_gloves.rsi - type: Insulated - - type: Armor + - type: Armor modifiers: coefficients: Blunt: 0.95 Slash: 0.95 Piercing: 0.95 - Heat: 0.95 + Heat: 0.95 #Pangaari - type: entity @@ -432,6 +432,41 @@ - type: Item size: Normal +- type: entity + parent: [ClothingBeltBase, ClothingSlotBase] + id: ADTClothingBeltZoroSheath + suffix: Rip_Zoro + name: sheath оf Zoro's katana + description: The scabbard of a legendary swordsman... + components: + - type: Sprite + sprite: ADT/Personalization/rip_zoro_sheats.rsi + state: sheath + - type: Clothing + sprite: ADT/Personalization/rip_zoro_sheats.rsi + quickEquip: false + slots: + - belt + - type: Item + size: Ginormous + - type: ItemSlots + slots: + item: + name: Katana + insertVerbText: sheath-insert-verb + ejectVerbText: sheath-eject-verb + insertSound: /Audio/Items/sheath.ogg + ejectSound: /Audio/Items/unsheath.ogg + whitelist: + tags: + - Katana + - type: ItemMapper + mapLayers: + sheath-sabre: + whitelist: + tags: + - Katana + - type: Appearance #PushnoY - type: entity parent: ClothingHandsButcherable @@ -464,4 +499,4 @@ - type: Sprite sprite: ADT/Personalization/maki_coat.rsi - type: Clothing - sprite: ADT/Personalization/maki_coat.rsi \ No newline at end of file + sprite: ADT/Personalization/maki_coat.rsi diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml index 4bd70ab8f93..128fb1b3bc9 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml @@ -941,7 +941,7 @@ attackRate: 1.5 damage: types: - Slash: 15 + Slash: 15 soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Item @@ -950,3 +950,27 @@ tags: - Katana - type: DisarmMalus + +#Rip_Zoro +- type: entity + name: Katana Zoro + parent: BaseSword + id: ADTZoroKatana + description: The katana of a great swordsman... + suffix: Rip_Zoro + components: + - type: Sprite + sprite: ADT/Personalization/rip_zoro_katana.rsi + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 17 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Item + sprite: ADT/Personalization/rip_zoro_katana.rsi + - type: Tag + tags: + - Katana + - type: DisarmMalus diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_katana.rsi/icon.png b/Resources/Textures/ADT/Personalization/rip_zoro_katana.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..30ad11622438c68a722ef89f026b01109fc0c195 GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ-<~dxArYK!r|#!EWFT;CF-Klr z>APl+`HS_R2=B18yw=XKB3O-`eZB*eYVg9}C&e|ESZvwy@@~SWCzGcAzB|9aJLt^n zRa#sVUw_!Jg|{O1x-CyMLxZ^M#pcHcgcu$~PWyWxQjg(!)a0$x5;i+nb2Kn?9};Yd zc$WO&qAN#+#*R%o;j!Lg_Zk1^A5^S1Jm}kcUPy7%+0S>fPg^d(!J6JPQPyaYa9-B= z^s`J~WFn8Z}`djW$qIe#)G^Zvu@y&Z&hx;AUX-O@6!U;$2`c@TEq0 cruq6ZXaU(AKnwzxf+vG0Pgg&ebxsLQ0IL{@(*OVf literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_katana.rsi/inhand-left.png b/Resources/Textures/ADT/Personalization/rip_zoro_katana.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1a9da3892005e6d61da4cbe7981d5b918475166f GIT binary patch literal 400 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV6^pgaSW+oe0$5DugO5<_{a9m zA9>~+5U$`~f5LLk3|q$C!kyJy6=QuC=>Bb9|I;Xgr}fkCfDMi6hng6eI20N{gn*g> zPcvus%EebTzZv}AH~pGG5^su(J2Ml%PQY*d+++ZH9G(52dU3HR#<$#>UYp)w#tMnZ&$P4eU*{lvG;ba?CHeU zNr#VYv)7T3RR&v$O0aOW*xcvO6uvNZyXUv#kM_ys8bl{Qh@Q2^dBelE-NNw|+wbj7 zDcm1gf4r?cakj$^>3y6nS3ax~ENTt!oM632t0m}RsKOM!|J@U!+9%X1rDQYb^g6tJ zy8g95))kH`FBX6CO!>c)wPNW%QC7y5JK|!$of#Ne1Tw-OFmrLfx#!s>2MSrf)CkWs bUtb0-Ae#e-LEuvGWDw=)>gTe~DWM4f&ibBb literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_katana.rsi/inhand-right.png b/Resources/Textures/ADT/Personalization/rip_zoro_katana.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b018e7bd99440831e51d429adf18d0752ae925eb GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU^MV_aSW+oe0ysn?;!($)`u-p zhR$jUOy3fYo^hNyi}O;j>mu`AO1@lAo}7Dj?oXz`q_;n6?K(ALt`{mcFfef_fQT2Y z#|nLZg}z!>uxZ!a7WuY=Svw{=dJts>+|NN7vBlsUUvNGzCAYFI^JBe5nJo8rnoP!(m1}*v(G7i`=zLP zxpw=M;TD2z1rh&Pitb%~-lI8D=k?Yd&yES{EYEj1_J_-H^842@oLfK~v*r!vf3$A0 z9J=_yS0UqYyW0jXd7*<=H5x5J5AP~pc_Xdy_4R@(fvDeX*CuQI)wJc(TQ611Z2In@ z(Dl2^{{32?c4+r%ce56#SGgMbKdgQ}?`^zm4loG$QX@Rme0>?TfNTyR27yb#lR=cH LtDnm{r-UW|ODUiR literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_katana.rsi/meta.json b/Resources/Textures/ADT/Personalization/rip_zoro_katana.rsi/meta.json new file mode 100644 index 00000000000..b6b22ab80f3 --- /dev/null +++ b/Resources/Textures/ADT/Personalization/rip_zoro_katana.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by boctonskuitea(Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_sheats.rsi/equipped-BELT.png b/Resources/Textures/ADT/Personalization/rip_zoro_sheats.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..e307228d05efa589299c0c020bf5b0091f95e913 GIT binary patch literal 546 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU_9^X;uuoF_;!}H-(d%Vw(A{z zQeG;zLSh=+PfJ?x#WZslFt~8aFszuw)T!sI5ug+pDDi*Vv928UqpxG_9~3{n@p|sh z=d(XrU0PEtBhbLWqQJn&;lRLz!feoQG_kIE{>?Ohd*|c!CT(ktQWr&v|)EXNVIXI z5XVi`u3O?Aj1dP{vrDe}EaIG8GP`NQcOE0I+_|Q=ITAwaKO?f#i56RX@u}{hg40!L|}qmf46+*^yf1-__rG}Sv4T$O*2R?c3iV_{KRAmSbyv%B;o zv*4}}M=SB2-*WR!wnlV5ySL=t_sB~s&P9Ib&K|cFRRV%bQoKu}wzqq&|5q(s_4DD& zJu3QhnKQRfHTIM!DqSn0rI_t`pz`JXPRUgaHzL08xwhG3vnKP@ghwnIY}uj@CPi=- z)Nw4C*>J1xOJDEPx}E>6Ig<@p1itvjrsS7;PGye2=2hj+bnKPfhCLRV$JH%wuIpNE z{x|ZOaKrbBQ`b6}^-s|`bEo_Jw-w(b#QJQfJiNPd{UO85pdUtT{Nj$k%oBpm7p)hl zFsayklXv>mB>e*QX7-rM>HFL|JHTLt{nvYyYj;}9FIaUsZ24iK*>QeBHyUQn7yei~ zv1VWOqS(E2IZvlBIbC#dSeT&3x$(v<$v!6~pRG@mOx*;wtQ5Pdk;ppZ!|HPrI)O}$ z+CQ0xT||#~F)-b;_1@_^RV+omUtPL?+5077j1~sR6umB9d90ypucjci=iU=OmibHN z=3Z57Xr9_NKR+?TypU<;l&#wNQ?n29^DusSR(RO>=f{br%$zg0UK!0^Z6RzUC@8qo a=ZWl_r((HDj}jk&;@8vF&t;ucLK6TiOYkZH literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_sheats.rsi/sheath-sabre.png b/Resources/Textures/ADT/Personalization/rip_zoro_sheats.rsi/sheath-sabre.png new file mode 100644 index 0000000000000000000000000000000000000000..35ee27f844b098433e071c5d66f70cc4c1d19d2c GIT binary patch literal 519 zcmV+i0{H!jP)Y5Pd7!X&N=nH8u)K6|WV)8nG9&lYoD~A0XJI5c~~7DnY@BjE+-trpPf z0GSM6W0X2?*Gty=QGb2cjfRQHh6w_oJYFmg%z_n&T^|9T(;a-N4*^RcocA>rv)PjZ z(aq*8RoP+nfm=<@!y2x(;V2#U|j zvQjioN9=jZoIj!S&wbAWrp8Ko-}Pn6+wxaJJ)KW3RP~=vvuPrqF90`nfM6}nX|-4e zqK1U>?o3r5F(tVikexQpqxv>$Cjc}^5RwkA!yvd$OfIiXOS1K(6{9Ws>tIq4LUGDO z%7ic=V_Fj_6T*Ou{c1wKtWKX!F*wLb5d3QL?!Y_6`0N^LCuc|u06{Zq-X-p8?>dJ2 zr{`n=2nae(MHu)16>ura?vYg$0000EWmrjOO-%qQ00008000000002eQXqM6l)ulsoO8 zf0|$LRbKqWU;Wz`aGcm<_}?!~xCs)&U?+ew6w!?S+f0{Mj?tg31gC8269DD-la<_BWbY6YDK5S|4 z)MfndQgXI6d1gBvUBX^dyMJeg9X zw$5z6Z885+H$$Uh;%&#zW=*Fg0hYaM|Xn z*tuc`OIldAtL3xb6IpGo{%V_Es1&2e=B#@{-|v3U;pO)~|5V68h{4^M)sAu3{hb*- lGfF@a!Iv80nda-upao=e05J$$3Z4w2JYD@<);T3K0RTkMvK#;a literal 0 HcmV?d00001 From a432e50bf115d008722cc2e1ccb8578825f3355d Mon Sep 17 00:00:00 2001 From: RipZoro1 Date: Mon, 23 Sep 2024 09:10:03 +1200 Subject: [PATCH 02/10] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/personalization.ftl | 4 ++-- .../Personalization/Clothing/personalization_clothing.yml | 2 +- .../Personalization/Objects/personalization_items.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/personalization.ftl b/Resources/Locale/ru-RU/ADT/personalization.ftl index 42316554f88..9b1f30b65dd 100644 --- a/Resources/Locale/ru-RU/ADT/personalization.ftl +++ b/Resources/Locale/ru-RU/ADT/personalization.ftl @@ -327,10 +327,10 @@ ent-ADTClothingOuterCoatMaki = Пальто Хонкоматери .desc = Пальто дарованное самой Хонкоматерью одному из её лучших клоунов несущих веру Хонка. Оно такое же вычурное, как и сами клоуны, а жёлтые элементы выполнены из чистого бананиума. От пальто исходит лёгкий запах кремового пирога. .suffix = Именное, Maki_gg. -ent-ADTZoroKatana = Катана Зоро +ent-ADTZoroKatana = Легендарная катана .desc = Катана легендарного фехтовальщика... .suffix = Именное, Rip_Zoro. -ent-ADTClothingBeltZoroSheath = Ножны для катаны Зоро +ent-ADTClothingBeltZoroSheath = Ножны легендарной катаны .desc = Ножны для катаны величайшего фехтовальщика... .suffix = Именное, Rip_Zoro. diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml index 5126084afde..8b216815c8b 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml @@ -436,7 +436,7 @@ parent: [ClothingBeltBase, ClothingSlotBase] id: ADTClothingBeltZoroSheath suffix: Rip_Zoro - name: sheath оf Zoro's katana + name: The scabbard of the legendary katana description: The scabbard of a legendary swordsman... components: - type: Sprite diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml index 128fb1b3bc9..1a5e39db7e1 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml @@ -953,7 +953,7 @@ #Rip_Zoro - type: entity - name: Katana Zoro + name: The legendary katana parent: BaseSword id: ADTZoroKatana description: The katana of a great swordsman... From ed57579a07534cd05c493145ae0317981976143c Mon Sep 17 00:00:00 2001 From: RipZoro1 Date: Mon, 23 Sep 2024 18:53:49 +1200 Subject: [PATCH 03/10] =?UTF-8?q?=D0=B5=D1=89=D1=91=20=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D1=81=D0=B8=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...pped-BELT.png => sheath-sabre-equipped-BELT.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Textures/ADT/Personalization/rip_zoro_sheats.rsi/{sheath-katana-equipped-BELT.png => sheath-sabre-equipped-BELT.png} (100%) diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_sheats.rsi/sheath-katana-equipped-BELT.png b/Resources/Textures/ADT/Personalization/rip_zoro_sheats.rsi/sheath-sabre-equipped-BELT.png similarity index 100% rename from Resources/Textures/ADT/Personalization/rip_zoro_sheats.rsi/sheath-katana-equipped-BELT.png rename to Resources/Textures/ADT/Personalization/rip_zoro_sheats.rsi/sheath-sabre-equipped-BELT.png From a75f5dabb25da017999c6c5b9617f406e211935b Mon Sep 17 00:00:00 2001 From: Rip_Zoro Date: Mon, 23 Sep 2024 18:57:26 +1200 Subject: [PATCH 04/10] =?UTF-8?q?=D0=B8=20=D0=B5=D1=89=D1=91=20=D1=84?= =?UTF-8?q?=D0=B8=D0=BA=D1=81=D0=B8=D0=BA...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/personalization.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ADT/personalization.ftl b/Resources/Locale/ru-RU/ADT/personalization.ftl index bbd84dc7b2f..07f9709400a 100644 --- a/Resources/Locale/ru-RU/ADT/personalization.ftl +++ b/Resources/Locale/ru-RU/ADT/personalization.ftl @@ -327,7 +327,6 @@ ent-ADTClothingOuterCoatMaki = Пальто Хонкоматери .desc = Пальто дарованное самой Хонкоматерью одному из её лучших клоунов несущих веру Хонка. Оно такое же вычурное, как и сами клоуны, а жёлтые элементы выполнены из чистого бананиума. От пальто исходит лёгкий запах кремового пирога. .suffix = Именное, Maki_gg. -katanazoro ent-ADTZoroKatana = Легендарная катана .desc = Катана легендарного фехтовальщика... .suffix = Именное, Rip_Zoro. From c55bfcf49ad81b92f8ceb810855d879e60d31f20 Mon Sep 17 00:00:00 2001 From: Rip_Zoro Date: Mon, 23 Sep 2024 19:13:37 +1200 Subject: [PATCH 05/10] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D0=B8=D0=BA=20?= =?UTF-8?q?=D0=B4=D1=83=D0=B1=D0=BB=D1=8F=206=20=D0=B8=D0=BB=D0=B8=205....?= =?UTF-8?q?=20=D0=A5=D0=B7=20=D0=BA=D0=BE=D1=80=D0=BE=D1=87=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Personalization/Objects/personalization_items.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml index a83515e7c55..1ab11efa77b 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml @@ -951,7 +951,6 @@ - Katana - type: DisarmMalus -katanazoro #Rip_Zoro - type: entity name: The legendary katana From 97eccd65984a1812c6cf651c459a37e24ecbedc3 Mon Sep 17 00:00:00 2001 From: RipZoro1 Date: Mon, 23 Sep 2024 20:04:32 +1200 Subject: [PATCH 06/10] =?UTF-8?q?=D1=8B=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Personalization/Objects/personalization_items.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml index a83515e7c55..728bf3d47d9 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml @@ -951,8 +951,7 @@ - Katana - type: DisarmMalus -katanazoro -#Rip_Zoro + #Rip_Zoro - type: entity name: The legendary katana parent: BaseSword From cd457502113f79a86852f1a09888b6b06cdcfe6d Mon Sep 17 00:00:00 2001 From: RipZoro1 Date: Mon, 23 Sep 2024 22:11:51 +1200 Subject: [PATCH 07/10] =?UTF-8?q?=D1=85=D0=B5=D1=85=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/ru-RU/ADT/personalization.ftl | 4 +++ .../Clothing/personalization_clothing.yml | 13 +++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1493 bytes .../rip_zoro_jumpsuit.rsi/icon.png | Bin 0 -> 473 bytes .../rip_zoro_jumpsuit.rsi/inhand-left.png | Bin 0 -> 706 bytes .../rip_zoro_jumpsuit.rsi/inhand-right.png | Bin 0 -> 685 bytes .../rip_zoro_jumpsuit.rsi/meta.json | 26 ++++++++++++++++++ 7 files changed, 43 insertions(+) create mode 100644 Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/icon.png create mode 100644 Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/personalization.ftl b/Resources/Locale/ru-RU/ADT/personalization.ftl index 07f9709400a..854ca87f3cd 100644 --- a/Resources/Locale/ru-RU/ADT/personalization.ftl +++ b/Resources/Locale/ru-RU/ADT/personalization.ftl @@ -342,3 +342,7 @@ ent-ADTUrogCrowbarGold = Золотой лом Урог-Джаха ent-ADTOwlScimitar = Совиный клинок .desc = Увесистый клинок, схожий со скимитарами давно ушедшей эпохи, с выжженой на рукояти совой. Побит временем, но всё так же рвётся в бой. .suffix = Именное, Filo + +ent-ADTClothingZoroJumpsuit = Легендарный деловой костюм + .desc = Легендарный, поношенный костюм. Весь белый с позолотой. От него пахнет ванилью... + .suffix = Именное, Rip_Zoro. diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml index 8b216815c8b..1febe3ac16b 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml @@ -467,6 +467,19 @@ tags: - Katana - type: Appearance + +- type: entity + parent: ClothingUniformBase + id: ADTClothingZoroJumpsuit + suffix: Rip_Zoro + name: The legendary business suit + description: A legendary, worn-out suit. All white and gilded. He smells like vanilla... + components: + - type: Sprite + sprite: ADT/Personalization/rip_zoro_jumpsuit.rsi + - type: Clothing + sprite: ADT/Personalization/rip_zoro_jumpsuit.rsi + #PushnoY - type: entity parent: ClothingHandsButcherable diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..7317bc56a9c6128c7d7e1d42aac6672ac30a1fdf GIT binary patch literal 1493 zcmV;`1uFW9P)Q?OO(N>p%{u5{-{{{q+U-04OH(M4%@f{LqB zZ5GyzSSTWOk)*Ann26*DAt}gsKX>L#Zsz@(GxO$E@gA6Wf1mF;-}_^Rcdkg3$UtNu zG7uSv3`7PZ1OHP7#{P?bCr-Au4lHlCMaG;Q)RfPa9<=^RD^ax%y|yRQ(+7Z?n@Mu- zvvF;f**Eq}>&*uZ$b|SmF6?#mesZ-M{sSGFdQ<>9bG+qSVf@k;-zGRtN*STOn{jDt zyi3EhoU$heF$7H>#CF{2~!y8`xocS^NhFnf2FZ+Jkg$ zRpi`>Y^krz%8jk-a^YF9mqPye}Nouh8wP3@z_g5UQH zfKgS3^Ilfo5jp;@-+xOlFZz_SQ166(7|Xc2OR+1yM@fH_oS@2#-gh*+#xcH*bi>c_3W~LUnE1lJ($gNie2=;PPCnm*+5XoV zr=D?0!A?_=@kRU`)3p`zRq*?s0q)zP<9*HtNcPr~A8xoa;cV(t_+g^o2p3H5c6RQD zPcLtS8j+R5(H8u^TOd?QK0F7=^ZxaY2m8M`W|-w1-zf!`Gaw{BY%hyzA^@d&@ZdZv zKt=1d+*H~Nr&s+TJIn;2aARfPJOB1u&-#?|CeMp{`7q^c zkh&%fLH{?`lKgq}=wo@F`YQMxhg?4gaCmZZQg(KBWPM{@TCH)}-`|tjnOV{Ln>W8V z>FkGBY{S9!)Rb&(Z+l$DC)N7fYd@RtD{TRs1r#t+%A*pna5luJT-AoYufd{IFyBpB z5lFB0Ze#u}b*2>%GR@LQG}W0Im1BylX;s`xE1)>jTGq6xF=fWF+KM>Eav43^$3y^Z z2meH=4xeH~-Pt&#uuGu{d=mk`|8~cpu)Kak`!Gz~!unz772|&458I!pFES7rhzvvq zA_I|u$UtNuG7uTKe+-!ZK2kFYSZsWH5cRq8$k%e=l{1xesZMK3z~ua&FXY2!Uf-*H zNg`KLCgVflM1pv-P&tGUr71Ih7=1J%q+xk)i?fIFF!cA-aVQ*?IX!9;iq30UCqctw zJ)I~tnEnzY0I9b@h{*WB2$5kYm%qGTP~BWH$8y-%pwS_0(;#VCbQ1vtAruT?uBaef zPkHI=qI|X7JPBZcrPp<^K_gVyhK&|65ulM6CBd_u-4_5D!QO^gI${df}(`YM=fC1i3+Q|wFnr-45%Sh)4DcPBEW~Kd)yYO>PVe& zbwcx|?|`C_3cQ}(7AdwjS>}=!((ArLS?o$H0OhO#9%R&SfDkjZ!y6NSA_FD{{sF%l vLh%sEDr^7%01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjf6%Wp= literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/icon.png b/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4480e73a3785dbc1267df84216590bd6dbd40bae GIT binary patch literal 473 zcmV;~0Ve*5P)S5T5m5dP)!)P(k~1@Ya*3p4wON4SWp6vrpg)_y)d$?K=pbVyy+0Er`9Ccv<(G zWHcBkyHF5e2b$@8GnsGpn46!9It@E?FF?YS3+Wm;jKn_y*$uP*H4)yE$dFPBZG-aE{ z25P_roW^v?!q2AS;21pX6_T!Xh4`o|f z1rKB)iIE36>Nh$7nteCTE?9-vEalU}vns&rbsTN*aXb0hxmjHCzJak-G42E~A6lms zG#XZ??e>T!Q=6^gMx6uTJ%H>T9y`YnFu}{n{pmcwc%+nE!ev%4`T5zHJz^O0sB@?H ztn74;_!}@Bjtu?}2FL6X<68jCvn6>=ySsO2(zdBeACsfNaq;A& z=8y?L1X*>q7>Vs`Xys2_&i{ZpqlVQwzTwaj_7ALAoV;^;Wb4$V3=Ly6mPEa`H!4t5 z*gl)t|4)9=%)c{c&i(mTR%G+B4HFqSC*VMT)R|^3nY1=kO{Ye5+pPOFuWGh$&8y!1 zs{HdqBlBmA{!D&X`t$G;aWx+k#<$6GuM21Wh`cWz|8iVd67cb3`r&EH|w$*`k( z!#B$v1_!l!UY#K24%BivkiVU1KQ!)xCUq6!2J=wk6E7m`#PyHp&zNP~+Vl=#; z>YtbRz2*A}X@2>O8~gXinRWhQTk(1K?XdN`(wE44ZTVJ{ZMn|j(yt?13$J>MFqmDR zeCtlkq==F?LN|`N1ukHW`BL~%Fx>p3KZErC(AjF{mXfD_e~9jo_Hti8L4U^Gxu!ES zOr+FipDh!+d`EklnC`#dip!ThcYSq3HSdPL{`xN4UllQL>O;dPy9;m~R9~<{UcUMk zu5g8lALtNtxET6gp(i5i?`20;$&-sk`h{w~7`fKJ7QAra<$ardUY}n4X7bo$VWqQ8 zW7fGRT+2R{Xhi=KNo*H=?eOj5Y-NjDlb%|$Uz_t8^b#ICaw&Z0{Y!;^cH@-ewatYa zCs#8sWOP`t-aII#=1*p9NPnQy@zwmDUR(T~B;^;I+{iez!zZwMwWo*vdH!=hEu@zy zR`xn7CcK%v=hx5cpM>-3PXPU1sgBFm@0mLA1DR?r7@^tlcS?83{ F1OQ7!D|i3^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/inhand-right.png b/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..66b0f73e309fee8f7f989cc7f7fbf7cda825258e GIT binary patch literal 685 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV2bi|aSW+od^>BuACsfNG56%8 zW(i>r6T_mY6}(f|wz@@ETj}`LFqnP|E8Ev#XxH(J>DCRUf1W0dM;tV^SiQfU%)!*H z({<4MZ>8(6u7AEbBh+|H z=_T7+TEEKv`37-6K6Y28$MVmO{!bs)PwJJ9Soy=PIP3Ec^Sejc@AI%I33j#di)BCN z-}azeizQ>vjxW7oTN6WVU%3@>xE%a<*;9gBddikxUV5i{jNohTfmQV z?;M$1f+s23D*c*b7JXpD$;{t;7n-kTS=_#FZ6qA~x-R5xwyVq5LrHgYOIQN-tZot>`{IY|+ZSgAY}vQ(l0}+z1Ix(-2q2^~FbmD+K0D=CM>*x2wIUce*;GkOFR$p}t`4=WlcE-x@#5p_J&XNNentA-Tx?3`uw&R89%Md+IM?iDf|5L@=l%e%aSh}ZoB$~hvDw^ zm7Wv7UR~=Ze{Y%%-@ko!OrBrPHZ#6H+x~gSK5J%&gVVzkA6_>v)cq~J>tdnnY03Nl zYPZkZU-)-EpKPHo2Sdlf`FvhaCvo!st9dZz_}5*{R`;hDv@!%1>eU4VBv1X${M0dm otMUEzy}-oAmm1-j=IhI#1!QvoF$i1=o(!TqUHx3vIVCg!018Pk)c^nh literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/meta.json b/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/meta.json new file mode 100644 index 00000000000..aa4f4a17b88 --- /dev/null +++ b/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by boctonskuitea(Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file From cb9e0e587143f7243bca0eb3f3d3fa2e61cb0bcb Mon Sep 17 00:00:00 2001 From: RipZoro1 Date: Tue, 24 Sep 2024 08:34:28 +1200 Subject: [PATCH 08/10] =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F?= =?UTF-8?q?=D0=BB=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/personalization.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/personalization.ftl b/Resources/Locale/ru-RU/ADT/personalization.ftl index 854ca87f3cd..9e0e1411f4a 100644 --- a/Resources/Locale/ru-RU/ADT/personalization.ftl +++ b/Resources/Locale/ru-RU/ADT/personalization.ftl @@ -327,11 +327,11 @@ ent-ADTClothingOuterCoatMaki = Пальто Хонкоматери .desc = Пальто дарованное самой Хонкоматерью одному из её лучших клоунов несущих веру Хонка. Оно такое же вычурное, как и сами клоуны, а жёлтые элементы выполнены из чистого бананиума. От пальто исходит лёгкий запах кремового пирога. .suffix = Именное, Maki_gg. -ent-ADTZoroKatana = Легендарная катана +ent-ADTZoroKatana = легендарная катана .desc = Катана легендарного фехтовальщика... .suffix = Именное, Rip_Zoro. -ent-ADTClothingBeltZoroSheath = Ножны легендарной катаны +ent-ADTClothingBeltZoroSheath = ножны легендарной катаны .desc = Ножны для катаны величайшего фехтовальщика... .suffix = Именное, Rip_Zoro. @@ -343,6 +343,6 @@ ent-ADTOwlScimitar = Совиный клинок .desc = Увесистый клинок, схожий со скимитарами давно ушедшей эпохи, с выжженой на рукояти совой. Побит временем, но всё так же рвётся в бой. .suffix = Именное, Filo -ent-ADTClothingZoroJumpsuit = Легендарный деловой костюм +ent-ADTClothingZoroJumpsuit = легендарный деловой костюм .desc = Легендарный, поношенный костюм. Весь белый с позолотой. От него пахнет ванилью... .suffix = Именное, Rip_Zoro. From e637f5782a4a7a4cb6b7decfafa221f336fadba1 Mon Sep 17 00:00:00 2001 From: RipZoro1 Date: Tue, 24 Sep 2024 19:36:35 +1200 Subject: [PATCH 09/10] =?UTF-8?q?=D0=B8=20=D0=B5=D1=89=D1=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Personalization/Clothing/personalization_clothing.yml | 2 +- .../Entities/Personalization/Objects/personalization_items.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml index 1febe3ac16b..2726437eefa 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml @@ -470,7 +470,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingZoroJumpsuit + id: ADTClothingZoroUniform suffix: Rip_Zoro name: The legendary business suit description: A legendary, worn-out suit. All white and gilded. He smells like vanilla... diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml index 728bf3d47d9..05881ffe208 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml @@ -965,7 +965,7 @@ attackRate: 1.5 damage: types: - Slash: 17 + Slash: 15 soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Item From 1c14122a27ac87fbbbcfcef08037243a9fff21be Mon Sep 17 00:00:00 2001 From: RipZoro1 Date: Tue, 24 Sep 2024 19:39:55 +1200 Subject: [PATCH 10/10] =?UTF-8?q?=D0=BD=D1=83=20=D1=82=D0=B5=D0=BF=D1=8C?= =?UTF-8?q?=D0=B5=D1=80=D1=8C=20=D0=B2=D1=80=D0=BE=D0=B4=D0=B5=20=D0=B2?= =?UTF-8?q?=D1=81=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/personalization.ftl | 2 +- .../Personalization/Clothing/personalization_clothing.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/personalization.ftl b/Resources/Locale/ru-RU/ADT/personalization.ftl index 9e0e1411f4a..2f2ffcd4919 100644 --- a/Resources/Locale/ru-RU/ADT/personalization.ftl +++ b/Resources/Locale/ru-RU/ADT/personalization.ftl @@ -343,6 +343,6 @@ ent-ADTOwlScimitar = Совиный клинок .desc = Увесистый клинок, схожий со скимитарами давно ушедшей эпохи, с выжженой на рукояти совой. Побит временем, но всё так же рвётся в бой. .suffix = Именное, Filo -ent-ADTClothingZoroJumpsuit = легендарный деловой костюм +ent-ADTClothingUniformZoroJumpsuit = легендарный деловой костюм .desc = Легендарный, поношенный костюм. Весь белый с позолотой. От него пахнет ванилью... .suffix = Именное, Rip_Zoro. diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml index 2726437eefa..5ad5642a58f 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml @@ -470,7 +470,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingZoroUniform + id: ADTClothingUniformZoroJumpsuit suffix: Rip_Zoro name: The legendary business suit description: A legendary, worn-out suit. All white and gilded. He smells like vanilla...