From f271c8cff006c056d0cd97087c03b781698fbc29 Mon Sep 17 00:00:00 2001 From: Ed Date: Sat, 20 Apr 2024 15:59:15 +0300 Subject: [PATCH 1/4] add aristocratic set --- .../ru-RU/_CP14/_PROTO/entities/clothing.ftl | 12 ++++- .../_CP14/Entities/Clothing/Eyes/eyes.yml | 43 ++++++++++++++++++ .../_CP14/Entities/Clothing/Masks/masks.yml | 7 ++- .../_CP14/Entities/Clothing/Pants/pants.yml | 13 +++++- .../_CP14/Entities/Clothing/Shirt/shirt.yml | 13 +++++- .../_CP14/Entities/Clothing/Shoes/shoes.yml | 13 +++++- .../Eyes/gold_glasses.rsi/equipped-EYES.png | Bin 0 -> 293 bytes .../flipped-equipped-EYES.png | Bin 0 -> 297 bytes .../Clothing/Eyes/gold_glasses.rsi/icon.png | Bin 0 -> 245 bytes .../Clothing/Eyes/gold_glasses.rsi/meta.json | 22 +++++++++ .../equipped-EYES-flipped.png | Bin 0 -> 297 bytes .../Eyes/gold_glasses_flipped.rsi/icon.png | Bin 0 -> 245 bytes .../Eyes/gold_glasses_flipped.rsi/meta.json | 18 ++++++++ .../Eyes/monocle.rsi/equipped-EYES.png | Bin 0 -> 232 bytes .../_CP14/Clothing/Eyes/monocle.rsi/icon.png | Bin 0 -> 226 bytes .../_CP14/Clothing/Eyes/monocle.rsi/meta.json | 18 ++++++++ .../equipped-MASK.png | Bin .../{pluto-mask.rsi => sinner.rsi}/icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../{pluto-mask.rsi => sinner.rsi}/meta.json | 0 .../Pants/aristocratic.rsi/equipped-PANTS.png | Bin 0 -> 455 bytes .../Clothing/Pants/aristocratic.rsi/icon.png | Bin 0 -> 285 bytes .../Clothing/Pants/aristocratic.rsi/meta.json | 18 ++++++++ .../Shirt/steampunk.rsi/equipped-SHIRT.png | Bin 0 -> 547 bytes .../Clothing/Shirt/steampunk.rsi/icon.png | Bin 0 -> 341 bytes .../Clothing/Shirt/steampunk.rsi/meta.json | 18 ++++++++ .../aristocratic_black.rsi/equipped-FEET.png | Bin 0 -> 409 bytes .../Shoes/aristocratic_black.rsi/icon.png | Bin 0 -> 272 bytes .../Shoes/aristocratic_black.rsi/meta.json | 18 ++++++++ 30 files changed, 205 insertions(+), 8 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml create mode 100644 Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/equipped-EYES.png create mode 100644 Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/flipped-equipped-EYES.png create mode 100644 Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/equipped-EYES-flipped.png create mode 100644 Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/equipped-EYES.png create mode 100644 Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/meta.json rename Resources/Textures/_CP14/Clothing/Masks/{pluto-mask.rsi => sinner.rsi}/equipped-MASK.png (100%) rename Resources/Textures/_CP14/Clothing/Masks/{pluto-mask.rsi => sinner.rsi}/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Masks/{pluto-mask.rsi => sinner.rsi}/inhand-left.png (100%) rename Resources/Textures/_CP14/Clothing/Masks/{pluto-mask.rsi => sinner.rsi}/inhand-right.png (100%) rename Resources/Textures/_CP14/Clothing/Masks/{pluto-mask.rsi => sinner.rsi}/meta.json (100%) create mode 100644 Resources/Textures/_CP14/Clothing/Pants/aristocratic.rsi/equipped-PANTS.png create mode 100644 Resources/Textures/_CP14/Clothing/Pants/aristocratic.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Pants/aristocratic.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/steampunk.rsi/equipped-SHIRT.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/steampunk.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/steampunk.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/equipped-FEET.png create mode 100644 Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/meta.json diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/clothing.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/clothing.ftl index a9d714680b..02f0a041d4 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/clothing.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/clothing.ftl @@ -13,15 +13,25 @@ ent-CP14ClothingHeadHoodieYellow = желтый капюшон # Mask ent-CP14ClothingMaskSinner = маска грешника .desc = Маска предназначенная для ношения не самыми светлыми личностями. Палачи надевают их на себя и на жертву перед казнью. +ent-CP14ClothingMaskMonocle = монокль + .desc = Аристократично, модно, да еще и с позолотой. +ent-CP14ClothingEyesGoldGlasses = золотые очки + .desc = Аристократично, модно, да еще и с позолотой. # Pants ent-CP14ClothingPantsHarlequinRed = красно-желтые штаны арлекина .desc = С одной стороны кроваво красные, с другой стороны солнечно желтые. Дуальность жизни и смерти всегда хороший повод для шуток. +ent-CP14ClothingPantsAristocratic = штаны аристократа + .desc = Они из достаточно дорогой ткани, чтобы вы не хотели в них шляться по пещерам. # Shirt ent-CP14ClothingShirtHarlequineRed = красная рубаха арлекина .desc = На ней не видно пятен крови, которые остаются после неудачных шуток. +ent-CP14ClothingShirtSteampunk = укрепленная латунью рубашка + .desc = Белая рубашка, укрепленная латунными вставками. # Shoes ent-CP14ClothingShoesBlack = простые черные ботинки - .desc = Влагу они не удержат, но это лучше чем ходить босиком. \ No newline at end of file + .desc = Влагу они не удержат, но это лучше чем ходить босиком. +ent-CP14ClothingAristocraticShoesBlack = черные туфли аристократа + .desc = Они достаточно дорогие, чтобы вы не хотели в них шляться по пещерам. \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml new file mode 100644 index 0000000000..7c71096f34 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml @@ -0,0 +1,43 @@ +- type: entity + abstract: true + parent: Clothing + id: CP14ClothingEyesBase + components: + - type: Sprite + state: icon + - type: Item + size: Small + - type: Clothing + equipDelay: 0.4 + unequipDelay: 0 + slots: [eyes] + +- type: entity + parent: CP14ClothingEyesBase + id: CP14ClothingEyesMonocle + name: monocle + description: Aristocratic, fancy, gold-plated. + components: + - type: Sprite + sprite: _CP14/Clothing/Eyes/monocle.rsi + - type: Clothing + sprite: _CP14/Clothing/Eyes/monocle.rsi + +- type: entity + parent: CP14ClothingEyesBase + id: CP14ClothingEyesGoldGlasses + name: gold glasses + description: Aristocratic, fancy, gold-plated. + components: + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: fold-flip-verb + foldVerbText: fold-flip-verb + - type: FoldableClothing + foldedEquippedPrefix: flipped + foldedHeldPrefix: flipped + - type: Sprite + sprite: _CP14/Clothing/Eyes/gold_glasses.rsi + - type: Clothing + sprite: _CP14/Clothing/Eyes/gold_glasses.rsi + diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml index f4fee04f27..daff940f49 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml @@ -19,8 +19,7 @@ description: A mask intented to be worn by not the brightest individuals. Executioners put them on themselves and the victim before execution. components: - type: Sprite - sprite: _CP14/Clothing/Masks/pluto-mask.rsi + sprite: _CP14/Clothing/Masks/sinner.rsi - type: Clothing - sprite: _CP14/Clothing/Masks/pluto-mask.rsi - - type: IdentityBlocker - \ No newline at end of file + sprite: _CP14/Clothing/Masks/sinner.rsi + - type: IdentityBlocker \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml index 5dcdab7488..0b4199fa63 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml @@ -20,4 +20,15 @@ - type: Sprite sprite: _CP14/Clothing/Pants/harlequin.rsi - type: Clothing - sprite: _CP14/Clothing/Pants/harlequin.rsi \ No newline at end of file + sprite: _CP14/Clothing/Pants/harlequin.rsi + +- type: entity + parent: CP14ClothingPantsBase + id: CP14ClothingPantsAristocratic + name: aristocrat's pants + description: Pants with enough quality fabric that you don't want to cave in them. + components: + - type: Sprite + sprite: _CP14/Clothing/Pants/aristocratic.rsi + - type: Clothing + sprite: _CP14/Clothing/Pants/aristocratic.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml index 007d0c7049..f7d2544a09 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml @@ -13,7 +13,7 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothingShirtHarlequineRed + id: CP14ClothingShirtHarlequineRed name: red harlequin shirt description: It doesn't show the bloodstains that are left behind after bad jokes. components: @@ -21,4 +21,15 @@ sprite: _CP14/Clothing/Shirt/harlequine_red.rsi - type: Clothing sprite: _CP14/Clothing/Shirt/harlequine_red.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtSteampunk + name: brass reinforced shirt + description: A white shirt with brass inserts + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/steampunk.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/steampunk.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml index 8a0c85aa95..c01c12745e 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml @@ -22,4 +22,15 @@ - type: Sprite sprite: _CP14/Clothing/Shoes/black.rsi - type: Clothing - sprite: _CP14/Clothing/Shoes/black.rsi \ No newline at end of file + sprite: _CP14/Clothing/Shoes/black.rsi + +- type: entity + parent: CP14ClothingShoesBase + id: CP14ClothingAristocraticShoesBlack + name: aristocratic black boots + description: They're expensive enough that you don't want to go caving in them. + components: + - type: Sprite + sprite: _CP14/Clothing/Shoes/aristocratic_black.rsi + - type: Clothing + sprite: _CP14/Clothing/Shoes/aristocratic_black.rsi \ No newline at end of file diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/equipped-EYES.png b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..ca06756107299c82549d2274ad27d12766351904 GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uw2HML1zLNdtRBY9wTX|=W{@*TRsv!cDyeF}BHIU*c3Gxg64*?AK zn)gNm#W)K*B8wRq_zr_G07fGD)LO~_WmZsp~kpz!iRaA=c{?P%Xz-znYpQJ+UBR-brzFXt?Xm=f3vrokww5l zz~O-dLnE`JNQLWzGX4*XY`^UM^JlBl7MT@q6LmNyZwPAk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uw2HML1zLNdtRBY9wTX|=W{@*TRsv!cDyeF}BHIU*c3Gxg64*?AK zn)gNm#W)K*B8wRq_zr_GJVeLAz(e$Mf@;KYj`y*xHBGjYgp zC=@6(9Qe8LfVNZC>((uq{K4x)7q+&>R!c0(TFarUcjeoH<8=oA-+AO$)VyS25wH+& gc;LX$IP)f}i(%f=e!(A#Ko>E1y85}Sb4q9e04*kOasU7T literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ae0846993a5811071b9d58a909a4cef9d5626f8b GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUO*KRUZRLMo$^LUH_WyR7sznnc>S8m^8R-n`*{bp;@Z)RbZi|4nn#+z%f bvk3A!OUkSNXZ)cDG?~HE)z4*}Q$iB}MOIa4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/meta.json new file mode 100644 index 0000000000..6f3919e0c7 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by KBAS5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "flipped-equipped-EYES", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/equipped-EYES-flipped.png b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/equipped-EYES-flipped.png new file mode 100644 index 0000000000000000000000000000000000000000..1b995658a81f14dc669aa4d3eba780b04ddb5306 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uw2HML1zLNdtRBY9wTX|=W{@*TRsv!cDyeF}BHIU*c3Gxg64*?AK zn)gNm#W)K*B8wRq_zr_GJVeLAz(e$Mf@;KYj`y*xHBGjYgp zC=@6(9Qe8LfVNZC>((uq{K4x)7q+&>R!c0(TFarUcjeoH<8=oA-+AO$)VyS25wH+& gc;LX$IP)f}i(%f=e!(A#Ko>E1y85}Sb4q9e04*kOasU7T literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ae0846993a5811071b9d58a909a4cef9d5626f8b GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUO*KRUZRLMo$^LUH_WyR7sznnc>S8m^8R-n`*{bp;@Z)RbZi|4nn#+z%f bvk3A!OUkSNXZ)cDG?~HE)z4*}Q$iB}MOIa4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/meta.json new file mode 100644 index 0000000000..5707fda850 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by KBAS5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/equipped-EYES.png b/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..8e5d9627316fff6300cebe72a712b3150319162d GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!CFrj$B>G+x3@O(HYf-%I6RW!dl>gF?X{BM zLoP81p&1Px9rf33F4)v8s1jn3otJ&SRKnlx`ktr1H8$!Uz07C-NX;kqh2ZSjzjn6P zfgAz^0%uM5`0YJ?pD4!MfK=cyCUW&f4kpKR~mpd*2lfu(JKrFL6&jVOz!Z R?{No6z|+;wWt~$(69BXoP=Wve literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..887ebd97a347325830fd51525016e835399f41bf GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V7aG@V@QO1vIOhm1d*PmKm)EelOO++uKxf3 z{Lw$>onKh@uTS}J{^S2EeF6Kw`(xX3+zlKvCo!IW+^dkqE-*hupqy#rOMVBt_Mh`6 z1t>^0G|8Si!u4X3T)|I~6w6pAMivJ}#!Wmk+q`-~X1g8KkYH6|Vq;_Q^{}k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1k1^9%x3bJvDv2u%uNJ>d7|KBe2`%1RFqPD4}r=FobP)VEnt?NLFt0c%T z_&*FVY&xTJ9w^FL;1OBOz`%DHgc*QT7S^a>; mur&XpHAhqYhxe>|_cL-`=vLUwW@-ftJO)o!KbLh*2~7Yo@2^q- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Pants/aristocratic.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Pants/aristocratic.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bcc8f72745853ff56ea00115ba82a252be3ff451 GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?STrKFWbL?i{-xWrhw|8JN1eI;97QCrW@-qg|)sAS6Nqb)#+t0c%T z_&*FVY&xTJ9w^FL;1OBOz`%DHgc* ztz*u#%@BI`hP5oEG4FVdQ&MBb@00VbpU;qFB literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Pants/aristocratic.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Pants/aristocratic.rsi/meta.json new file mode 100644 index 0000000000..901ce57fa4 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Pants/aristocratic.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "CrystallPunk14, by KBAS5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-PANTS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/steampunk.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/steampunk.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000000000000000000000000000000000..9cbffc70c5f95b6963057d38b0c267b7faed5c74 GIT binary patch literal 547 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E2l#}zzW(|1z{MM;8Y2Jy{|~g4|M35RL5TLuLQ^#bk&SIGzprHf-!21G zd&pN;3rO*n1o;I6Rl)&-?F*$gpaf@uM`SSr1K(i~W;~w1A_Zu9j;D)bNQC>_X`X#8 z20X5^{*6lC?elLdI6~2|E%L z?;cxT{zlpA&Xctcu1EGc?tJHXuTr35i~Rc^8XNemw^Ta+>)-YMGDqDZ5uZk5*5C&| z2jjV&9Bx05|Jb)|sn`uZzBBpHCiAdt`?%=lpVxT`N&#{Aq-rWo_&&Y0GD|>_akk(+ zt^;lC8`M_L*Ggw@_DGm7c&fM2#-<{C>+Y*fSKBzY>BgPvW!(6%F?ZLBWto_Kycn2)j7zAMkIolMDM0yDWig e&VR8bUsxA#Z{F|hS9T2;84RATelF{r5}E*LZtMR5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Shirt/steampunk.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/steampunk.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a98fd454b30395571e4e99fda41d157537216c82 GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?STO*KSb|NMF2;te$!zW@LK2inSi`2W8kL|aWkWM-l1#x|GVSF-k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~u2Ka=yGBGl-GP7`Va7uD>``Fvq8X3rOb4&8@=!%L0l>h;^)?pS9RTAVE z{2vY&y!;tI0fjjWJR*x382Ao@Fyrz36)8Z$SDr48ArbCxr+EuC8*n)M)ac#$zmc2m z?C}>Rw_@A3doW*APjy!K@4?}e(4xTN2BfwyX*B+?@%U|^6rkqt3XFSg2c7{4k`BHl}L26Y=hs(A-oh8RZ8w$(> zpT!>7Yn^JlvPqxQk)ubTzV0DaBi>FVdQ&MBb@0OvcCP5=M^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..226a8025c20a112bcf3c99dcfcf414f9e134933a GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?STnHZT^nOV3wI3>Bcee7*)jSS?txg~jcbVWshN_==be1H^JNswRg ze;8ocbVlbqP?WR4BeIx*f$uN~Gak=hkpdJ<^>lFzvG9M}=g4Ppyf Date: Sat, 20 Apr 2024 16:54:03 +0300 Subject: [PATCH 2/4] add torch --- .../_CP14/_PROTO/entities/structures.ftl | 2 + .../Structures/Decoration/wallmount_torch.yml | 62 ++++++++++++++++++ .../Decoration/wallmount_torch.rsi/base.png | Bin 0 -> 1001 bytes .../Decoration/wallmount_torch.rsi/burned.png | Bin 0 -> 693 bytes .../Decoration/wallmount_torch.rsi/fire.png | Bin 0 -> 2966 bytes .../Decoration/wallmount_torch.rsi/meta.json | 45 +++++++++++++ 6 files changed, 109 insertions(+) create mode 100644 Resources/Prototypes/_CP14/Entities/Structures/Decoration/wallmount_torch.yml create mode 100644 Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/base.png create mode 100644 Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/burned.png create mode 100644 Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/fire.png create mode 100644 Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/meta.json diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/structures.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/structures.ftl index 91e6d3ce40..70facb1adb 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/structures.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/structures.ftl @@ -1,6 +1,8 @@ # Decorations ent-CP14Bonfire = костёр .desc = Груда бревен, сложенных вместе, и готовых вспыхнуть от малейшей искры. +ent-CP14WallmountTorch = настенный факел + .desc = Хороший, надеждный источник света. Жаль, недолговечный. # Doors ent-CP14BaseWoodDoor = деревянная дверь diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Decoration/wallmount_torch.yml b/Resources/Prototypes/_CP14/Entities/Structures/Decoration/wallmount_torch.yml new file mode 100644 index 0000000000..d5dd4ea546 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Decoration/wallmount_torch.yml @@ -0,0 +1,62 @@ +- type: entity + id: CP14WallmountTorch + name: wallmount torch + description: A good, reliable light source. Too bad it doesn't last. + placement: + mode: SnapgridCenter + components: + - type: Transform + anchored: true + - type: Clickable + - type: InteractionOutline + - type: Sprite + noRot: true + sprite: _CP14/Structures/Decoration/wallmount_torch.rsi + offset: 0, 0.25 + layers: + - state: base + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 80 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTypeTrigger + damageType: Heat + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: CP14FlammableAmbientSound + - type: AmbientSound + enabled: false + volume: -5 + range: 5 + sound: + path: /Audio/Ambience/Objects/fireplace.ogg + - type: Appearance + - type: Reactive + groups: + Flammable: [ Touch ] + Extinguish: [ Touch ] + - type: Flammable + fireSpread: false + canResistFire: false + alwaysCombustible: true + canExtinguish: true + firestacksOnIgnite: 0.5 + firestackFade: 0.3 + firestackFadeOnIgnite: 0.3 + firestackFadeFade: -0.2 + damage: + types: + Heat: 0.01 + - type: FireVisuals + sprite: _CP14/Structures/Decoration/wallmount_torch.rsi + normalState: fire \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/base.png b/Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..134179782d1aefc13a6a40ae1b83f92632590e01 GIT binary patch literal 1001 zcmVPx&iAh93RCt{2+|5oJQ4|O8|Dc2@NSrAjZNvmcG=U(6n)ne->PFqvE}C@V(s$@n z_$=M%#$8QpLYq`+OJviKF%5~u*r5>$F*Z&Y!%&798X3Xy!uhS>3gn*S+&c;9Z~@Za zI5TfrNyKEM@xye+)aO}gu-!MTBx3S%a#lC~{`hN0CUoCyo%*2VUAKS%2*JJkpJ^#MEso8Vne2b|f_Z)#Z-q1b5}s4 zi6{Q%A-UZoFqeQ@fU>#-43f|m=9YlUs8Or0mVo_F84<6t7f59#7bnPDIVC~}A%qY@ z2qA~`Pm9aM*P4 z0T}sTEQSeCtFOI~1T}_MKkwHpfoL!wSFf&+&57NgS(h~jt`<_G!GNZIsM`b7TAP{# z@vMMqrPAf;cGh7!!%4-W+*m?yj!UIWKsG00b$+hic<}DyCje|7j!>;susT0ifBqqp z)xAa&lv;alY(OwucYg??!GP{6$mT?}Tms{E53)HCk?uz8Gg47KDPs&^EATYDP;+$>mrk{!nv?z=|sE9xv+&yz6$#gSC4rR z07C1pG3pt?DA+v=i1(i+cGmlv-?>+W@zfNXSxI#{Rd@ zJsY@@jqp=haB<25t0!ZXevX|GLI@#*`~{QfP%Nu>giHVc01jnXNoGw=04e|g00;m8 X000000Mb*F00000NkvXXu0mjfA#TBH literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/burned.png b/Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/burned.png new file mode 100644 index 0000000000000000000000000000000000000000..c445314cd8fb112801f9a5e639e166244151ae3e GIT binary patch literal 693 zcmeAS@N?(olHy`uVBq!ia0vp^4nUm1!3HGP9xZtRq!^2X+?^QKos)UVz`zvh>Eakt zG3V`_^V!0VBJ3aDx3J7s(|w&KTE&&NTvNnw?R48Jqw0;e9F{L!UtO&~>s|dZ!vCgs zlR~4J(~E^7Zw@*=a=Yz(+_~yy8ayGNb>5uUQh?!cFc0y`O&B{P=fed_OTnR@!Tthdspz&t-^!7XkFF5g`Q}|A8wPJX1@00G7>{5@HN2G4}UYy0$>n42r{JezJ^zx#- z{QnB;X5>xz)<0wI@$=5k`>xhxf8kfsowr8IKdg7oZx>|H)_H63lrFKE8mYhbaz5B;8>ygwV?m%Ctk{= zhqc`aa$UIK!FFpm{W*Tc=GR1+7#05X)$cShTQ}up>yNuD=IytT>NuJBY0Hc~Uq2ci z&tc>`_H4Ck2*c|l!D~++ZQxjZ_=zS^I}@vEq|^4IpNVzX&-4I&-zLs_=*5%cf6Cl- z7BXm0Z;zeh>)!MI--(jwi1^q8k?)!Aes26|?c!VPExPsd2R^&+>k2A<$%gZ9V_=Zf zoa_0CA!w$J!5f9jdW!>ppYmJ_7oYHQo5E7zc}(ehxhvM+QxSa}|9oFfZ@>Ee38(+p z?2ly7xc+LxJH3NVJ7+Ka)4BIAb56fmou+jygTuCq8EtxApVKrJ-*LMC`O(p5%YJ?TfNTyR T27yb#lR=cHtDnm{r-UW|%GWY~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/fire.png b/Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/fire.png new file mode 100644 index 0000000000000000000000000000000000000000..0a585ee3bebe0d0479ffe65c706a7ed95964ba6f GIT binary patch literal 2966 zcmbtWc{J2t8~+-F$sn}Il&y@dQc0E=AyP<4cB8UnjIyT;8Y(K$&z6iOjJ>gp31b=j zWO=icFiZ>~V{Bs^{H*WSIqx~|Kkt9h5E`T(&T&H{jg>L!L)t)JlM(=pc_ha}qeXd&lUvIjd% z-OG&(no>TytJ>eSoJzn*y9vx^Usw15BYje+{3Yy!K6u)WKuBVR*+C?rTwohyK#)wH;VdOBN)86TmGSp`t(9JEg}G4jp`Bm_!34 zEZ~O(HiWz*&l(Kz*wW!;ebzExL|+o}pn!;jKu-3fkH2`znl9?RBoqn(Wt`Gyj*(-m zSW*SJ;PlCqO?o$#>8djV0IGNIHrwyybEBD+kjf02<&1CBWZ?baK-hpELVq6Z$L{oN zLP(1)cB~OMtDCqj$XsK8JD|rtb*&Cfrq%gy0=H&Q%uuNz>p6I$-Cu7sfJ@7!&X?tV zkWn48HnHbJMxF%i$!JMpG$nj3u$)l_53$E+DNoic7f z4-G_0ocH6L1Wt_{hjuxiD)Op`VK1!TpPZ@3nYLf`t-%z*K0P-H+!ho5;!iO*7y91J zlX|Gmm0NkK`uhmGt+lGh8k09V!j9Yer9Vq@a2bD+dU5qJitmZh6yfvIH9*f3CE61d zbjazKQ~{~;H8YNivtH=Kn94u(NWOywOg5i?5}G3tT_;-AQgpI{-R&?MFvqhhImz=D^xh>fntz9uuzFA`{3;<$WH!)0_Q7qs;^E;LEMG6CwVA zZVXyGn)gGovM)=A>RKi1A4vGkCE`_@v?3ACsFE)1D^j<<2yxztBsH~ePjTL&kp`X{2)E;QqWYtvBu$jcAg~yWBip+e_VaB^SoToN9|cyBi=!x zf`IgOU`XM_H z0TaJG9w*zm5{ZT$Ik9MQBZ#i1dab}st8^`vH)N6nli>mss*nSwA91Zt?R@B_{DM83o(zL$w+VDN)Cj!7}> ze`2DYvA~lF1fqIIzS#y2kg1^{dmJX-Xs)XbkRcF*6J9(~2jmYq*jlb1$S_NK=8;VJ z(WJ@qQcLv+9`_An0FpB~PisUhzF0Tw?dYE`r_CBN`cp{dCHY#~(AFc#s+-y5^^rfC zGCF|<^JKpsvO5q>x@u^Q`K%uKIZS7h0vl-H^G6hUH)O-(3wpdoB!C!t#Nd(`&sCBC z)TQ35EM`=Bo#0TV_Iu_CW*lD{pg%aVzAmmtoUkeH?-R zovXeJ^uuM}5(d#ihcV+R_Qz9=@LTzNZGCN8C>bSZpY)Oy!21Whx z0d+a(E=^Ez;{m(qRY!5+5ikV_*1#(44N_ZO9`kw5nyG@$#H=3Yqi&$c%!L7cx#t2K z-FVCB`f_*K;J+ZJWkS?`QL%jRq_W28*Puv|I`|UR@3LB*_qXe4d@I=(ck(O4fixh| z9yw>6*q{#d*;JJV=fWaz+F7I@2STuN#7>xjVLe}-@Eq;9W$k>IkDtp6P|zn<+i+Gl zs+!b_v&Mu_w_Bk)Tw7w&RtbF?H}a%>KQp% zReLEtysmOhf)Y^U-K+vleT*tFNatY$j)LetEys}n*-jp_@;w1ydu2k4kTUpt;YosrvlBxLHn3f~@$`fwVN{!>;&z-`R?1w@L@L*+h}zKB7eQc$<|kS;vv>b_FCzK+j>{n5 zg{In{mTK~UJ2>OS{t!NdiyNgGJBGZp-rQC4We?;@QorA7aYlPJ?UeZmzVT_dRa}Zr zyww}NJnU1jdn4u*`(%83CNd0%`egz{u Date: Sat, 20 Apr 2024 18:02:09 +0300 Subject: [PATCH 3/4] nuke it --- .../equipped-EYES-flipped.png | Bin 297 -> 0 bytes .../Eyes/gold_glasses_flipped.rsi/icon.png | Bin 245 -> 0 bytes .../Eyes/gold_glasses_flipped.rsi/meta.json | 18 ------------------ 3 files changed, 18 deletions(-) delete mode 100644 Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/equipped-EYES-flipped.png delete mode 100644 Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/icon.png delete mode 100644 Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/equipped-EYES-flipped.png b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/equipped-EYES-flipped.png deleted file mode 100644 index 1b995658a81f14dc669aa4d3eba780b04ddb5306..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uw2HML1zLNdtRBY9wTX|=W{@*TRsv!cDyeF}BHIU*c3Gxg64*?AK zn)gNm#W)K*B8wRq_zr_GJVeLAz(e$Mf@;KYj`y*xHBGjYgp zC=@6(9Qe8LfVNZC>((uq{K4x)7q+&>R!c0(TFarUcjeoH<8=oA-+AO$)VyS25wH+& gc;LX$IP)f}i(%f=e!(A#Ko>E1y85}Sb4q9e04*kOasU7T diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/icon.png deleted file mode 100644 index ae0846993a5811071b9d58a909a4cef9d5626f8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUO*KRUZRLMo$^LUH_WyR7sznnc>S8m^8R-n`*{bp;@Z)RbZi|4nn#+z%f bvk3A!OUkSNXZ)cDG?~HE)z4*}Q$iB}MOIa4 diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/meta.json deleted file mode 100644 index 5707fda850..0000000000 --- a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Created by KBAS5", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-EYES", - "directions": 4 - } - ] -} \ No newline at end of file From fb963920776f7bbb0ee33e743b77263f819ab7c0 Mon Sep 17 00:00:00 2001 From: Ed Date: Sun, 21 Apr 2024 13:52:22 +0300 Subject: [PATCH 4/4] add torch crafting --- .../{Decoration => Furniture}/bonfire.yml | 0 .../wallmount_torch.yml | 5 ++++- .../Construction/Graphs/Furniture/bonfire.yml | 20 ++++++++++++++++++- .../_CP14/Recipes/Construction/furniture.yml | 19 ++++++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) rename Resources/Prototypes/_CP14/Entities/Structures/{Decoration => Furniture}/bonfire.yml (100%) rename Resources/Prototypes/_CP14/Entities/Structures/{Decoration => Furniture}/wallmount_torch.yml (93%) diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Decoration/bonfire.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bonfire.yml similarity index 100% rename from Resources/Prototypes/_CP14/Entities/Structures/Decoration/bonfire.yml rename to Resources/Prototypes/_CP14/Entities/Structures/Furniture/bonfire.yml diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Decoration/wallmount_torch.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_torch.yml similarity index 93% rename from Resources/Prototypes/_CP14/Entities/Structures/Decoration/wallmount_torch.yml rename to Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_torch.yml index d5dd4ea546..440e4b7346 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Decoration/wallmount_torch.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_torch.yml @@ -59,4 +59,7 @@ Heat: 0.01 - type: FireVisuals sprite: _CP14/Structures/Decoration/wallmount_torch.rsi - normalState: fire \ No newline at end of file + normalState: fire + - type: Construction + graph: CP14WallmountTorch + node: CP14WallmountTorch \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/bonfire.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/bonfire.yml index f1375c89c5..b834a7c7ff 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/bonfire.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/bonfire.yml @@ -13,4 +13,22 @@ doAfter: 3 - node: CP14Bonfire - entity: CP14Bonfire \ No newline at end of file + entity: CP14Bonfire + +- type: constructionGraph + id: CP14WallmountTorch + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14WallmountTorch + steps: + - material: WoodPlank + amount: 5 + doAfter: 3 + + - node: CP14WallmountTorch + entity: CP14WallmountTorch + diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml index ac1d2bd00d..bbcbf14c32 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml @@ -52,6 +52,25 @@ conditions: - !type:TileNotBlocked +- type: construction + crystallPunkAllowed: true + name: Wallmount torch + description: A torch attached to the wall + id: CP14WallmountTorch + graph: CP14WallmountTorch + startNode: start + targetNode: CP14WallmountTorch + category: construction-category-furniture + icon: + sprite: _CP14/Structures/Decoration/wallmount_torch.rsi + state: fire + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + canRotate: true + conditions: + - !type:TileNotBlocked + - type: construction crystallPunkAllowed: true name: Wooden chest