Lemon Lime and Bitters (#570)

* Lemon Lime Bitters (#2464)

* haha yeah

* merge conflict fix

* DeltaV namespace is kill

* Flavours reorganized (also shifted blood red dr gibb to where it was supposed to be)

* forgor this

* bottle

* drinks.yml

* LLB sprites

* agnobitters sprite and change of unit count

* fill fix

* added to spawners and vendors

* oopsies be fixed!

* thank you orange for making my sprites a bit less shit

* Deltanedas review fix

* Lemon lime and bitters is not notably alcoholic.

* Lemon lime and bitters is popular throughout Australia, and I will not stand for this slander from WA.

* Removed regional shortening and slang.
This is highly dependant on exact region, so best to stick with non-slang names.

---------

Co-authored-by: Blitz <[email protected]>

Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl

@@ -25,3 +25,4 @@ flavor-complex-greengrass = like a holiday in the sun
 flavor-complex-daiquiri = fashionable
 flavor-complex-arsonistsbrew = like ash and flame
 flavor-complex-healthcodeviolation = ominous
+flavor-complex-lemon-lime-bitters = sweet, citrus, and bitter

Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/alcohol.ftl

@@ -0,0 +1,2 @@
+reagent-name-angobitters = angostura bitters
+reagent-desc-angobitters = An herbal bitters making use of angostura bark, often used to flavor drinks.

Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/drinks.ftl

@@ -21,3 +21,6 @@ reagent-desc-healthviolation = Allegedly it's a cocktail. The warning cone motif
 
 reagent-name-mothamphetamine = mothamphetamine
 reagent-desc-mothamphetamine = A strangely... fuzzy drink. It has a chaotic aura.
+
+reagent-name-lemon-lime-bitters = lemon lime and bitters
+reagent-desc-lemon-lime-bitters = A delightful mix of sweet citrus and bitters.

Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml

@@ -48,5 +48,6 @@
     DrinkSojuBottleFull: 2 # DeltaV - Soju bottle
     DrinkBeerCan: 5
     DrinkWineCan: 5
+    DrinkAngobittersBottleFull: 3 # DeltaV - Angostura Bitters Bottle
   emaggedInventory:
     DrinkPoisonWinebottleFull: 2

Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks.yml

@@ -133,3 +133,19 @@
     - type: Icon
       sprite: DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi
       state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: LemonLimeBittersGlass
+  suffix: lemon lime and bitters
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: LemonLimeBitters
+          Quantity: 30
+  - type: Icon
+    sprite: DeltaV/Objects/Consumable/Drinks/lemonlimebitters.rsi
+    state: icon

Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks_bottles.yml

@@ -0,0 +1,17 @@
+- type: entity
+  parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
+  id: DrinkAngobittersBottleFull
+  name: angostura bitters bottle
+  description: Commonly used for mixed drinks, not drunk neat.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Angobitters
+          Quantity: 50
+  - type: Label
+    currentLabel: reagent-name-angobitters
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/angobitters.rsi
+  - type: Sealable

Resources/Prototypes/DeltaV/Flavors/flavors.yml

@@ -115,3 +115,8 @@
   id: arsonistsbrew
   flavorType: Complex
   description: flavor-complex-arsonistsbrew
+
+- type: flavor
+  id: lemonlimebitters
+  flavorType: Complex
+  description: flavor-complex-lemon-lime-bitters

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: "#331002"
+  recognizable: true
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 1
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.3

Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml

@@ -213,3 +213,24 @@
     Poison:
       effects:
       - !type:Jitter
+
+- 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
+  color: "#ffa37e"
+  metamorphicSprite:
+    sprite: DeltaV/Objects/Consumable/Drinks/lemonlimebitters.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  fizziness: 0.2
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2

Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml

@@ -87,4 +87,18 @@
     BlueCuracao:
       amount: 1
   products:
-    Mothamphetamine: 3  
+    Mothamphetamine: 3
+
+- type: reaction
+  id: LemonLimeBitters
+  reactants:
+    Lemonade:
+      amount: 5
+    JuiceLime:
+      amount: 2
+    Sugar:
+      amount: 2
+    Angobitters:
+      amount: 1
+  products:
+    LemonLimeBitters: 10

Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml

@@ -33,6 +33,7 @@
       - DrinkBeerBottleFull
       - DrinkAleBottleFull
       - DrinkChampagneBottleFull
+      - DrinkAngobittersBottleFull # DeltaV
     chance: 0.8
     offset: 0.0
     #rare

Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml

@@ -113,6 +113,7 @@
       - DrinkShakeWhite
       - DrinkTheMartinez
       - DrinkMoonshineGlass
+      - LemonLimeBittersGlass # DeltaV
     chance: 0.8
     offset: 0.0
     #rare

Resources/Textures/DeltaV/Objects/Consumable/Drinks/angobitters.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by BlitzTheSquishy & JustAnOrange",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        }
+    ]
+}

Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by BlitzTheSquishy",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}