Merge pull request #17299 from Cyrano7/mixed

Tweak strong mixed alcohol
CleverRaven · Jun 29, 2016 · bca8262 · bca8262
2 parents 360d03a + b1e04f1
commit bca8262
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/data/json/items/comestibles.json b/data/json/items/comestibles.json
@@ -1046,7 +1046,8 @@
         "material" : "alcohol",
         "volume" : 1,
         "phase" : "liquid",
-        "charges" : 7,
+        "charges" : 1,
+        "stack_size" : 7,
         "flags" : ["EATEN_COLD"],
         "fun" : 5
     },

diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -8769,15 +8769,14 @@
         "autolearn": true,
         "flags": ["BLIND_EASY"],
         "components": [ [
-            [ "gin", 7 ],
-            [ "mead", 7 ],
-            [ "pine_wine", 7 ],
-            [ "rum", 7 ],
-            [ "single_malt_whiskey", 7 ],
-            [ "tequila", 7 ],
-            [ "triple_sec", 7 ],
-            [ "vodka", 7 ],
-            [ "whiskey", 7 ]
+            [ "gin", 1 ],
+            [ "rum", 1 ],
+            [ "single_malt_whiskey", 1 ],
+            [ "tequila", 1 ],
+            [ "triple_sec", 1 ],
+            [ "vodka", 1 ],
+            [ "whiskey", 1 ],
+            [ "brandy", 1 ]
         ] ]
     },{
         "type" : "recipe",

diff --git a/doc/JSON_FLAGS.md b/doc/JSON_FLAGS.md
@@ -711,6 +711,7 @@ Some armor flags, such as `WATCH` and `ALARMCLOCK` are compatible with other ite
 - ```DISINFECTANT``` Prevents infections.
 - ```CAFF``` Reduces fatigue.
 - ```ATOMIC_CAFF``` Greatly reduces fatigue and increases radiation dosage.
+- ```ALCOHOL_STRONG``` Greatly increases drunkenness. Adds disease `drunk`.
 - ```ALCOHOL``` Increases drunkenness. Adds disease `drunk`.
 - ```ALCOHOL_WEAK``` Slightly increases drunkenness. Adds disease `drunk`
 - ```PKILL``` Reduces pain. Adds disease `pkill[n]` where `[n]` is the level of flag `PKILL_[n]` used on this comestible.