The Martinez drink from cyberpunk 2077 (#15421)

* added 'The Martinez' drink made with 1 ice, 1 lemon juice, 2 vodka, and 2 cola
---------

diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index fa2467cfbf2b7e2b388dcfe53aa55f8ad655ac37..8f22fddf00b0c3432ae0d037988bc250aa79a69c 100644 (file)
--- 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 cbe8ec99d19c4cdc589a09efffbdd50ab88f85bf..f0ce8430f055ad6384d10234e6b5e06a40f198fb 100644 (file)
--- 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 1ab2633e32d41b9f1344fe81af665a632850f5c5..4c636ac252815763f45d355d7a8fb5d9a0842002 100644 (file)
--- 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 3967314342056dddae3359fb9ad7a325fa6570dd..7f9f850fb5fed60307326146b54db6c4e3effea6 100644 (file)
--- 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 2ce6ed177965412ba2e80578c74beda1f5d98299..377b08ae299fa30abc22b298b92d2b781c12e58f 100644 (file)
--- 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 453e538dc36cdf39e7f83d8a690b2fec33cb3543..f54099e01945de88dbfff21169e3cc0bd1656467 100644 (file)
--- 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 40380ff8caca4de7135d540393fc420c13997e23..59fdccee025e9434e593219e02bc5bce847e0a56 100644 (file)
--- 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 (file)
index 0000000..00cfe9b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/meta.json
new file mode 100644 (file)
index 0000000..b1a4d1d
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/commit/93dd3fe8aa166a204ae90c520c273e129b574a21", "states": [{"name": "icon"}]}