From 529111b25a899b3842bd09cefb0ad3f5c0f2e353 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sat, 22 Jun 2024 15:15:30 -0400 Subject: [PATCH 1/4] pumpkin spice latte (thank you, stagnation) --- .../en-US/_NF/flavors/flavor-profiles.ftl | 1 + .../reagents/meta/consumable/drink/drinks.ftl | 2 ++ Resources/Prototypes/_NF/Flavors/flavors.yml | 5 ++++ .../_NF/Reagents/Consumables/Drink/drinks.yml | 25 ++++++++++++++++++ .../_NF/Recipes/Reactions/drinks.yml | 15 +++++++++++ .../Drinks/pumpkinspicelatte.rsi/fill-1.png | Bin 0 -> 546 bytes .../Drinks/pumpkinspicelatte.rsi/fill-2.png | Bin 0 -> 493 bytes .../Drinks/pumpkinspicelatte.rsi/icon.png | Bin 0 -> 493 bytes .../pumpkinspicelatte.rsi/icon_empty.png | Bin 0 -> 363 bytes .../Drinks/pumpkinspicelatte.rsi/meta.json | 24 +++++++++++++++++ 10 files changed, 72 insertions(+) create mode 100644 Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl create mode 100644 Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl create mode 100644 Resources/Prototypes/_NF/Flavors/flavors.yml create mode 100644 Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/fill-1.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/fill-2.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/icon_empty.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/meta.json diff --git a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl new file mode 100644 index 00000000000..9ef7d59859a --- /dev/null +++ b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl @@ -0,0 +1 @@ +flavor-base-basic = basic diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl new file mode 100644 index 00000000000..b88a694b7e7 --- /dev/null +++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl @@ -0,0 +1,2 @@ +reagent-name-pumpkin-spice-latte = pumpkin spice latte +reagent-desc-pumpkin-spice-latte = It's autumn somewhere. Smells like cinnamon and cloves. diff --git a/Resources/Prototypes/_NF/Flavors/flavors.yml b/Resources/Prototypes/_NF/Flavors/flavors.yml new file mode 100644 index 00000000000..a482c685af4 --- /dev/null +++ b/Resources/Prototypes/_NF/Flavors/flavors.yml @@ -0,0 +1,5 @@ + +- type: flavor + id: basic + flavorType: Base + description: flavor-base-basic diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml new file mode 100644 index 00000000000..ebc6a5b1264 --- /dev/null +++ b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml @@ -0,0 +1,25 @@ +- type: reagent + id: PumpkinSpiceLatte + name: reagent-name-pumpkin-spice-latte + parent: BaseDrink + desc: reagent-desc-pumpkin-spice-latte + physicalDesc: reagent-physical-desc-aromatic + flavor: basic + color: "#a45c08" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.05 + - !type:AdjustReagent + reagent: Sugar + amount: 0.2 + metamorphicSprite: + sprite: _NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi + state: icon_empty + metamorphicMaxFillLevels: 2 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml new file mode 100644 index 00000000000..53ad4d1401c --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml @@ -0,0 +1,15 @@ +- type: reaction + id: PumpkinSpiceLatte + reactants: # Amounts might be annoying, but it's easier to halve for easy brain math. + Coffee: + amount: 4 + PumpkinFlesh: + amount: 2 + Sugar: + amount: 2 + Milk: + amount: 1 + Blackpepper: + amount: 1 + products: + PumpkinSpiceLatte: 10 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..b459537e1c3e69f5ba34b59e5cc86d0de96530a8 GIT binary patch literal 546 zcmV+-0^R+IP)A#vDb@^1Fioit3^9>nE$D$DHz>*>xYR|L+DYL+=L}ul{5uyFL?Kj+g0!e$ z9ZUx?a5aWBhA5{9QA)1GxR}OJ`Z?GukviOWB*o#L?e2Yf--qAJ2Ob`hSfz~UKtC;I}3et2^z|{%t6jV(Ys-}yqVT!C_Ze1#>rVFc-*;s6qGC~L;+$1BNfU4=@ z^~+ndiaGXg&tnuS+HQ=6htJB6lM_%iUBr@c=H@@~;OB|IYULG$bC<57YI=80 zF?R9F#=WoKc`Dkm|78tR$O`m0U9O)$!;bJSo;}Ypdg>@2u3cbfw1>u0nd-fp>^V8c z?Yocp@x4y<^V`c#1p-bRjY5Sd4`+xa<22JL`o?e2KfD)!zHxH{H(mjD#G7jYhf{{UnP9JBjy3A_bBoIpQF~0!R=>0k`CE(~4OifPs z-sMXiQVsynuohXXF5{1e34{`?)=jCU?Knk literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..63284c562de0443b9620ed2792ee960a668335ce GIT binary patch literal 493 zcmVsDolFv4BN$&t& zzX_?DrOjfU*1uVtS$i{h(PvIm8KAZ-@KV5UZHMjQTb?>!E zn9Hj&#%P}sgeQPZEGmQ$GCGBXjG0(eG#$Xu^t#^P#Fyo>q3O*7n2l}EWC|@3W_)G}fcuL>>}1OAQfdITdUEb~y?)>}ze1?JpO?oXPtKhZfTwNP z6P^a3t+Sh8Z-+DwwfEE3+1)&V_}*IJ+$u1l4*{PQsD)6K>lVcK)&jShF2=fAe#}<2 z1w>{ jwPO`?U%q_#`V)EsKu8i82J5>=00000NkvXXu0mjfr3~L} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..63284c562de0443b9620ed2792ee960a668335ce GIT binary patch literal 493 zcmVsDolFv4BN$&t& zzX_?DrOjfU*1uVtS$i{h(PvIm8KAZ-@KV5UZHMjQTb?>!E zn9Hj&#%P}sgeQPZEGmQ$GCGBXjG0(eG#$Xu^t#^P#Fyo>q3O*7n2l}EWC|@3W_)G}fcuL>>}1OAQfdITdUEb~y?)>}ze1?JpO?oXPtKhZfTwNP z6P^a3t+Sh8Z-+DwwfEE3+1)&V_}*IJ+$u1l4*{PQsD)6K>lVcK)&jShF2=fAe#}<2 z1w>{ jwPO`?U%q_#`V)EsKu8i82J5>=00000NkvXXu0mjfr3~L} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/icon_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..5d3e8559258f1dce4524db89cc385869412ad552 GIT binary patch literal 363 zcmV-x0hIoUP)8L;{C7&GFP3W&73ZHHvGKQz#EFO!ky0X3A|m>2 zXkRW(#HZsnUS8kxH6azI<2EYyAZ{csxZ;lIVlrE8?M-GYIG($enxj!~G^t#RC=n?= zci!^Q>s079u7SN$P;WFTdVGM83UPM;Jr+{s&xC=GxI19}7NZ7)R2cS0a6A`6DujWL z>fIH9Ec`_?Co!;#UA4f4RfLY`9xP~Npx1gTE#^zy++Lr@fHpDgkIrY{RIrLLyX7|L zJPdpQ*$G+9m-zYmX7>c62BL4oA|~R-2DFLd{7<`~#bU7>lQq6(klq%xwtWBq002ov JPDHLkV1hW>pk)96 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/meta.json new file mode 100644 index 00000000000..68772034090 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-NC-4.0", + "copyright": "Made by Stagnation (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + } + ] + } + \ No newline at end of file From 8663ecb30802d4d90c949981fec812398e9e76f7 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sat, 22 Jun 2024 15:36:53 -0400 Subject: [PATCH 2/4] Fix copyright license, meta & flavors whitespace --- Resources/Prototypes/_NF/Flavors/flavors.yml | 1 - .../Consumable/Drinks/pumpkinspicelatte.rsi/meta.json | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/_NF/Flavors/flavors.yml b/Resources/Prototypes/_NF/Flavors/flavors.yml index a482c685af4..931dae9501d 100644 --- a/Resources/Prototypes/_NF/Flavors/flavors.yml +++ b/Resources/Prototypes/_NF/Flavors/flavors.yml @@ -1,4 +1,3 @@ - - type: flavor id: basic flavorType: Base diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/meta.json index 68772034090..6478c39eb91 100644 --- a/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/meta.json @@ -1,10 +1,10 @@ { "version": 1, - "license": "CC-BY-SA-NC-4.0", + "license": "CC-BY-NC-SA-4.0", "copyright": "Made by Stagnation (Discord)", "size": { - "x": 32, - "y": 32 + "x": 32, + "y": 32 }, "states": [ { @@ -19,6 +19,5 @@ { "name": "fill-2" } - ] - } - \ No newline at end of file + ] +} From b38e3d45f04490ed1eee940e57a34ac48e6bbae6 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sun, 7 Jul 2024 00:56:29 +0300 Subject: [PATCH 3/4] Update drinks.yml --- Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml index 891a296bbae..2d31b2cfe2c 100644 --- a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml @@ -12,14 +12,12 @@ - type: reaction id: PumpkinSpiceLatte reactants: # Amounts might be annoying, but it's easier to halve for easy brain math. - Coffee: - amount: 4 + CafeLatte: + amount: 2 PumpkinFlesh: amount: 2 Sugar: amount: 2 - Milk: - amount: 1 Blackpepper: amount: 1 products: From c64e78bb693102572a93fd41c83640eac3dfb7d9 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Mon, 8 Jul 2024 07:01:09 -0400 Subject: [PATCH 4/4] pumpkin spice latte: new name, 3:1:1:1->6 ratios --- .../_NF/reagents/meta/consumable/drink/drinks.ftl | 2 +- Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl index b88a694b7e7..858ae5f354e 100644 --- a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl @@ -1,2 +1,2 @@ -reagent-name-pumpkin-spice-latte = pumpkin spice latte +reagent-name-pumpkin-spice-latte = spiced pumpkin latte reagent-desc-pumpkin-spice-latte = It's autumn somewhere. Smells like cinnamon and cloves. diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml index 2d31b2cfe2c..670fadacde2 100644 --- a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml @@ -11,14 +11,14 @@ - type: reaction id: PumpkinSpiceLatte - reactants: # Amounts might be annoying, but it's easier to halve for easy brain math. + reactants: CafeLatte: - amount: 2 + amount: 3 PumpkinFlesh: - amount: 2 + amount: 1 Sugar: - amount: 2 + amount: 1 Blackpepper: amount: 1 products: - PumpkinSpiceLatte: 10 + PumpkinSpiceLatte: 6