From 57c7b1e9c454ab12c80b2aa541eb617bf3a80f94 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Mon, 31 Jan 2022 21:19:51 -0800
Subject: Port back to DDA.

---
 json/recipes/other/materials.json | 18 ------------------
 json/recipes/other/medical.json   | 22 ++++++++++++++--------
 2 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 json/recipes/other/materials.json

(limited to 'json/recipes/other')

diff --git a/json/recipes/other/materials.json b/json/recipes/other/materials.json
deleted file mode 100644
index 429c893..0000000
--- a/json/recipes/other/materials.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-  {
-    "type": "recipe",
-    "result": "meal_chitin_piece",
-    "id_suffix": "mortar",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
-    "skill_used": "cooking",
-    "skills_required": [ [ "survival", 1 ] ],
-    "difficulty": 2,
-    "time": "1 h 30 m",
-    "autolearn": true,
-    "batch_time_factors": [ 83, 3 ],
-    "flags": [ "BLIND_EASY" ],
-    "tools": [ [ [ "mortar_pestle", -1 ] ] ],
-    "components": [ [ [ "chitin_piece", 1 ], [ "acidchitin_piece", 1 ] ] ]
-  }
-]
diff --git a/json/recipes/other/medical.json b/json/recipes/other/medical.json
index 102eed4..4184b5d 100644
--- a/json/recipes/other/medical.json
+++ b/json/recipes/other/medical.json
@@ -2,18 +2,24 @@
   {
     "result": "anesthetic",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_OTHER",
-    "subcategory": "CC_OTHER_MEDICAL",
+    "subcategory": "CSC_OTHER_MEDICAL",
     "skill_used": "firstaid",
-    "difficulty": 3,
-    "batch_time_factors": [ 99, 1 ],
-    "//": "This difficulty assumes that anaesthesia administration will be handled by the autodoc or the person using the kit. The included amount of ether is an estimate, based on average body size.",
-    "time": "2 m 30 s",
-    "book_learn": [ [ "textbook_firstaid", 6 ], [ "emergency_book", 5 ] ],
-    "qualities": [ { "id": "CONTAIN", "level": 1 } ],
+    "difficulty": 6,
+    "skills_required": [ "chemistry", 5 ],
+    "batch_time_factors": [ 75, 1 ],
+    "time": "40 m",
+    "book_learn": [ [ "textbook_firstaid", 6 ], [ "textbook_toxicology", 6 ] ],
+    "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CHEM", "level": 3 }, { "id": "SEPARATE", "level": 1 } ],
+    "tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "syringe", -1 ] ] ],
+    "//": "This makes 5 charges for an average-sized survivor, morphine assumed as 1 ch=5mg, heroin as 50% pure.",
     "components": [
       [ [ "ether", 500 ] ],
-      [ [ "heroin", 1 ], [ "oxycodone", 2 ], [ "tramadol", 3 ], [ "codeine", 4 ], [ "poppy_pain", 4 ] ]
+      [ [ "heroin", 20 ], [ "morphine", 10 ] ],
+      [ [ "datura_seed", 5 ] ],
+      [ [ "conc_venom", 5 ], [ "stimpack_ammo", 5 ] ],
+      [ [ "conc_paralytic", 5 ], [ "rocuronium", 5 ] ]
     ]
   }
 ]
-- 
cgit v1.2.1