Added Bacchus' Blessing Drink (#35306)

* added start to bacchus blessing with few more things left to do

* added sprites and trying to get the empty sprite to work

* fixed empty sprite will fill layer

* added missing fill image

* made flavor, physical description, recipe reaction and tweaked reagent threshold

* fixed fill levels

* removed name from drinks.yml, updated suffix instead

* delay is weird and broken, removing the difference

* updated copyright

diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index 112f26def2f15690b4acdd5405f2a4002e9a4868..38efd407ae9fbdba19cdf4d4f89899c4ce7c50e8 100644 (file)
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -312,6 +312,7 @@ flavor-complex-toxins-special = like space exploration
 flavor-complex-vodka-martini = like a spy movie from Russia
 flavor-complex-vodka-tonic = refreshingly bitter
 flavor-complex-coconut-rum = like nutty fermented sugar
+flavor-complex-bacchus-blessing = like a wall of bricks
 
 ### This is exactly what pilk tastes like. I'm not even joking. I might've been a little drunk though
 flavor-complex-pilk = like sweet milk

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 3db20a61ab99914757947833e1dfd78ebe0e9279..3e2719cc0a23c86dddedf17565a70e62528a8006 100644 (file)
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
@@ -321,3 +321,6 @@ reagent-desc-whiskey-sour = What's the secret ingredient? Eggs. It's eggs.
 
 reagent-name-zombiecocktail = Zombie
 reagent-desc-zombiecocktail = It gets in your head. Your he-eyeh-ead.
+
+reagent-name-bacchus-blessing = bacchus' blessing
+reagent-desc-bacchus-blessing = You didn't think it was possible for a liquid to be so utterly revolting. Are you sure about this...?

diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
index 56953776e6aac9cd9c652e155aa9b3c137d83e68..55818df8b9e6501c9130fb1af6896dc322756024 100644 (file)
--- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
+++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
@@ -95,3 +95,4 @@ reagent-physical-desc-reflective = reflective
 reagent-physical-desc-holy = holy
 reagent-physical-desc-slimy = slimy
 reagent-physical-desc-neural = neural
+reagent-physical-desc-unidentifiable = unidentifiable

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 5167613cbe7995c4aa3425e79af5d63b62b11f4e..c3a9a3a1434af781601bc4bdac35b509f1f7d10d 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
@@ -124,4 +124,5 @@
       - DrinkShakeRobo
       - DrinkHoochGlass
       - DrinkBeepskySmashGlass
+      - DrinkBacchusBlessing
     rareChance: 0.05

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index 13f46cc76e5e8b8529fb7d29f19972ad8856ceb8..ca56fbcb359cd06bf71a17091900b9c31e40ec78 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -2526,3 +2526,20 @@
     - type: Icon
       sprite: Objects/Consumable/Drinks/bloodglass.rsi
       state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkBacchusBlessing
+  suffix: bacchus blessing
+  description: You didn't think it was possible for a liquid to be so utterly revolting. Are you sure about this...?
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: BacchusBlessing
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/bacchusblessing.rsi
+    state: icon

diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index 2d488cf0c8d770c174c1a0fe61824f9ae313cccb..ffd6fe40b8d7ec94984ba39d8c04367fe442f09c 100644 (file)
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -1398,3 +1398,8 @@
   id: zombiecocktail
   flavorType: Complex
   description: flavor-complex-zombiecocktail
+
+- type: flavor
+  id: bacchusblessing
+  flavorType: Complex
+  description: flavor-complex-bacchus-blessing

diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index 72205a8b0c201edb44fbf668b1930ee1c1838841..3504e64b777d687da202a2741653dd77e1c27b5a 100644 (file)
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -2287,4 +2287,59 @@
           factor: 1
         - !type:AdjustReagent
           reagent: Ethanol
-          amount: 0.25
\ No newline at end of file
+          amount: 0.25
+
+- type: reagent
+  id: BacchusBlessing
+  name: reagent-name-bacchus-blessing
+  parent: BaseAlcohol
+  desc: reagent-desc-bacchus-blessing
+  physicalDesc: reagent-physical-desc-unidentifiable
+  flavor: bacchusblessing
+  color: "#331303"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/bacchusblessing.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 2
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 3
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.45 # TODO: Figure out why setting this to 0 means this does more damage... WHAT BUG IS THIS?!!
+    Alcohol:
+      effects:
+      - !type:Drunk
+        boozePower: 10
+      - !type:HealthChange
+        conditions:
+        - !type:ReagentThreshold
+          min: 6
+        - !type:OrganType
+          type: Dwarf
+          shouldHave: false
+        damage:
+          types:
+            Poison: 2 # TODO: Figure out poison amount. Ethanol does 1, this does 2 but also metabolises almost 3 to 4 times as fast as ethanol. This would be more Liver damage when that time arrives.
+      - !type:HealthChange
+        conditions:
+        - !type:ReagentThreshold
+          min: 6
+        - !type:OrganType
+          type: Dwarf
+        damage:
+          types:
+            Poison: 0.4 # TODO: Might increase this, even though it's just double of ethanol from 0.2 to 0.4
+      - !type:ChemVomit
+        probability: 0.1 #TODO: Tweak vomit probability, maybe make this more violent and poisonous but the body aggressively purges it...
+        conditions:
+        - !type:ReagentThreshold
+          reagent: BacchusBlessing
+          min: 8
+        - !type:OrganType
+          type: Dwarf
+          shouldHave: false

diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index 48884f0ad262ec923db77184e25b7799096c239d..a46dfa296982e94fef31d0f73e90568e3ce18f11 100644 (file)
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -1369,3 +1369,17 @@
       amount: 1
   products:
     ZombieCocktail: 4
+
+- type: reaction
+  id: BacchusBlessing
+  reactants:
+    Hooch:
+      amount: 1
+    Absinthe:
+      amount: 1
+    ManlyDorf:
+      amount: 1
+    SyndicateBomb:
+      amount: 1
+  products:
+    BacchusBlessing: 4

diff --git a/Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..c45889c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/fill-1.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..c45889c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/fill-2.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/icon.png
new file mode 100644 (file)
index 0000000..c45889c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..95eafb0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/icon_empty.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/meta.json
new file mode 100644 (file)
index 0000000..9dbf955
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/meta.json
@@ -0,0 +1,52 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "icon, fill-1, fill-2 from Yogstation from commit: https://github.com/yogstation13/yogstation/commit/3b877178b62acb43329ac4ad58652e1e8d622a3c, icon_empty modified by Coolsurf6 (Github) from commit: https://github.com/yogstation13/yogstation/commit/3b877178b62acb43329ac4ad58652e1e8d622a3c",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "fill-1",
+            "delays":
+            [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "fill-2",
+            "delays":
+            [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty"
+        }
+    ]
+}