Obsolete sewer brew and tainted tornado (#39534)

CleverRaven · Apr 15, 2020 · e469e89 · e469e89
1 parent 7e79360
commit e469e89
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 82 deletions.
diff --git a/data/json/items/comestibles/mutagen.json b/data/json/items/comestibles/mutagen.json
@@ -538,60 +538,5 @@
     "material": "hflesh",
     "volume": "5 L",
     "fun": -20
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "taint_tornado",
-    "name": "tainted tornado",
-    "category": "mutagen",
-    "weight": "100 g",
-    "color": "red",
-    "addiction_type": "alcohol",
-    "use_action": { "type": "mutagen", "is_weak": true },
-    "stim": -60,
-    "container": "bottle_glass",
-    "comestible_type": "DRINK",
-    "symbol": "~",
-    "quench": -20,
-    "healthy": -10,
-    "addiction_potential": 5,
-    "calories": 87,
-    "description": "A frothing slurry of alcohol-soaked zombie flesh and rotten blood, it smells almost as bad as it looks.  Has weak mutagenic properties.",
-    "price": 0,
-    "price_postapoc": 0,
-    "material": [ "alcohol", "flesh" ],
-    "volume": "250 ml",
-    "phase": "liquid",
-    "charges": 2,
-    "flags": [ "EDIBLE_FROZEN", "NUTRIENT_OVERRIDE" ],
-    "freezing_point": -22,
-    "fun": -40
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "drink_sewerbrew",
-    "name": "sewer brew",
-    "weight": "250 g",
-    "color": "yellow",
-    "addiction_type": "alcohol",
-    "stim": -20,
-    "container": "bottle_glass",
-    "comestible_type": "DRINK",
-    "symbol": "~",
-    "quench": 25,
-    "healthy": -10,
-    "addiction_potential": 5,
-    "calories": 26,
-    "description": "A thirsty mutant's drink of choice.  It tastes horrible but it's probably a lot safer to drink than before.",
-    "price": 0,
-    "price_postapoc": 0,
-    "material": [ "alcohol", "junk" ],
-    "volume": "500 ml",
-    "phase": "liquid",
-    "charges": 2,
-    "use_action": { "type": "mutagen", "is_weak": true },
-    "flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE" ],
-    "freezing_point": -22,
-    "fun": -15
   }
 ]
diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json
@@ -1931,5 +1931,58 @@
     "use_action": "SOLARPACK_OFF",
     "solar_efficiency": 0.3,
     "flags": [ "FRAGILE", "OUTER", "ONLY_ONE", "SOLARPACK_ON" ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "taint_tornado",
+    "name": "tainted tornado",
+    "category": "mutagen",
+    "weight": "100 g",
+    "color": "red",
+    "addiction_type": "alcohol",
+    "use_action": { "type": "mutagen", "is_weak": true },
+    "stim": -60,
+    "container": "bottle_glass",
+    "comestible_type": "DRINK",
+    "symbol": "~",
+    "quench": -20,
+    "healthy": -10,
+    "addiction_potential": 5,
+    "calories": 87,
+    "description": "A frothing slurry of alcohol-soaked zombie flesh and rotten blood, it smells almost as bad as it looks.  Has weak mutagenic properties.",
+    "price": 6500,
+    "material": [ "alcohol", "flesh" ],
+    "volume": "250 ml",
+    "phase": "liquid",
+    "charges": 2,
+    "flags": [ "EDIBLE_FROZEN", "NUTRIENT_OVERRIDE" ],
+    "freezing_point": -22,
+    "fun": -40
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "drink_sewerbrew",
+    "name": "sewer brew",
+    "weight": "250 g",
+    "color": "yellow",
+    "addiction_type": "alcohol",
+    "stim": -20,
+    "container": "bottle_glass",
+    "comestible_type": "DRINK",
+    "symbol": "~",
+    "quench": 25,
+    "healthy": -10,
+    "addiction_potential": 5,
+    "calories": 26,
+    "description": "A thirsty mutant's drink of choice.  It tastes horrible but it's probably a lot safer to drink than before.",
+    "price": 1000,
+    "material": [ "alcohol", "junk" ],
+    "volume": "500 ml",
+    "phase": "liquid",
+    "charges": 2,
+    "use_action": { "type": "mutagen", "is_weak": true },
+    "flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE" ],
+    "freezing_point": -22,
+    "fun": -15
   }
 ]
diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -4113,19 +4113,6 @@
     "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ],
     "components": [ [ [ "meth", 4 ] ], [ [ "cola", 2 ] ] ]
   },
-  {
-    "type": "recipe",
-    "result": "taint_tornado",
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_DRINKS",
-    "skill_used": "cooking",
-    "difficulty": 5,
-    "time": "7 m",
-    "autolearn": true,
-    "qualities": [ { "id": "COOK", "level": 2 } ],
-    "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
-    "components": [ [ [ "meat_tainted", 12 ] ], [ [ "hard_liquor_chem", 1, "LIST" ] ] ]
-  },
   {
     "type": "recipe",
     "result": "cheeseburger",
@@ -5472,20 +5459,6 @@
     "tools": [ [ [ "water_boiling_heat", 3, "LIST" ] ] ],
     "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "honey_ant", 1 ] ], [ [ "honeycomb", 1 ], [ "honey_bottled", 3 ] ] ]
   },
-  {
-    "type": "recipe",
-    "result": "drink_sewerbrew",
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_DRINKS",
-    "skill_used": "cooking",
-    "skills_required": [ "survival", 1 ],
-    "difficulty": 5,
-    "time": "7 m",
-    "autolearn": true,
-    "qualities": [ { "id": "COOK", "level": 2 } ],
-    "tools": [ [ [ "water_boiling_heat", 1, "LIST" ] ] ],
-    "components": [ [ [ "sewage", 1 ] ], [ [ "hard_liquor_chem", 1, "LIST" ] ] ]
-  },
   {
     "type": "recipe",
     "result": "pelmeni",

diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json
@@ -2379,6 +2379,16 @@
     "result": "q_solarpack_on",
     "obsolete": true
   },
+  {
+    "type": "recipe",
+    "result": "taint_tornado",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "drink_sewerbrew",
+    "obsolete": true
+  },
   {
     "type": "recipe",
     "result": "plastic_chunk",