From 982ab015f3e47e79ea73e9264cfc19e7a280bd46 Mon Sep 17 00:00:00 2001 From: Floofi <126319569+Shadowtheprotogen546@users.noreply.github.com> Date: Wed, 3 May 2023 18:23:43 -0400 Subject: [PATCH] The Martinez drink from cyberpunk 2077 (#15421) * added 'The Martinez' drink made with 1 ice, 1 lemon juice, 2 vodka, and 2 cola --------- --- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + .../reagents/meta/consumable/drink/drinks.ftl | 2 ++ .../en-US/reagents/meta/physical-desc.ftl | 1 + .../Objects/Consumable/Drinks/drinks.yml | 16 ++++++++++++++++ Resources/Prototypes/Flavors/flavors.yml | 5 +++++ .../Reagents/Consumable/Drink/drinks.yml | 11 +++++++++++ .../Prototypes/Recipes/Reactions/drinks.yml | 14 ++++++++++++++ .../Consumable/Drinks/the_martinez.rsi/icon.png | Bin 0 -> 420 bytes .../Drinks/the_martinez.rsi/meta.json | 1 + 9 files changed, 51 insertions(+) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/meta.json diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index fa2467cfbf..8f22fddf00 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -165,6 +165,7 @@ flavor-complex-atomic-cola = like hoarding bottle caps flavor-complex-cuba-libre = like spiked cola 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 ### 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/drinks.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl index cbe8ec99d1..f0ce8430f0 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl @@ -76,3 +76,5 @@ reagent-desc-pilk = A sickening mixture of milk and cola. 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. diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl index 1ab2633e32..4c636ac252 100644 --- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl @@ -87,3 +87,4 @@ reagent-physical-desc-enigmatic = enigmatic reagent-physical-desc-exotic-smelling = exotic smelling reagent-physical-desc-energizing = energizing reagent-physical-desc-exhilarating = exhilarating +reagent-physical-desc-vibrant = vibrant diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 3967314342..7f9f850fb5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -2201,3 +2201,19 @@ Quantity: 30 - ReagentId: CapsaicinOil Quantity: 5 + +- type: entity + parent: DrinkGlassBase + id: DrinkTheMartinez + name: The Martinez glass + description: The edgerunner legend. Remembered by a drink, Forgotten by a drunk. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: TheMartinez + Quantity: 30 + - type: Sprite + sprite: Objects/Consumable/Drinks/the_martinez.rsi diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 2ce6ed1779..377b08ae29 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -678,3 +678,8 @@ id: bottledlightning flavorType: Complex description: flavor-complex-bottledlightning + +- type: flavor + id: themartinez + flavorType: Complex + description: flavor-complex-themartinez diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 453e538dc3..f54099e019 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -382,3 +382,14 @@ sprite: Objects/Consumable/Drinks/rewriter.rsi state: icon +- type: reagent + id: TheMartinez + name: reagent-name-the-martinez + parent: BaseDrink + desc: reagent-desc-the-martinez + physicalDesc: reagent-physical-desc-vibrant + flavor: themartinez + color: "#75b1f0" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/the_martinez.rsi + state: icon diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index 40380ff8ca..59fdccee02 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -864,3 +864,17 @@ amount: 1 products: Pilk: 2 + +- type: reaction + id: TheMartinez + reactants: + Cola: + amount: 2 + Vodka: + amount: 2 + Ice: + amount: 1 + JuiceLemon: + amount: 1 + products: + TheMartinez: 6 diff --git a/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..00cfe9b3111a7861bd1aa9cbd73fe6cbd5c0634f GIT binary patch literal 420 zcmV;V0bBlwP)Px$TuDShR9Hu2WEfz;IKcKZj5=U61cqM-#Q&K8e<4RA(HPQX&kmWTsH7NREzE3}Mkzu9@BovH(USv3b6XF|o&FGe|z4#v-62bb6jL`T7n}^MjxEw*U13(7BLZEE&!~f=Xa$vJt!Wh6lhD8s0 zC{fJ;AcJwG0gxq{zSRuZH@CtaNs}mm`TXReM+{xL@{BM(C@Mf~zK@G(=Kz=F2@HGY z7Jz*U0wCXl*dWJ%EQZO`EDEM<(__f-x&*ce1VD~KX2axZ>Hy?;1vv&}DY_U<901E= z=oXS|IY=K#*$`$CzFa`8&tYbf