Finish addition of new alcohols from CleverRaven#35614 (CleverRaven#3…

…6084)
Maleclypse · Dec 14, 2019 · 4e85a78 · 4e85a78
1 parent cc4a54c
commit 4e85a78
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 106 deletions.
diff --git a/data/json/items/comestibles/alcohol.json b/data/json/items/comestibles/alcohol.json
@@ -1073,82 +1073,31 @@
   {
     "type": "COMESTIBLE",
     "id": "single_pot_whiskey",
-    "name": "single pot still irish whiskey",
-    "name_plural": "single pot still irish whiskey",
-    "weight": "33 g",
-    "color": "brown",
-    "addiction_type": "alcohol",
-    "use_action": "ALCOHOL",
-    "stim": -12,
-    "container": "bottle_glass",
-    "comestible_type": "DRINK",
-    "symbol": "~",
-    "quench": -12,
-    "healthy": -2,
-    "addiction_potential": 5,
-    "calories": 79,
-    "description": "A bottle of fine Irish whiskey.",
+    "copy-from": "whiskey",
+    "name": "single pot still Irish whiskey",
+    "name_plural": "single pot still Irish whiskey",
+    "description": "A whiskey made from a mixed mash of malted and unmalted barley.",
     "price": 2600,
-    "material": "alcohol",
-    "volume": "250 ml",
-    "flags": [ "EATEN_COLD" ],
-    "freezing_point": -22,
-    "phase": "liquid",
-    "charges": 7,
     "fun": 20
   },
   {
     "type": "COMESTIBLE",
     "id": "cheap_whiskey",
+    "copy-from": "whiskey",
     "name": "cheap whiskey",
     "name_plural": "cheap whiskey",
-    "weight": "33 g",
-    "color": "brown",
-    "addiction_type": "alcohol",
-    "use_action": "ALCOHOL",
-    "stim": -12,
-    "container": "bottle_glass",
-    "comestible_type": "DRINK",
-    "symbol": "~",
-    "quench": -12,
-    "healthy": -2,
-    "addiction_potential": 5,
-    "calories": 79,
-    "description": "A bottle of cheap whiskey.",
+    "description": "Really cheap blended whiskey.",
     "price": 1800,
-    "material": "alcohol",
-    "volume": "250 ml",
-    "flags": [ "EATEN_COLD" ],
-    "freezing_point": -22,
-    "phase": "liquid",
-    "charges": 7,
     "fun": 12
   },
   {
     "type": "COMESTIBLE",
     "id": "canadian_whiskey",
-    "name": "canadian whiskey",
-    "name_plural": "canadian whiskey",
-    "weight": "33 g",
-    "color": "brown",
-    "addiction_type": "alcohol",
-    "use_action": "ALCOHOL",
-    "stim": -12,
-    "container": "bottle_glass",
-    "comestible_type": "DRINK",
-    "symbol": "~",
-    "quench": -12,
-    "healthy": -2,
-    "addiction_potential": 5,
-    "calories": 79,
-    "description": "A bottle of fine Canadian whiskey.",
+    "copy-from": "whiskey",
+    "name": "Canadian whiskey",
+    "name_plural": "Canadian whiskey",
+    "description": "A multi-grain liquor made from a mash of corn and rye.",
     "price": 2400,
-    "material": "alcohol",
-    "volume": "250 ml",
-    "flags": [ "EATEN_COLD" ],
-    "freezing_point": -22,
-    "phase": "liquid",
-    "charges": 7,
     "fun": 17
   },
   {
@@ -1171,7 +1120,7 @@
     "description": "East India Solera.  A true drink of a British gentleman.  Sherry, Niles?",
     "price": 2500,
     "material": "alcohol",
-    "volume": "750 ml",
+    "volume": "250 ml",
     "flags": [ "EATEN_COLD" ],
     "freezing_point": -22,
     "phase": "liquid",
@@ -1181,55 +1130,21 @@
   {
     "type": "COMESTIBLE",
     "id": "bristol_sherry",
-    "name": "bristol sherry",
-    "name_plural": "sherry_bristol",
-    "weight": "120 g",
-    "color": "brown",
-    "addiction_type": "alcohol",
-    "use_action": "ALCOHOL",
-    "stim": -12,
-    "container": "bottle_glass",
-    "comestible_type": "DRINK",
-    "symbol": "~",
-    "quench": -12,
-    "healthy": -2,
-    "addiction_potential": 5,
-    "calories": 99,
-    "description": "Finest sherry straight from Bristol.  Adorned with a Royal Purveyor's mark.",
+    "copy-from": "sherry",
+    "name": "Bristol Cream",
+    "name_plural": "Bristol Cream",
+    "description": "A fine sherry that was been aged in American oak casks and bottled in Bristol, England.",
     "price": 2800,
-    "material": "alcohol",
-    "volume": "750 ml",
-    "flags": [ "EATEN_COLD" ],
-    "freezing_point": -22,
-    "phase": "liquid",
-    "charges": 7,
     "fun": 18
   },
   {
     "type": "COMESTIBLE",
     "id": "madeira",
-    "name": "madera",
-    "name_plural": "madeira",
-    "weight": "120 g",
-    "color": "brown",
-    "addiction_type": "alcohol",
-    "use_action": "ALCOHOL",
-    "stim": -12,
-    "container": "bottle_glass",
-    "comestible_type": "DRINK",
-    "symbol": "~",
-    "quench": -12,
-    "healthy": -2,
-    "addiction_potential": 5,
-    "calories": 99,
+    "copy-from": "sherry",
+    "name": "Madeira wine",
+    "name_plural": "Madeira wine",
     "description": "Fortified wine from Madeira.  A true Royal Navy drink.",
     "price": 2400,
-    "material": "alcohol",
-    "volume": "750 ml",
-    "flags": [ "EATEN_COLD" ],
-    "freezing_point": -22,
-    "phase": "liquid",
-    "charges": 7,
     "fun": 15
   },
   {

diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -1863,7 +1863,7 @@
     "flags": [ "BLIND_HARD" ],
     "components": [
       [ [ "sugar", 6 ] ],
-      [ [ "whiskey", 1 ], [ "single_malt_whiskey", 1 ] ],
+      [ [ "whiskey", 1 ], [ "single_malt_whiskey", 1 ], [ "single_pot_whiskey", 1 ], [ "canadian_whiskey", 1 ] ],
       [ [ "coffee_syrup", 1 ], [ "coffee", 1 ] ],
       [ [ "milk_standard", 1, "LIST" ], [ "con_milk", 1 ] ]
     ]
@@ -4505,6 +4505,9 @@
         [ "gin", 1 ],
         [ "rum", 1 ],
         [ "single_malt_whiskey", 1 ],
+        [ "cheap_whiskey", 1 ],
+        [ "canadian_whiskey", 1 ],
+        [ "single_pot_whiskey", 1 ],
         [ "tequila", 1 ],
         [ "triple_sec", 1 ],
         [ "vodka", 1 ],

diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json
@@ -64,6 +64,9 @@
         [ "vodka", 1 ],
         [ "whiskey", 1 ],
         [ "single_malt_whiskey", 1 ],
+        [ "cheap_whiskey", 1 ],
+        [ "canadian_whiskey", 1 ],
+        [ "single_pot_whiskey", 1 ],
         [ "brandy", 1 ],
         [ "rum", 1 ],
         [ "gin", 1 ],
@@ -76,14 +79,23 @@
     "id": "cheap_wine",
     "type": "requirement",
     "//": "Cheap and improvised wines.",
-    "components": [ [ [ "fruit_wine", 1 ], [ "bum_wine", 1 ], [ "dandelion_wine", 1 ], [ "pine_wine", 1 ] ] ]
+    "components": [ [ [ "fruit_wine", 1 ], [ "bum_wine", 1 ], [ "dandelion_wine", 1 ], [ "pine_wine", 1 ], [ "bum_wine", 1 ] ] ]
   },
   {
     "id": "worthy_wine",
     "type": "requirement",
     "//": "More expensive wines.",
     "components": [
-      [ [ "wine_riesling", 1 ], [ "wine_chardonnay", 1 ], [ "wine_cabernet", 1 ], [ "wine_noir", 1 ], [ "wine_vermouth", 1 ] ]
+      [
+        [ "wine_riesling", 1 ],
+        [ "wine_chardonnay", 1 ],
+        [ "wine_cabernet", 1 ],
+        [ "wine_noir", 1 ],
+        [ "wine_vermouth", 1 ],
+        [ "sherry", 1 ],
+        [ "bristol_sherry", 1 ],
+        [ "madeira", 1 ]
+      ]
     ]
   },
   {