Just some aditions to make possible to disassemble some ordinary tools

CleverRaven · Jul 12, 2020 · b298760 · b298760
1 parent 80f0d4e
commit b298760
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 91 deletions.
diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json
@@ -673,26 +673,6 @@
       [ [ "steel_chunk", 12 ] ]
     ]
   },
-  {
-    "result": "broken_robofac_laserturret_mk1",
-    "type": "uncraft",
-    "skill_used": "electronics",
-    "difficulty": 6,
-    "time": "3 h",
-    "using": [ [ "soldering_standard", 10 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "components": [
-      [ [ "ai_module", 1 ] ],
-      [ [ "gun_module", 1 ] ],
-      [ [ "targeting_module", 1 ] ],
-      [ [ "identification_module", 1 ] ],
-      [ [ "sensor_module", 1 ] ],
-      [ [ "medium_storage_battery", 1 ] ],
-      [ [ "power_supply", 1 ] ],
-      [ [ "robot_controls", 1 ] ],
-      [ [ "turret_chassis", 1 ] ]
-    ]
-  },
   {
     "result": "broken_eyebot",
     "type": "uncraft",
@@ -3755,31 +3735,12 @@
       [ [ "aspirin", 10 ] ],
       [ [ "disinfectant", 10 ] ],
       [ [ "saline", 5 ] ],
-      [ [ "adhesive_bandages", 6 ] ],
-      [ [ "bandages", 3 ] ],
+      [ [ "bandages", 6 ] ],
       [ [ "medical_gauze", 6 ] ],
       [ [ "booklet_firstaid", 1 ] ]
     ],
     "flags": [ "BLIND_EASY", "UNCRAFT_LIQUIDS_CONTAINED" ]
   },
-  {
-    "result": "ifak",
-    "type": "uncraft",
-    "time": "6 s",
-    "components": [
-      [ [ "medical_tape", 20 ] ],
-      [ [ "tourniquet_upper", 1 ] ],
-      [ [ "disinfectant", 5 ] ],
-      [ [ "quikclot", 5 ] ],
-      [ [ "bandages", 9 ] ],
-      [ [ "medical_gauze", 3 ] ],
-      [ [ "adhesive_bandages", 3 ] ],
-      [ [ "pur_tablets", 3 ] ],
-      [ [ "gloves_medical", 1 ] ],
-      [ [ "scissors", 1 ] ]
-    ],
-    "flags": [ "BLIND_EASY", "UNCRAFT_LIQUIDS_CONTAINED" ]
-  },
   {
     "result": "survival_kit",
     "type": "uncraft",
@@ -4016,26 +3977,6 @@
     "qualities": [ { "id": "CUT", "level": 1 } ],
     "components": [ [ [ "rag", 25 ] ], [ [ "element", 5 ] ], [ [ "cable", 5 ] ] ]
   },
-  {
-    "result": "wearable_light",
-    "type": "uncraft",
-    "skill_used": "fabrication",
-    "time": "30 s",
-    "qualities": [ { "id": "CUT", "level": 1 } ],
-    "components": [ [ [ "flashlight", 1 ] ], [ [ "rag", 2 ] ] ]
-  },
-  {
-    "result": "miner_hat",
-    "type": "uncraft",
-    "skill_used": "fabrication",
-    "time": "30 s",
-    "qualities": [ { "id": "CUT", "level": 1 } ],
-    "components": [
-      [ [ "hat_hard", 1 ], [ "helmet_bike", 1 ] ],
-      [ [ "flashlight", 1 ] ],
-      [ [ "rag", 2 ], [ "leather", 2 ], [ "cordage", 1, "LIST" ], [ "duct_tape", 10 ], [ "medical_tape", 20 ] ]
-    ]
-  },
   {
     "result": "adobe_pallet_done",
     "type": "uncraft",

diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -4377,6 +4377,7 @@
         [ "onion", 1 ],
         [ "irradiated_onion", 1 ],
         [ "broccoli", 1 ],
+
         [ "irradiated_tomato", 1 ],
         [ "irradiated_broccoli", 1 ],
         [ "rehydrated_veggy", 1 ],

diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json
@@ -452,7 +452,7 @@
     "subcategory": "CSC_OTHER_TOOLS",
     "skill_used": "fabrication",
     "difficulty": 1,
-    "time": "5 m",
+    "time": "20 m",
     "reversible": true,
     "autolearn": true,
     "qualities": [ { "id": "CUT", "level": 1 } ],
@@ -491,7 +491,6 @@
     "difficulty": 2,
     "time": "25 m",
     "autolearn": true,
-    "reversible": true,
     "using": [ [ "soldering_standard", 10 ] ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SCREW", "level": 1 } ],
     "components": [
@@ -1583,7 +1582,7 @@
     "decomp_learn": 2,
     "autolearn": true,
     "using": [ [ "cordage", 1 ] ],
-    "components": [ [ [ "slamfire_shotgun_d", 1 ] ], [ [ "shot_00", 2 ], [ "shot_slug", 2 ], [ "shot_flechette", 2 ] ] ]
+    "components": [ [ [ "shotgun_d", 1 ] ], [ [ "shot_00", 2 ], [ "shot_slug", 2 ], [ "shot_flechette", 2 ] ] ]
   },
   {
     "type": "recipe",
@@ -4617,33 +4616,5 @@
     "autolearn": true,
     "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "sheet_metal", -1 ] ], [ [ "forge", 75 ] ] ],
     "components": [ [ [ "plastic_chunk", 200 ] ] ]
-  },
-  {
-    "type": "recipe",
-    "result": "funnel_separation",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_TOOLS",
-    "skill_used": "fabrication",
-    "difficulty": 7,
-    "time": "1 h",
-    "book_learn": [ [ "glassblowing_book", 5 ] ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
-    "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 75 ] ] ],
-    "components": [
-      [ [ "glass_shard", 3 ], [ "pipe_glass", 1 ], [ "flask_glass", 3 ], [ "test_tube", 6 ], [ "marble", 75 ] ],
-      [ [ "stopcock", 1 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "result": "stopcock",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_OTHER",
-    "skill_used": "fabrication",
-    "difficulty": 4,
-    "time": "30 m",
-    "autolearn": true,
-    "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [ [ [ "plastic_chunk", 1 ] ] ]
   }
 ]