From d0b42aebeb52339dbdc0309f177fb957f5a36fd0 Mon Sep 17 00:00:00 2001 From: Veritius Date: Mon, 12 Jun 2023 03:09:41 +1000 Subject: [PATCH] Add the White Gilgamesh (#16378) --- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + .../meta/consumable/drink/alcohol.ftl | 3 --- .../reagents/meta/consumable/drink/drinks.ftl | 5 ++++- .../en-US/reagents/meta/physical-desc.ftl | 1 - .../Random/Food_Drinks/drinks_glass.yml | 1 - .../Objects/Consumable/Drinks/drinks.yml | 17 -------------- Resources/Prototypes/Flavors/flavors.yml | 7 +++++- .../Reagents/Consumable/Drink/alcohol.yml | 12 ---------- .../Reagents/Consumable/Drink/drinks.yml | 14 ++++++++++++ .../Prototypes/Recipes/Reactions/drinks.yml | 22 +++++++++---------- 10 files changed, 36 insertions(+), 47 deletions(-) diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 47cf9717d3..4739278200 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -192,6 +192,7 @@ flavor-complex-gin-tonic = like spiked lemon-lime soda flavor-complex-screwdriver = like spiked orange juice flavor-complex-themartinez = like violets and lemon vodka flavor-complex-cogchamp = like brass +flavor-complex-white-gilgamesh = like lightly carbonated cream flavor-complex-antifreeze = warm ### This is exactly what pilk tastes like. I'm not even joking. I might've been a little drunk though diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl index 9b6029234c..9275b13010 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl @@ -91,9 +91,6 @@ reagent-desc-barefoot = Barefoot and pregnant. reagent-name-beepsky-smash = beepsky smash reagent-desc-beepsky-smash = Deny drinking this and prepare for THE LAW. -reagent-name-bilk = bilk -reagent-desc-bilk = This appears to be beer mixed with milk. Disgusting. - reagent-name-black-russian = black russian reagent-desc-black-russian = For the lactose-intolerant. Still as classy as a White Russian. diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl index f0ce8430f0..5153d7f9a0 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl @@ -77,4 +77,7 @@ reagent-name-posca = posca reagent-desc-posca = Poor warriors' drink from a forgotten era. reagent-name-the-martinez = The Martinez -reagent-desc-the-martinez = The edgerunner legend. Remembered by a drink, Forgotten by a drunk. +reagent-desc-the-martinez = The edgerunner legend. Remembered by a drink, forgotten by a drunk. + +reagent-name-white-gilgamesh = white gilgamesh +reagent-desc-white-gilgamesh = A sickening mixture of milk and beer. Makes you feel like you're made of wood. \ No newline at end of file diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl index 3879cb4bce..9093e54810 100644 --- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl @@ -66,7 +66,6 @@ reagent-physical-desc-lemony-fresh = lemony fresh reagent-physical-desc-crisp = crisp reagent-physical-desc-citric = citric reagent-physical-desc-acidic = acidic -reagent-physical-desc-bilky = bilky reagent-physical-desc-buzzy = buzzy reagent-physical-desc-fibrous = fibrous reagent-physical-desc-strong-smelling = strong smelling diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml index 5979ded6d0..236d36fc88 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml @@ -25,7 +25,6 @@ - DrinkBarefootGlass - DrinkBeerglass - DrinkBerryJuice - - DrinkBilkGlass - DrinkBlackRussianGlass - DrinkBlueCuracaoGlass - DrinkBloodyMaryGlass diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index a3e0892796..405e21c1a5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -397,23 +397,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/berryjuice.rsi -- type: entity - parent: DrinkGlassBase - id: DrinkBilkGlass - name: bilk - description: A brew of milk and beer. For those alcoholics who fear osteoporosis. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: Bilk - Quantity: 30 - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/glass_brown.rsi - - type: entity parent: DrinkGlassBase id: DrinkBlackRussianGlass diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index e2b03bb749..5690148621 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -799,6 +799,11 @@ flavorType: Complex description: flavor-complex-themartinez +- type: flavor + id: white-gilgamesh + flavorType: Complex + description: flavor-complex-white-gilgamesh + - type: flavor id: plastic flavorType: Complex @@ -808,7 +813,7 @@ id: glue flavorType: Complex description: flavor-complex-glue - + - type: flavor id: rocksandstones flavorType: Complex diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 0ab8db6d36..d776094948 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -545,18 +545,6 @@ reagent: Ethanol amount: 0.15 -- type: reagent - id: Bilk - name: reagent-name-bilk - parent: BaseDrink - desc: reagent-desc-bilk - physicalDesc: reagent-physical-desc-bilky - flavor: alcohol - color: "#895C4C" - metamorphicSprite: - sprite: Objects/Consumable/Drinks/glass_brown.rsi - state: icon - - type: reagent id: BlackRussian name: reagent-name-black-russian diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 2c88dcb9c0..3baa6bbf2d 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -418,3 +418,17 @@ metamorphicSprite: sprite: Objects/Consumable/Drinks/the_martinez.rsi state: icon + +- type: reagent + id: WhiteGilgamesh + name: reagent-name-white-gilgamesh + parent: BaseDrink + desc: reagent-desc-white-gilgamesh + physicalDesc: reagent-physical-desc-creamy + flavor: white-gilgamesh + color: "#e5d27e" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index 9cf0f902b7..831719d19d 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -126,16 +126,6 @@ products: BeepskySmash: 2 -- type: reaction - id: Bilk - reactants: - Beer: - amount: 1 - Milk: - amount: 1 - products: - Bilk: 2 - - type: reaction id: BlackRussian reactants: @@ -879,6 +869,16 @@ products: TheMartinez: 6 +- type: reaction + id: WhiteGilgamesh + reactants: + Beer: + amount: 2 + Milk: + amount: 1 + products: + WhiteGilgamesh: 3 + - type: reaction id: Cola reactants: @@ -891,4 +891,4 @@ Sugar: amount: 1 products: - Cola: 4 + Cola: 4 \ No newline at end of file