From 1ab50b21271bab2416d1a44859a3c8ab884f8b76 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Wed, 18 Dec 2024 11:14:52 +1100 Subject: [PATCH] haha yeah --- .../en-US/deltav/flavors/flavor-profiles.ftl | 1 + .../meta/consumable/drink/alcohol.ftl | 2 ++ .../reagents/meta/consumable/drink/drinks.ftl | 3 +++ .../Prototypes/DeltaV/Flavors/flavors.yml | 5 ++++ .../Reagents/Consumable/Drink/alcohol.yml | 17 ++++++++++++ .../Reagents/Consumable/Drink/drinks.yml | 23 ++++++++++++++++ .../DeltaV/Recipes/Reactions/drinks.yml | 14 ++++++++++ .../Drinks/angobitters.rsi/meta.json | 26 +++++++++++++++++++ .../Drinks/lemonlimebitters.rsi/meta.json | 26 +++++++++++++++++++ 9 files changed, 117 insertions(+) create mode 100644 Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/alcohol.ftl create mode 100644 Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/alcohol.yml create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/angobitters.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json diff --git a/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl index 6c93c98ed3c..a1cd048c9b1 100644 --- a/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl @@ -29,6 +29,7 @@ flavor-complex-blellow = like an impossible color flavor-complex-candy-strawberry = like strawberries flavor-complex-candy-bubblegum = like bubble gum flavor-complex-double-ice-cream = like ice cream, twice +flavor-complex-lemon-lime-bitters = like an Aussie dessert candy-flavor-profile = This one is supposed to taste {$flavor}. candy-flavor-profile-multiple = This one is supposed to taste {$flavors} and {$lastFlavor}. diff --git a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/alcohol.ftl new file mode 100644 index 00000000000..d7b4bebcaa7 --- /dev/null +++ b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/alcohol.ftl @@ -0,0 +1,2 @@ +reagent-name-angobitters = angobitters +reagent-desc-angobitters = An herbal bitters making use of angostura bark, often used to flavor drinks. diff --git a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/drinks.ftl index e57a5a1e520..3d6616101ba 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/drinks.ftl @@ -24,3 +24,6 @@ reagent-desc-mothamphetamine = A strangely... fuzzy drink. It has a chaotic aura reagent-name-double-ice-cream = Double Ice Cream reagent-desc-double-ice-cream = Ice cream, but now with even more ice cream on top. It doesn't get any sweeter than this! + +reagent-name-lemon-lime-bitters = lemon lime bitters +reagent-desc-lemon-lime-bitters = Western Australians love this shit. diff --git a/Resources/Prototypes/DeltaV/Flavors/flavors.yml b/Resources/Prototypes/DeltaV/Flavors/flavors.yml index 8d0d01efa0b..0ed3f0bd6be 100644 --- a/Resources/Prototypes/DeltaV/Flavors/flavors.yml +++ b/Resources/Prototypes/DeltaV/Flavors/flavors.yml @@ -136,3 +136,8 @@ id: doubleicecream flavorType: Complex description: flavor-complex-double-ice-cream + +- type: flavor + id: lemonlimebitters + flavorType: Complex + description: flavor-complex-lemon-lime-bitters diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/alcohol.yml new file mode 100644 index 00000000000..79871503a09 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/alcohol.yml @@ -0,0 +1,17 @@ +- type: reagent + id: Angobitters + name: reagent-name-angobitters + parent: BaseAlcohol + desc: reagent-desc-angobitters + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#611f05" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 1 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.3 diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml index d2e297f926a..7ee08c16b02 100644 --- a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml @@ -221,3 +221,26 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false fizziness: 0.4 + +- type: reagent + id: LemonLimeBitters + name: reagent-name-lemon-lime-bitters + parent: BaseDrink + desc: reagent-desc-lemon-lime-bitters + physicalDesc: reagent-physical-desc-fizzy + flavor: lemonlimebitters + metamorphicSprite: + sprite: DeltaV/Objects/Consumable/Drinks/lemonlimebittersglass.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + fizziness: 0.2 + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.3 diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml index 60bb26eaa2f..3216e26b609 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml @@ -100,3 +100,17 @@ amount: 1 products: DoubleIceCream: 3 + +- type: reaction + id: LemonLimeBitters + reactants: + Lemonade: + amount: 5 + JuiceLime: + amount: 2 + Sugar: + amount: 2 + Angobitters: + amount: 1 + products: + LemonLimeBitters: 10 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/angobitters.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/angobitters.rsi/meta.json new file mode 100644 index 00000000000..1b5a2396eb8 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/angobitters.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by BlitzTheSquishy", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json new file mode 100644 index 00000000000..1b5a2396eb8 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by BlitzTheSquishy", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + } + ] +}