[Feature] New Drink Bacchus (#999)

* New Drink Bacchus * Update drinks.yml
Rxup · Jan 11, 2025 · 27d6e22 · 27d6e22
1 parent 71d27ec
commit 27d6e22
Show file tree

Hide file tree

Showing 9 changed files with 93 additions and 4 deletions.
diff --git a/Resources/Locale/ru-RU/backmen/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/backmen/flavors/flavor-profiles.ftl
@@ -1,4 +1,5 @@
 flavor-complex-RedOrdenDrinkFlavour = триумф красного ордена
+flavor-complex-bacchus-drink = нечто самое резкое и разрывное в вашем горле
 
 ## Nyano???
 

diff --git a/Resources/Locale/ru-RU/backmen/prototypes/entities/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/backmen/prototypes/entities/consumable/drinks/drinks.ftl
@@ -0,0 +1,5 @@
+ent-DrinkBacchusBlessing = { ent-DrinkGlass }
+    .desc = { ent-DrinkGlass.desc }
+
+reagent-name-bacchus-blessing = Благословение Бахуса
+reagent-desc-bacchus-blessing = Вас предупредили об этом.
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -170,7 +170,7 @@
           shouldHave: false
         damage:
           types:
-            Poison: 1
+            Poison: 0.5 # backmen: less toxins from alcohol
       # dwarves take less toxin damage and heal a marginal amount of brute
       - !type:HealthChange
         conditions:
@@ -180,7 +180,7 @@
           type: Dwarf
         damage:
           types:
-            Poison: 0.2
+            Poison: 0.1 # backmen: less toxins from alcohol
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
@@ -1976,4 +1976,4 @@
           factor: 1
         - !type:AdjustReagent
           reagent: Ethanol
-          amount: 0.25
+          amount: 0.25
diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -14,3 +14,19 @@
   - type: Drink
   - type: Sprite
     sprite: Backmen/Objects/Consumable/Drinks/RedOrdenDrink.rsi
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkBacchusBlessing
+  suffix: Благословение Бахуса
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: BacchusBlessing
+          Quantity: 30
+  - type: Icon
+    sprite: Backmen/Objects/Consumable/Drinks/bacchus.rsi
+    state: icon
diff --git a/Resources/Prototypes/_Backmen/Flavors/flavors.yml b/Resources/Prototypes/_Backmen/Flavors/flavors.yml
@@ -87,3 +87,8 @@
   id: corncob
   flavorType: Complex
   description: flavor-complex-corncob
+
+- type: flavor
+  id: BacchusDrinkFlavour
+  flavorType: Complex
+  description: flavor-complex-bacchus-drink
diff --git a/Resources/Prototypes/_Backmen/Reactions/drinks.yml b/Resources/Prototypes/_Backmen/Reactions/drinks.yml
@@ -8,3 +8,17 @@
       amount: 1
   products:
     CondensedMilk: 2
+
+- type: reaction
+  id: BacchusDrink
+  reactants:
+    Hooch:
+      amount: 1
+    Absinthe:
+      amount: 1
+    ManlyDorf:
+      amount: 1
+    SyndicateBomb:
+      amount: 1
+  products:
+    BacchusBlessing: 3
diff --git a/Resources/Prototypes/_Backmen/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/_Backmen/Reagents/Consumable/Drink/alcohol.yml
@@ -71,4 +71,24 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
-        amount: 0.15
+        amount: 0.15
+
+- type: reagent
+  id: BacchusBlessing
+  name: reagent-name-bacchus-blessing
+  parent: BaseAlcohol
+  desc: reagent-desc-bacchus-blessing
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: BacchusDrinkFlavour
+  color: "#FAFAFA"
+  metamorphicSprite:
+    sprite: Backmen/Objects/Consumable/Drinks/bacchus.rsi
+    state: icon
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 3
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.5
diff --git a/Resources/Textures/Backmen/Objects/Consumable/Drinks/bacchus.rsi/icon.png b/Resources/Textures/Backmen/Objects/Consumable/Drinks/bacchus.rsi/icon.png
diff --git a/Resources/Textures/Backmen/Objects/Consumable/Drinks/bacchus.rsi/meta.json b/Resources/Textures/Backmen/Objects/Consumable/Drinks/bacchus.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from  at commit ",
+    "states": [
+        {
+            "name": "icon",
+            "delays": [
+                [
+                  0.1,
+                  0.1,
+                  0.1,
+                  0.1,
+                  0.1,
+                  0.1,
+                  0.1,
+                  0.1,
+                  0.1,
+                  0.1
+                ]
+              ]
+        }
+    ]
+}