From 61516e82537877248a033c6988eda7e963cc0992 Mon Sep 17 00:00:00 2001
From: Hanz <41141796+Hanzdegloker@users.noreply.github.com>
Date: Mon, 29 Jan 2024 18:21:28 -0500
Subject: [PATCH] Drink tastes touchup (#24700)

* Actual tastebuds

yup

* Grape Soda, can't forget them too

Grape Soda, my beloved
---
 .../Locale/en-US/flavors/flavor-profiles.ftl  | 19 ++++
 Resources/Prototypes/Flavors/flavors.yml      | 97 ++++++++++++++++++-
 .../Reagents/Consumable/Drink/alcohol.yml     | 14 +--
 .../Reagents/Consumable/Drink/drinks.yml      |  4 +-
 .../Reagents/Consumable/Drink/soda.yml        | 22 ++---
 5 files changed, 135 insertions(+), 21 deletions(-)

diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index bbe245b016..0fa0f7dfe1 100644
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -177,8 +177,22 @@ flavor-complex-rocksandstones = like rocks and stones
 ## Basic drinks
 flavor-complex-water = like water
 flavor-complex-beer = like piss
+flavor-complex-cognac = like dry spicy alcohol
+flavor-complex-mead = like fermented honey
+flavor-complex-vermouth = like herbal grape rinds
 flavor-complex-ale = like bread
+flavor-complex-tonic-water = like angry water
 flavor-complex-cola = like cola
+flavor-complex-energy-drink = like battery acid
+flavor-complex-dr-gibb = like malpractice
+flavor-complex-grape-soda = like grape soda
+flavor-complex-lemon-lime-soda = like lemon-lime soda
+flavor-complex-pwr-game-soda = like gaming
+flavor-complex-root-beer-soda = like root beer
+flavor-complex-citrus-soda = like citrus soda
+flavor-complex-space-up-soda = like space
+flavor-complex-starkist-soda = like orange soda
+flavor-complex-fourteen-loko-soda = like sweet malt
 flavor-complex-vodka = like fermented grain
 flavor-complex-tequila = like fermented death
 flavor-complex-sake = like sweet, alcoholic rice
@@ -198,6 +212,10 @@ flavor-complex-mopwata = like stagnant, dirty water
 flavor-complex-long-island = suspiciously like iced tea
 flavor-complex-three-mile-island = like tea brewed in nuclear runoff
 flavor-complex-whiskey-cola = like carbonated molasses
+flavor-complex-root-beer-float = like ice cream in root beer
+flavor-complex-black-russian = like alcoholic coffee
+flavor-complex-white-russian = like alcoholic sweetened coffee
+flavor-complex-moonshine = like pure alcohol
 flavor-complex-singulo = like a bottomless hole
 flavor-complex-syndie-bomb = like bitter whiskey
 flavor-complex-tequila-sunrise = like a mexican morning
@@ -212,6 +230,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-irish-car-bomb = like a spiked cola float
 flavor-complex-themartinez = like violets and lemon vodka
 flavor-complex-cogchamp = like brass
 flavor-complex-white-gilgamesh = like lightly carbonated cream
diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index 8962de2bb2..af83922c44 100644
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -554,11 +554,51 @@
   flavorType: Complex
   description: flavor-complex-mopwata
 
+- type: flavor
+  id: tonicwater
+  flavorType: Complex
+  description: flavor-complex-tonic-water
+
 - type: flavor
   id: beer
   flavorType: Complex
   description: flavor-complex-beer
 
+- type: flavor
+  id: cognac
+  flavorType: Complex
+  description: flavor-complex-cognac
+
+- type: flavor
+  id: mead
+  flavorType: Complex
+  description: flavor-complex-mead
+
+- type: flavor
+  id: vermouth
+  flavorType: Complex
+  description: flavor-complex-vermouth
+
+- type: flavor
+  id: irishcarbomb
+  flavorType: Complex
+  description: flavor-complex-irish-car-bomb
+
+- type: flavor
+  id: blackrussian
+  flavorType: Complex
+  description: flavor-complex-black-russian
+
+- type: flavor
+  id: whiterussian
+  flavorType: Complex
+  description: flavor-complex-white-russian
+
+- type: flavor
+  id: moonshine
+  flavorType: Complex
+  description: flavor-complex-moonshine
+
 - type: flavor
   id: ale
   flavorType: Complex
@@ -569,6 +609,61 @@
   flavorType: Complex
   description: flavor-complex-cola
 
+- type: flavor
+  id: energydrink
+  flavorType: Complex
+  description: flavor-complex-energy-drink
+
+- type: flavor
+  id: drgibb
+  flavorType: Complex
+  description: flavor-complex-dr-gibb
+
+- type: flavor
+  id: lemonlimesoda
+  flavorType: Complex
+  description: flavor-complex-lemon-lime-soda
+
+- type: flavor
+  id: pwrgamesoda
+  flavorType: Complex
+  description: flavor-complex-pwr-game-soda
+
+- type: flavor
+  id: rootbeersoda
+  flavorType: Complex
+  description: flavor-complex-root-beer-soda
+
+- type: flavor
+  id: rootbeerfloat
+  flavorType: Complex
+  description: flavor-complex-root-beer-float
+
+- type: flavor
+  id: sodacitrus
+  flavorType: Complex
+  description: flavor-complex-citrus-soda
+
+- type: flavor
+  id: spaceup
+  flavorType: Complex
+  description: flavor-complex-root-space-up
+
+- type: flavor
+  id: grapesoda
+  flavorType: Complex
+  description: flavor-complex-grape-soda
+
+- type: flavor
+  id: starkistsoda
+  flavorType: Complex
+  description: flavor-complex-starkist-soda
+
+- type: flavor
+  id: fourteenlokosoda
+  flavorType: Complex
+  description: flavor-complex-fourteen-loko-soda
+
 - type: flavor
   id: cogchamp
   flavorType: Complex
@@ -873,7 +968,7 @@
   id: spaceshroomcooked
   flavorType: Complex
   description: flavor-complex-spaceshroom-cooked
-  
+
 - type: flavor
   id: lostfriendship
   flavorType: Complex
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index 8309369fa1..49d05592ac 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -73,7 +73,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-cognac
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: cognac
   color: "#AB3C05"
   recognizable: true
   metamorphicSprite:
@@ -300,7 +300,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-vermouth
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: vermouth
   color: "#91FF91"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/vermouthglass.rsi
@@ -570,7 +570,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-black-russian
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: blackrussian
   color: "#360000"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/blackrussianglass.rsi
@@ -869,7 +869,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-irish-car-bomb
   physicalDesc: reagent-physical-desc-bubbly
-  flavor: alcohol
+  flavor: irishcarbomb
   color: "#2E6671"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/irishcarbomb.rsi
@@ -1017,7 +1017,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-mead
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: mead
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/meadglass.rsi
@@ -1041,7 +1041,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-moonshine
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: moonshine
   color: "#d1d7d155"
   metabolisms:
     Drink:
@@ -1403,7 +1403,7 @@
   parent: BaseAlcohol
   desc: reagent-desc-white-russian
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: alcohol
+  flavor: whiterussian
   color: "#A68340"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/whiterussianglass.rsi
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index 558ecc0e15..77a387da7b 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -319,7 +319,7 @@
   parent: BaseDrink
   desc: reagent-desc-tonic-water
   physicalDesc: reagent-physical-desc-fizzy
-  flavor: water
+  flavor: tonicwater
   color: "#0064C8"
 
 - type: reagent
@@ -444,4 +444,4 @@
     Drink:
       effects:
       - !type:SatiateThirst
-        factor: 0.6
\ No newline at end of file
+        factor: 0.6
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
index 27fe44e578..af1b496a4f 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -23,7 +23,7 @@
   parent: BaseSoda
   desc: reagent-desc-dr-gibb
   physicalDesc: reagent-physical-desc-fizzy
-  flavor: soda
+  flavor: drgibb
   color: "#102000"
 
 - type: reagent
@@ -32,7 +32,7 @@
   parent: BaseSoda
   desc: reagent-desc-energy-drink
   physicalDesc: reagent-physical-desc-fizzy
-  flavor: soda
+  flavor: energydrink
   color: "#ffffbf"
   metabolisms:
     Drink:
@@ -49,7 +49,7 @@
   parent: BaseSoda
   desc: reagent-desc-grape-soda
   physicalDesc: reagent-physical-desc-fizzy
-  flavor: soda
+  flavor: grapesoda
   color: "#ae94a6"
 
 - type: reagent
@@ -71,7 +71,7 @@
   parent: BaseSoda
   desc: reagent-desc-lemon-lime
   physicalDesc: reagent-physical-desc-fizzy
-  flavor: soda
+  flavor: lemonlimesoda
   color: "#878F00"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/lemonlime.rsi
@@ -83,7 +83,7 @@
   parent: BaseSoda
   desc: reagent-desc-pwr-game
   physicalDesc: reagent-physical-desc-fizzy
-  flavor: soda
+  flavor: pwrgamesoda
   color: "#9385bf"
 
 - type: reagent
@@ -92,7 +92,7 @@
   parent: BaseSoda
   desc: reagent-desc-root-beer
   physicalDesc: reagent-physical-desc-fizzy
-  flavor: soda
+  flavor: rootbeersoda
   color: "#381c07"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/rootbeerglass.rsi
@@ -104,7 +104,7 @@
   parent: BaseSoda
   desc: reagent-desc-root-beer-float
   physicalDesc: reagent-physical-desc-fizzy-and-creamy
-  flavor: soda
+  flavor: rootbeerfloat
   color: "#4f361f"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/rootbeerfloatglass.rsi
@@ -116,7 +116,7 @@
   parent: BaseSoda
   desc: reagent-desc-space-mountain-wind
   physicalDesc: reagent-physical-desc-fizzy
-  flavor: soda
+  flavor: sodacitrus
   color: "#102000"
 
 - type: reagent
@@ -125,7 +125,7 @@
   parent: BaseSoda
   desc: reagent-desc-space-up
   physicalDesc: reagent-physical-desc-fizzy
-  flavor: soda
+  flavor: spaceup
   color: "#00FF00"
 
 - type: reagent
@@ -134,7 +134,7 @@
   parent: BaseSoda
   desc: reagent-desc-starkist
   physicalDesc: reagent-physical-desc-fizzy
-  flavor: soda
+  flavor: starkistsoda
   color: "#9F3400"
 
 - type: reagent
@@ -143,7 +143,7 @@
   parent: BaseSoda
   desc: reagent-desc-fourteen-loko
   physicalDesc: reagent-physical-desc-fizzy
-  flavor: soda
+  flavor: fourteenlokosoda
   color: "#deb928"
   metabolisms:
     Drink:
-- 
2.52.0