Merge pull request #54799 from moxian/alcohol

Make most of the weaker alcohols mixable.

Author: ZhilkinSerg

data/json/items/comestibles/alcohol.json

@@ -474,7 +474,7 @@
     "volume": "250 ml",
     "phase": "liquid",
     "charges": 7,
-    "flags": [ "EATEN_COLD" ],
+    "flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE" ],
     "freezing_point": -30,
     "fun": 5
   },

data/json/recipes/chem/fuel.json

@@ -12,15 +12,7 @@
     "book_learn": [ [ "textbook_chemistry" ], [ "distilling_cookbook", 4 ] ],
     "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "thermometer", -1 ] ] ],
-    "components": [
-      [
-        [ "hard_liquor", 14, "LIST" ],
-        [ "weak_liquor", 10, "LIST" ],
-        [ "wash_liquor", 42, "LIST" ],
-        [ "cheap_wine", 56, "LIST" ],
-        [ "worthy_wine", 40, "LIST" ]
-      ]
-    ]
+    "components": [ [ [ "mixed_alcohol_strong", 14 ], [ "mixed_alcohol_weak", 10 ], [ "wash_liquor", 42, "LIST" ] ] ]
   },
   {
     "result": "methed_alcohol",

data/json/recipes/recipe_food.json

@@ -5095,17 +5095,19 @@
     "flags": [ "BLIND_EASY" ],
     "components": [
       [
+        [ "hard_liquor_unmixed", 1, "LIST" ],
+        [ "brandy", 1 ],
+        [ "canadian_whiskey", 1 ],
+        [ "cheap_whiskey", 1 ],
         [ "gin", 1 ],
+        [ "moonshine", 1 ],
         [ "rum", 1 ],
         [ "single_malt_whiskey", 1 ],
-        [ "cheap_whiskey", 1 ],
-        [ "canadian_whiskey", 1 ],
         [ "single_pot_whiskey", 1 ],
         [ "tequila", 1 ],
         [ "triple_sec", 1 ],
         [ "vodka", 1 ],
-        [ "whiskey", 1 ],
-        [ "brandy", 1 ]
+        [ "whiskey", 1 ]
       ]
     ]
   },
@@ -5120,21 +5122,7 @@
     "charges": 1,
     "autolearn": true,
     "flags": [ "BLIND_EASY" ],
-    "components": [
-      [
-        [ "beer", 1 ],
-        [ "belgian_ale", 1 ],
-        [ "drink_beeknees", 1 ],
-        [ "drink_hard_seltzer", 1 ],
-        [ "european_pilsner", 1 ],
-        [ "hb_beer", 1 ],
-        [ "hb_seltzer", 1 ],
-        [ "india_pale_ale", 1 ],
-        [ "wine_barley", 1 ],
-        [ "pale_ale", 1 ],
-        [ "stout", 1 ]
-      ]
-    ]
+    "components": [ [ [ "weak_liquor_unmixed", 1, "LIST" ] ] ]
   },
   {
     "type": "recipe",

data/json/requirements/cooking_components.json

@@ -172,38 +172,43 @@
     ]
   },
   {
-    "id": "hard_liquor",
+    "id": "hard_liquor_unmixed",
     "type": "requirement",
-    "//": "Hard liquor - necessarily comestible and high proof, not necessarily high quality.",
+    "//": "Technical artifact to support mixed alcohol recipe. See comment on `hard_liquor` below for semantics.",
     "components": [
       [
+        [ "brandy", 1 ],
+        [ "canadian_whiskey", 1 ],
+        [ "cheap_whiskey", 1 ],
+        [ "gin", 1 ],
         [ "moonshine", 1 ],
-        [ "vodka", 1 ],
-        [ "whiskey", 1 ],
+        [ "rum", 1 ],
         [ "single_malt_whiskey", 1 ],
-        [ "cheap_whiskey", 1 ],
-        [ "canadian_whiskey", 1 ],
         [ "single_pot_whiskey", 1 ],
-        [ "brandy", 1 ],
-        [ "rum", 1 ],
-        [ "gin", 1 ],
         [ "tequila", 1 ],
-        [ "mixed_alcohol_strong", 1 ]
+        [ "vodka", 1 ],
+        [ "whiskey", 1 ]
       ]
     ]
   },
