Absinthe makes you mildly hallucinate (#34371)

* Absinthe make you mildly hallucinate. Smaller glass volume, doesn't make you sick.

* Reordered glass fill sprites to look more equal

diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index da8c7ed6223ffeb11afc2424e6b3539484a23486..69471502ef956ffc0e51de7343f6811c44824abc 100644 (file)
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -287,7 +287,7 @@ flavor-complex-moscowmule = like vodka and ginger ale
 flavor-complex-thesunalsorises = like an absinthe daiquiri
 flavor-complex-whiskeysour = like whiskey and egg
 flavor-complex-zombiecocktail = like eating brains
-flavor-complex-absinthe = like anise
+flavor-complex-absinthe = like bitter anise
 flavor-complex-blue-curacao = like orange flowers
 flavor-complex-acidspit = like French battery acid
 flavor-complex-allies-cocktail = like medicinal tincture

diff --git a/Resources/Locale/en-US/reagents/absinthe.ftl b/Resources/Locale/en-US/reagents/absinthe.ftl
new file mode 100644 (file)
index 0000000..78d9772
--- /dev/null
+++ b/Resources/Locale/en-US/reagents/absinthe.ftl
@@ -0,0 +1,4 @@
+### Messages that pop up when metabolizing absinthe.
+
+absinthe-effect-hear-voice = You hear a tiny voice. "Tee hee hee!"
+absinthe-effect-feel-tulips = You feel tulips brush up against your legs.

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index 89e70bededa5c84e56fa6add4a9af62af1157edf..aff0aa7a05d4255e0975abc5df0411f0767de8b0 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -149,10 +149,10 @@
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 30
+        maxVol: 20
         reagents:
         - ReagentId: Absinthe
-          Quantity: 30
+          Quantity: 20
   - type: Icon
     sprite: Objects/Consumable/Drinks/absintheglass.rsi
     state: icon

diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index bd55967c79b87e4a55422d3edd2b3d0c52469986..7294972e7e1aa0f19254cd4b0d992c534600a297 100644 (file)
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -12,17 +12,39 @@
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/absintheglass.rsi
     state: icon_empty
-  metamorphicMaxFillLevels: 5
+  metamorphicMaxFillLevels: 4
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
     Drink:
       effects:
-      - !type:SatiateThirst
-        factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
         amount: 0.3
+    Narcotic: # The green fairy
+      metabolismRate : 0.01
+      effects:
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.05
+      - !type:GenericStatusEffect
+        conditions:
+        - !type:ReagentThreshold
+          min: 10
+        key: SeeingRainbows
+        component: SeeingRainbows
+        type: Add
+        time: 5
+        refresh: false
+      - !type:PopupMessage
+        type: Local
+        messages:
+        - absinthe-effect-hear-voice
+        - absinthe-effect-feel-tulips
+        probability: 0.02
+        conditions:
+        - !type:ReagentThreshold
+          min: 10
 
 - type: reagent
   id: Ale

diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-1.png
index 3d0d47a0fc5bcfed8ba4c28c56b1ac62272a08b0..004bb58c5d0bb4e48939751e6065147c0f471151 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-1.png and b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-1.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-2.png
index 004bb58c5d0bb4e48939751e6065147c0f471151..fe29ffda1e20fdd6c2baf8575759638318808df9 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-2.png and b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-2.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-3.png
index fe29ffda1e20fdd6c2baf8575759638318808df9..bd28cc24156de7389ff15dc32698f5a533ccbb02 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-3.png and b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-3.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-4.png
index bd28cc24156de7389ff15dc32698f5a533ccbb02..e1badfa312b4794a5209c1fc8f4d33d8479d7556 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-4.png and b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-4.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-5.png
deleted file mode 100644 (file)
index e1badfa..0000000
Binary files a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-5.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/meta.json
index e5994967cd8c302eaecacaeb991b34212a8e14ff..20e933bb577e8f82b97d38e7b8d4c9e04518f24a 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/meta.json
@@ -26,9 +26,6 @@
         },
         {
             "name": "fill-4"
-        },
-        {
-            "name": "fill-5"
         }
     ]
 }