From 924d0e136792096dd09b7505157fb3c7fc2b35ce Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 26 Oct 2024 21:51:48 +0000 Subject: [PATCH] Rosy the Maple Mothroach Cloak (#2296) * Rosy Mothcloak * Removes Rosy Cloak from Contractor Loadouts. --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> --- .../_NF/Entities/Clothing/Head/hoods.yml | 17 ++++++++++++ .../_NF/Entities/Clothing/Neck/cloaks.yml | 20 ++++++++++++++ .../_NF/Entities/Materials/materials.yml | 12 ++++++++ .../_NF/Entities/Mobs/NPCs/animals.yml | 7 +++++ Resources/Prototypes/_NF/Mail/mail.yml | 2 ++ .../Recipes/Crafting/Graphs/rosy_graph.yml | 19 +++++++++++++ .../_NF/Recipes/Crafting/rosy_craft.yml | 12 ++++++++ Resources/Prototypes/_NF/tags.yml | 5 +++- .../Head/Hoods/rosy.rsi/equipped-HELMET.png | Bin 0 -> 516 bytes .../_NF/Clothing/Head/Hoods/rosy.rsi/icon.png | Bin 0 -> 273 bytes .../Clothing/Head/Hoods/rosy.rsi/meta.json | 18 ++++++++++++ .../Neck/Cloaks/rosy.rsi/equipped-NECK.png | Bin 0 -> 1458 bytes .../Clothing/Neck/Cloaks/rosy.rsi/icon.png | Bin 0 -> 483 bytes .../Neck/Cloaks/rosy.rsi/inhand-left.png | Bin 0 -> 288 bytes .../Neck/Cloaks/rosy.rsi/inhand-right.png | Bin 0 -> 299 bytes .../Clothing/Neck/Cloaks/rosy.rsi/meta.json | 26 ++++++++++++++++++ .../rosymothroach.rsi/hiderosymothroach.png | Bin 0 -> 664 bytes .../Materials/rosymothroach.rsi/meta.json | 14 ++++++++++ 18 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_NF/Entities/Materials/materials.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Crafting/Graphs/rosy_graph.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Crafting/rosy_craft.yml create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/rosy.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/rosy.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/rosy.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Materials/rosymothroach.rsi/hiderosymothroach.png create mode 100644 Resources/Textures/_NF/Objects/Materials/rosymothroach.rsi/meta.json diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml index 0233072bbf2..8da12adc531 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml @@ -10,3 +10,20 @@ sprite: _NF/Clothing/Head/Hoods/Coat/arcadia.rsi - type: Clothing sprite: _NF/Clothing/Head/Hoods/Coat/arcadia.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHoodRosyCloak + name: rosy the maple mothroach hood + description: The adorable visage of a rosy maple mothroach. You have never felt cuter. + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hoods/rosy.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hoods/rosy.rsi + - type: Tag + tags: + - WhitelistChameleon + - type: HideLayerClothing + slots: + - Hair diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml index 35bcdb5cbcb..9a3ee3ce656 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml @@ -17,3 +17,23 @@ components: - type: Sprite sprite: _NF/Clothing/Neck/Cloaks/sr.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakRosy + name: rosy the maple mothroach cloak + description: A cloak made of pink and floof and roach. + components: + - type: Sprite + sprite: _NF/Clothing/Neck/Cloaks/rosy.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodRosyCloak + requiredSlot: + - neck + slot: head + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} + - type: Construction + graph: ClothingNeckCloakRosyGraph + node: ClothingNeckCloakRosyNode diff --git a/Resources/Prototypes/_NF/Entities/Materials/materials.yml b/Resources/Prototypes/_NF/Entities/Materials/materials.yml new file mode 100644 index 00000000000..8d2e6e6acdd --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Materials/materials.yml @@ -0,0 +1,12 @@ +- type: entity + parent: MaterialBase + id: MaterialHideRosyMothroach + name: rosy maple mothroach hide + description: A thin layer of rosy maple mothroach hide. + components: + - type: Sprite + sprite: _NF/Objects/Materials/rosymothroach.rsi + state: hiderosymothroach + - type: Tag + tags: + - MaterialHideRosyMothroach diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml index d0e029d0c73..bd9cadbf5b5 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml @@ -56,3 +56,10 @@ size: Normal - type: Clothing sprite: _NF/Mobs/Animals/rosy_mothroach.rsi + - type: Butcherable + spawned: + - id: FoodMeatSlime + amount: 2 + - id: MaterialHideRosyMothroach + amount: 1 + prob: 0.3 diff --git a/Resources/Prototypes/_NF/Mail/mail.yml b/Resources/Prototypes/_NF/Mail/mail.yml index be5607c89f1..f2c20a70c49 100644 --- a/Resources/Prototypes/_NF/Mail/mail.yml +++ b/Resources/Prototypes/_NF/Mail/mail.yml @@ -1654,6 +1654,8 @@ orGroup: Clothes - id: ClothingOuterSuitCarp orGroup: Clothes + - id: ClothingNeckCloakRosy + orGroup: Clothes - type: entity categories: [ HideSpawnMenu ] diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/rosy_graph.yml b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/rosy_graph.yml new file mode 100644 index 00000000000..f1cd2f3db5b --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/rosy_graph.yml @@ -0,0 +1,19 @@ +- type: constructionGraph + id: ClothingNeckCloakRosyGraph + start: start + graph: + - node: start + edges: + - to: ClothingNeckCloakRosy + steps: + - tag: MaterialHideRosyMothroach + icon: + sprite: _NF/Objects/Materials/rosymothroach.rsi + state: hiderosymothroach + name: rosy maple mothroach hide + doAfter: 10 + - material: Cloth + amount: 10 + doAfter: 5 + - node: ClothingNeckCloakRosy + entity: ClothingNeckCloakRosy diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/rosy_craft.yml b/Resources/Prototypes/_NF/Recipes/Crafting/rosy_craft.yml new file mode 100644 index 00000000000..e253a98bd2e --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Crafting/rosy_craft.yml @@ -0,0 +1,12 @@ +- type: construction + name: maple mothroach cloak + id: ClothingNeckCloakRosyRecipe + graph: ClothingNeckCloakRosyGraph + startNode: start + targetNode: ClothingNeckCloakRosy + category: construction-category-clothing + description: As you stare into those lifeless eyes you know this is what you, I mean they, would have wanted. + icon: + sprite: _NF/Clothing/Neck/Cloaks/rosy.rsi + state: icon + objectType: Item diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index a2eeeccf5cd..21b551ec9a8 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -96,9 +96,12 @@ - type: Tag id: BrassKnucklesNF + +- type: Tag + id: MaterialHideRosyMothroach - type: Tag id: Sushi - type: Tag - id: NFVGRoidInterior \ No newline at end of file + id: NFVGRoidInterior diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/rosy.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hoods/rosy.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..3e8eaade391c54ff7a481308a6fe8b948547a065 GIT binary patch literal 516 zcmV+f0{i`mP)Px$zDYzuRCt{2+OclJFc1ddO9v##3Ym&3ranMl4T&v7HzZyy50EKBFa_3t#NrOs zwZ^i8&%#NX{-4A^Y~uKQB#1K+{BMc$1I>A>Ty5!mBR*f>L>F8Zxq5v|iRgZ^9F*g} zq4$r^=s~b8LTK<`B%N)O*WYt{Os))U%gi?30Vs=H5xFDH$GKk&)nVOw?nmu5-U0Ak z-7d1=nY;sV+&53{C&jB>?T8+pV4v5m7c>SljtH z_w)5<9$Wg#u9mxm==;XUi(+f{A$kh*=~mBvCdQLBC%;*=mk)ztjv zdTHD&Q#a?W3f-m_g2x+NX*^_`+7QP800000000007_l$95dEk%dXxA700002UfpdFDU^8`~DvS zinXs)7TX}OTHt2-`TK&)`y?ESIBI^e9X!Dh*>goe!IF2)&3m0mnrD(`SgcfZC=oeO zqjpS_Ydg<$sUU`vtb%6*cj%~ZRZ!ab!ljJENMX5z9K_Lq2Y`Tq!C+~)*hUtg5TLgh NJYD@<);T3K0RZSvWFG(k literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/rosy.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hoods/rosy.rsi/meta.json new file mode 100644 index 00000000000..67ca3e10eb8 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Hoods/rosy.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by gentlebutter (discord), edited by dustylens(github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..e01be6541328870911174baffb44886068dedc3a GIT binary patch literal 1458 zcmV;j1x@;iP)Px)Y)M2xRCt{2n$K$+M-<1usw|~)K(b{EEs7RQ4l0e2O>sjUa&w>o2i^Qnm>fdr zA>iOcF;VN2=}G+~7J3i~*ifAkoMH>thy>z-aapmf{6n$?wi7vFdsxqUcJ*Ut77Z)2&4wto)!)5KNGW~{!MM(bmR11&9jNdm$pEtCl z2VOo>Ab$5dQ{OyToqKcixu@AZo<41b<&RGd1+AQ59X!EFClEVm8>|rBJbG;f|Nbkb z0YEH%8>|K>#a#fvy@y#x96-N>RyNR%2iTo3U?HP4&~VthDvg){7M_@vIK@-5I?3D2{7Ye4c%4GKN-q@*Y#) zEj^T-U(jZjLhwlm0Dw|bQBY;1GU>K$l7eU$d_K2>++wwDn|5rySkcDCG2{37+z!-t zX8-_iK8k`WBPodZI#mJy2-5+>UI2J6@7YGdH|-ws3?2YdnY5>%%1}zGsl5}N&*>2* zOb6i2M@`SX`6z_xfJu&(mQx^=Nqe&M3r3iWgF&Va#lav7s*Hjv8~t!uL{TgsU|bwC z4az4a5F^u3l`p4Vg1kj5itNc|KKZ123j$aHO(D!<>2r4C2zds?HrUQ!&eZ2+%mxH+T z*l!yA>h=awnY3qhd&AfXhASfOJocN~*}?39$dg*by=LLwOwI|&-fwJs7RY_;H-a5~ z9|1IEkmT(HFrt8d&I7Xp{{5A08DN#;g?v~!B}ZU#Kq`~=$fu2=eO#+H+>=jhSNi&E zrJr2WZ=Zh7yZAZ6KR^H0)APUV{DRhMM{4)1s|NK{p^J-)i;Ihki;Ih6aQ$hZv%tJ* z=x)=gZOnqL($m-N2y1-+Z;G7xR9GqQA{M`GC?Jj?2K3qytp*P8Wr(>>gp}g0(Ruku zF)8h3X^gcXgHF%$rpK8hU|&i?91P;~>|0a5-s*&IN5aYBvSuxYpa*^9^#kaKH*B>D zT#1pPUX+$220pVC0wlh+ToFLN17?;&d|G+{ zvB|MAxn__eMg0S4qrGsC@kt5D@onyQ%n^{vq&**A)#1%YjY7zNLMf^6=A-!Vs?Iev zxfj7^De-=x6Wh2PKPx$ok>JNR9J=WltD`ZK^(=OnU(~amh2)5(P2A?L_{F;0RqvRU&2##3iOuprWHh`#CEV5c6D{9uv7E9?99%ad2jwR48Y-VIR72fPsFd? zQ$^ihSwA-E{ri&u^4*~V0IoI9R88-(1px4EoiVS=BqZhpy%5Blz#3waMbv8E0{}eU zO=_kNp*AO4Rt!^C5^2S0UB=VPGd@CBG{m%^OXvGowL8!sykqC&$Z&n83U~x@)VK_x z>y$C@S0^;qS^z>n1lULVzT9A0dUgdWiL~PPZP5NOT1Wf(4FF&+3#hhb1VkS`cOL)% zV$cRlPNMpn+%T-d0#nRyb7EpH3z{)=S%4U{X>_d24AAU#CKk2iBzOdo9t&x!cTV(V z{;vagUG52U!o}^4<~u$+p2OjA Zz5p5Wo``p}EI$AM002ovPDHLkV1jv()64(> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..f1c8da2c46a648643bb3c66ec55736e2f7a8a94e GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Zh5*mhE&XX zd&`io$w8#$Vf)3^5t%FAyjlBAA*PYJfK|_N`&8DsybF~+io_-5st7GQYb0U*b3fO% z88&eoyvZPAL7?OER=tw7-1py2Pt#1Bb9)st|IeGdt{tkVmCxIxW4vCn$Z1!Dd$Gys z(`a<*Y@R?fKyq8!X92HOf;HvpE zOM5fK1|T^>DOB9?U-^&eBC#zg;tO6WsqAJj_7zurb^q`F53Z7WKTn={w437#bC7#I b!vP_Gnbj$kUu|TyLHa#i{an^LB{Ts5!~}1Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..287c4a2dd85d9b9825c76a65c9c5d462a514306f GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|o_e}ChE&XX zd&{1$$w1`z$M%b>Eiz}^xihy)VBG=69Zb^`ULQH|%xQ*)P3!a(%~Jo5m{l^h&3d2S zWHuo_ZkFErPM{fJ;BxEOj%|kLzT1W0I&=EMGqtx&*&;Rw0qrm%Hz`N512G o>F4rjrX)wA-2>?__Zk0mbKg`?uglf^^&X_()78&qol`;+0Nl-g;{X5v literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/meta.json b/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/meta.json new file mode 100644 index 00000000000..6a6c4a1a7fa --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "sprites by gentlebutter (discord), edited by dustylens(github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Materials/rosymothroach.rsi/hiderosymothroach.png b/Resources/Textures/_NF/Objects/Materials/rosymothroach.rsi/hiderosymothroach.png new file mode 100644 index 0000000000000000000000000000000000000000..b10cfddc3c9469197efa1c9cf07f0878cbcee26e GIT binary patch literal 664 zcmV;J0%!e+P)Px%Qb|NXR9J=WmOX3RP!xt=wapTTKqQ+a!k9*-hJvt%j1@)x0fzj9rluJJ&eV`a zqoGTu4ju|=Iuw$vLwd0ee*-44ey+;>yb7OX36&I`UX4OTO=v?tUTf! z7&`_z+*jHBb^R=`2LPE|Ls*!fL$_UHduGcZnOq}QElQ#SW5*zRr3$sIK`m>L^9s7{ z8pe)6o~(W$0FV`zFm?>mZP(zrHUPkLZInvuEWsqW3Q(t_Bm)4fUI%)m3eUBX6_=ov zHMUL>B{?upf?EUjuX7ealw` z%w+w9n?RxhnOsBY_fGl*yZivB z5%H?HR9Z*BpDZ&~A+8Z|Ye275**N@*Fk8oLKfFixd2m}X?FC`Jy?e;U#W#PZeS~V@ zpIULj(g}4oJlYEcUt5&e<4GGt>&^IYqIuU;##5(g9H*ukw z0&rVD&xRdbsHQNJ0z2DVWTROO1ZS*d@#6DaU?s~QHupj8Hk!rQ3oJGPU~==-cP|5L zr^^~J7~$&rX0k9Cv9lPAKoz6ZcQ0?x#t``ll*elX06u;?nA#sZ26_IyHf8hm>3(G6 yq1W{J&mWPo?(~NwDv9tKuj|FtKuSu=z4I3j(gdiF-kqQT0000