+  {
+    "id": "hard_liquor",
+    "type": "requirement",
+    "//": "Hard liquor - necessarily comestible and high proof, not necessarily high quality. 7 portions per 250ml",
+    "components": [ [ [ "hard_liquor_unmixed", 1, "LIST" ], [ "mixed_alcohol_strong", 1 ] ] ]
+  },
   {
     "id": "cheap_wine",
     "type": "requirement",
     "//": "Cheap and improvised wines.",
     "components": [
       [
-        [ "fruit_wine", 1 ],
         [ "bum_wine", 1 ],
-        [ "dandelion_wine", 1 ],
         [ "burdock_wine", 1 ],
+        [ "dandelion_wine", 1 ],
+        [ "fruit_wine", 1 ],
         [ "pine_wine", 1 ],
-        [ "bum_wine", 1 ]
+        [ "wine_barley", 1 ]
       ]
     ]
   },
@@ -213,15 +218,15 @@
     "//": "More expensive wines.",
     "components": [
       [
-        [ "wine_riesling", 1 ],
-        [ "wine_chardonnay", 1 ],
+        [ "bristol_sherry", 1 ],
+        [ "madeira", 1 ],
+        [ "sherry", 1 ],
         [ "wine_cabernet", 1 ],
-        [ "wine_noir", 1 ],
-        [ "wine_vermouth", 1 ],
+        [ "wine_chardonnay", 1 ],
         [ "wine_marsala", 1 ],
-        [ "sherry", 1 ],
-        [ "bristol_sherry", 1 ],
-        [ "madeira", 1 ]
+        [ "wine_noir", 1 ],
+        [ "wine_riesling", 1 ],
+        [ "wine_vermouth", 1 ]
       ]
     ]
   },
@@ -961,27 +966,34 @@
     "components": [ [ [ "wash_vodka", 1 ], [ "wash_whiskey", 1 ], [ "wash_rum", 1 ], [ "wash_moonshine", 1 ] ] ]
   },
   {
-    "id": "weak_liquor",
+    "id": "weak_liquor_unmixed",
     "type": "requirement",
-    "//": "Weak liquor - necessarily comestible and low proof, not necessarily high quality",
+    "//": "Technical artifact to support mixed alcohol recipe. See `weak_liquor` comment below for semantics.",
     "components": [
       [
+        [ "cheap_wine", 5, "LIST" ],
+        [ "worthy_wine", 5, "LIST" ],
         [ "beer", 1 ],
         [ "belgian_ale", 1 ],
-        [ "drink_beeknees", 1 ],
+        [ "bristol_sherry", 1 ],
         [ "drink_hard_seltzer", 1 ],
         [ "european_pilsner", 1 ],
         [ "hb_beer", 1 ],
         [ "hb_seltzer", 1 ],
+        [ "imperial_stout", 1 ],
         [ "india_pale_ale", 1 ],
-        [ "wine_barley", 1 ],
+        [ "mead", 1 ],
         [ "pale_ale", 1 ],
-        [ "stout", 1 ],
-        [ "imperial_stout", 1 ],
-        [ "mixed_alcohol_weak", 1 ]
+        [ "stout", 1 ]
       ]
     ]
   },
+  {
+    "id": "weak_liquor",
+    "type": "requirement",
+    "//": "Weak liquor - necessarily comestible and low proof, not necessarily high quality. 250ml",
+    "components": [ [ [ "weak_liquor_unmixed", 1, "LIST" ], [ "mixed_alcohol_weak", 1 ] ] ]
+  },
   {
     "id": "soda_pop",
     "type": "requirement",