From 6dc7b3a36032e9741e4fc183c4d33abcbc86f418 Mon Sep 17 00:00:00 2001 From: Adrian16199 Date: Tue, 6 Feb 2024 16:52:39 +0100 Subject: [PATCH 1/2] Straw hat. A craftable, flammable straw hat. Thats it. --- .../Entities/Clothing/Head/hats.yml | 44 +++++++++++++++++- .../Objects/Consumable/Food/produce.yml | 3 ++ .../Recipes/Crafting/Graphs/strawhat.yml | 31 ++++++++++++ .../Recipes/Crafting/improvised.yml | 13 ++++++ Resources/Prototypes/tags.yml | 3 ++ .../straw_hat.rsi/equipped-HELMET-hamster.png | Bin 0 -> 983 bytes .../Hats/straw_hat.rsi/equipped-HELMET.png | Bin 0 -> 982 bytes .../Clothing/Head/Hats/straw_hat.rsi/icon.png | Bin 0 -> 743 bytes .../Head/Hats/straw_hat.rsi/inhand-left.png | Bin 0 -> 963 bytes .../Head/Hats/straw_hat.rsi/inhand-right.png | Bin 0 -> 932 bytes .../Head/Hats/straw_hat.rsi/meta.json | 30 ++++++++++++ 11 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml create mode 100644 Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET-hamster.png create mode 100644 Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index dd8af5eb5839..194a48c11dcb 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -963,4 +963,46 @@ - type: Sprite sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi - type: Clothing - sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi \ No newline at end of file + sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatStrawHat + name: straw hat + description: A fancy hat for hot days! Not recommended to wear near fires. + components: + - type: Sprite + sprite: Clothing/Head/Hats/straw_hat.rsi + - type: Clothing + sprite: Clothing/Head/Hats/straw_hat.rsi + - type: Construction + graph: StrawHat + node: strawhat + - type: Tag + tags: + - HamsterWearable + - type: Flammable + fireSpread: true + canResistFire: false + alwaysCombustible: true + canExtinguish: true + damage: + types: + Heat: 1 + - type: FireVisuals + sprite: Effects/fire.rsi + normalState: fire + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + Ash: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index b137cadae0d5..cabeba7dfe29 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -52,6 +52,9 @@ Quantity: 10 - type: Produce seedId: wheat + - type: Tag + tags: + - Wheat - type: entity name: oat bushel diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml new file mode 100644 index 000000000000..7203a4fdfb3a --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml @@ -0,0 +1,31 @@ +- type: constructionGraph + id: StrawHat + start: start + graph: + - node: start + edges: + - to: strawhat + steps: + - tag: Wheat + name: Wheat Bushel + icon: + sprite: Objects/Specific/Hydroponics/wheat.rsi + state: produce + - tag: Wheat + name: Wheat Bushel + icon: + sprite: Objects/Specific/Hydroponics/wheat.rsi + state: produce + - tag: Wheat + name: Wheat Bushel + icon: + sprite: Objects/Specific/Hydroponics/wheat.rsi + state: produce + - tag: Wheat + name: Wheat Bushel + icon: + sprite: Objects/Specific/Hydroponics/wheat.rsi + state: produce + doAfter: 10 + - node: strawhat + entity: ClothingHeadHatStrawHat diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index ba4eab57c944..12fbe97e28fc 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -201,3 +201,16 @@ sprite: Objects/Materials/materials.rsi state: cloth_3 objectType: Item + +- type: construction + name: straw hat + id: strawHat + graph: StrawHat + startNode: start + targetNode: strawhat + category: construction-category-clothing + description: A fancy hat for hot days! Not recommended to wear near fires. + icon: + sprite: Clothing/Head/Hats/straw_hat.rsi + state: icon + objectType: Item diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index f9b207ba6ec0..4d85f488a141 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1169,6 +1169,9 @@ - type: Tag id: WetFloorSign +- type: Tag + id: Wheat + - type: Tag id: WhitelistChameleon diff --git a/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..10a56e316be5029847778984dfbb740cf4781671 GIT binary patch literal 983 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Y-xA)-y zkz@61{kJ??(9z-CuEi%-(_rDn8hd5o+Jvi1dtWlolA0tU7=G}mV}U?y4evkpU0mz9 znig;<<-OY{rup%XTgJqy!)Jefy!%_$Z(l>b+Iq>dzbq20$GiO8o47lVCS2BLlzORj zrXXnZ*_$^)=G0%mZfh6%{?MxH|G#IgyC!<~+JWmjHp^yCQ`Wg`u=&}HuI;VXTXTwB ze|S_}n8et+e(JnWKU@osJ?1|eW@E)!chz{t%10rh*^#FO7|`@&rrb~Bf1eFsJWXMsm#F#`j)5C}6~x?A^$fq{wN)5S5QBJS<1jb6--0&V6} zoE5h+7Wy(dT3qnE;FnX&IRD5c_6=V=YZ#+F(+~JPbYSva+#2g=8L@`e5efRQ2V~w5^Xn&onddmwe8uu*F?p(`L)I7j+Ha zUTt;vS6lgW<9iMdsmI5rWqQ9?o#NM!YjTP6f-GZIPWP;9FZvu#>}FJx_{74#cO~n) zOL^PcPkrIARLj(45ZZkF+_vMT6K|zn&-^~;{g u`})_ZC>GVM=FDMZ6kx!L8uz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..2ddd8f3209755697759ef3afc1add074023b47c7 GIT binary patch literal 982 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Y-xA)-y zkz@6_wF^ZBWnE;ft{e|=6gd*8bz`a37ST1kR5CAfuGqLG$wX?kN@P1hp2K-pO5dW_8(mS>g$46U;pp55BFAkE%6{*NX}Gew~o$bfq1>>F7p=a-aXR< z?}_)_Fk0}T^-^iSyy$bAy3m~ELc$NiZJl?@ulb*#oG;$W-g5Y;)6pOE+-p4zqGx$} zy`6Tq*||v~(CI};#1e;@jw@A9zRACTVS4^7)sGUNwnZEibMM4nJa0`Jj?qLo-9+fa zmWxiaS(*wK%v~_|#xEwj&ZYbbFDL(C+BWH2!`wrSER)>0ch9L>aipj4d})4Z`Z-(H zpZq~7Gw0SnyS;PC5Az_=d7B@9yK!$@wL!Lo)xG;aw7#mDG$uHPo^#d@E| ztxKW9YNdcoRJ~i&;ls)6-fez!+3c6!>u1iF70$lx+WxuV>&{zigpJ+x_Rb29wm!e~ z&)z&|)z|(dUZ1U^i&D-o`PuYm7U-|CW@GsHYHcB#^!{n2GWsHfz?K5hR3NQY+_i(Mb z{_fx39s2g=#Vyj;n$q=ST|wstmWE1>E&lQ?GoAfquPXdB7h;?s5}Ur}wZf~W_;mRb zyi5uVc+rR5ELzgaindjGr*D1y={0-y@t)Nz3R~RuHEp(Rdr{Z$?bTLyf3=lAH@@fa zka~RV*OsNJt~tGXlGxHNk+Lx8hg_8rqh3uSKazw&I~taBDGf4}e&Qaav0>p+?S h10w?P)sJi7fW$y@qymzHYfh^2e_6#Z4C2xpSnYZF^asP^`#cOOv+ojZE?$M$ z65FlotPF;x>{uOe{`5}m8Adx002ovPDHLkV1gywR!;x` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5cd89c082b142aba2fcaa1e0e1ef55b9d2db9c67 GIT binary patch literal 963 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|(wjL@ zq}5*7RBxh4S4YH>j--hTG&+{L82E1K5bU|7GTHZp(HRww4Wc;E;Y?*09%vi>uqwv=%AXYL9Vn3lDlcS4IMlWws>=ViSSmmngb-m@vk{6tn zMpHuG)qggbJXv__J3sp^w$ayq8(5Sr4BEElee&s5a~l3~>J{_W#}&=`C$jg>1)KH< zx0*h$ZWFuR+?^{?ab>aF7Ok79wj((A?$5OJI_v2oo4p<~G72zYpa?UjshKJ@<##)L_b(T}>s3%J@cViHHQU&)u0@;J zf{#ev4EnIUw|B~$rMJUb4n8{{n*TX}-Fgwx8*l9Gl)uWgDW{n%tNgn#Yk^_?=UE~7 z-Oju6Yy~@&_og&2H!UssGs3Ejna=oi_;Hli{{s1^uT%}6-3*C6@@u8( z-?#f0ny>g*=DqUyy?UYQuO5Lxv!f61^!s48Nq6q9b<0zHZ5?CPpG#Ivmzks8P=6zD zeOZ!Ulh;4>Pm^|pWj|D?(D(fF=9B5x^)Ba6roU8geZb>zf5s#UagVqMRxX!}J?@H! z^ZuOhZ??yRDO?Vl79LUKPMNt}uanVCfq@A>>UK|1lU7zsd&lzhu5^Lrw4DqNoPMwG zIlTPN9OIWfXWDz-fXAW#KkQ}xJg?EDZ|4ezSEApn4qw}G(`@<9s?F=a+)JGJ?By9I z1Mhn|J3n(4zn**i(rSww`^^j*4$-@9SDz7I)@}3BTDSIlB0It*-u@57)yp3z3R*qa Q0;UZHPgg&ebxsLQ03_I?)&Kwi literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8ad5764d3c372555106c27dc7a4dbc362c02d50d GIT binary patch literal 932 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|(wjL@ zq;>xh(cUEiE-s3#U9F7b0^Xeovoa>S6l702sUoC zujE;&XI#@3Ux~fXzawPt_tkM<-(QV+%X#Rc9x+Rl5_`cQ0?)ieP+ zF*(CjhlkQjk9+@FWfA(w|7erMq>1fYEWs)5S5QBJS<1jb4WXMB4JV1{v&n zv7nn(kZBj^uFlo^4<=juVvwyBia!v#E3zP%qa#3E_D+vfNYejPoi9CCnQytF{Fhm_ z=%nrU|NDz)@jSOU-p%6CfPoTjaa=jYGk?BG@ZNp(SJt{NkIt;92;FsDXouD>?z9b+ zTXzP0D864?)R1uU#fB%L7ws1}@7bgF&a#hvT4Dd!Kdo6C7@S{!xT=5ax8&LBJ|(u# z%f8*?zGwAz7q|KSO{Lyf7ktfsZ^rdYUw=~2-%=aStk(~V>Vq$={^xgl=j`3@6{NE} zoi7|+x_;~J7Z;sA8S_TjpUL{`@yh0m=HHv$Z`W*{#Kkh@kGoI``x&!G_ns*j*A@Ip zco+L%ar~L*U-=~*C(IAZzG(5~)OF7<-b$b2mSjCt{BLSJ{bb>v?Wcq?O)DRNI4z;# zz=R*wvAE^+guFcZ+w<4$@tvla5%o|)1_{AW7GeaH?!Cos(v63xB0=gXDyw6$l1 leP7ugF7|{6{Q;Fm|NNH6iOtc|4*?^e!PC{xWt~$(69CwhpIHC^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/meta.json new file mode 100644 index 000000000000..a3cde84524c7 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Adrian16199", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From c0b4fd4f4b1f4b4274dfade850f768645df0da78 Mon Sep 17 00:00:00 2001 From: Adrian16199 Date: Tue, 6 Feb 2024 17:22:47 +0100 Subject: [PATCH 2/2] seems to made it go in flames! --- Resources/Prototypes/Entities/Clothing/Head/hats.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 194a48c11dcb..fb839149ea21 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -989,6 +989,9 @@ damage: types: Heat: 1 + - type: Damageable + damageModifierSet: Wood + - type: Appearance - type: FireVisuals sprite: Effects/fire.rsi normalState: fire