Remove combat machete and Doppler Radar Turbo 2000

data/json/itemgroups/Clothing_Gear/clothing.json

@@ -3420,7 +3420,6 @@
       { "distribution": [ { "group": "full_survival_kit" }, { "group": "used_survival_kit" } ], "prob": 3 },
       { "group": "tools_toolbox", "prob": 1 },
       [ "survivor_belt_notools", 2 ],
-      [ "survivor_machete", 2 ],
       [ "survivor_mess_kit", 6 ],
       [ "acetylene_cooker", 12 ],
       [ "survivor_shavingkit", 3 ],

data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json

@@ -288,8 +288,7 @@
       { "item": "radiocontrol", "prob": 15, "charges": [ 0, 100 ] },
       { "item": "thermometer", "prob": 10 },
       { "item": "hygrometer", "prob": 10 },
-      { "item": "barometer", "prob": 10 },
-      { "item": "weather_reader", "prob": 1 }
+      { "item": "barometer", "prob": 10 }
     ]
   },
   {

data/json/itemgroups/Weapons_Mods_Ammo/melee_weapons.json

@@ -152,7 +152,6 @@
       { "item": "sword_metal_large", "prob": 4 },
       { "item": "knife_hunting", "prob": 16 },
       { "item": "machete", "prob": 16 },
-      { "item": "survivor_machete", "prob": 4 },
       { "item": "survivor_machete_qt", "prob": 1 },
       { "item": "sword_xiphos", "prob": 1 },
       { "item": "khopesh", "prob": 1 },

data/json/itemgroups/science_and_tech.json

@@ -73,7 +73,6 @@
       { "item": "rad_monitor", "prob": 2, "charges": [ 0, 50 ] },
       [ "teleporter", 10 ],
       [ "RTG_coffee", 2 ],
-      [ "canister_goo", 8 ],
       [ "EMPbomb", 2 ],
       [ "flux_comp_gen", 3 ],
       [ "portal", 2 ],
@@ -479,8 +478,6 @@
       { "item": "lighter", "prob": 60, "charges": [ 0, 100 ] },
       [ "boots_rubber", 20 ],
       [ "recipe_medicalmut", 2 ],
-      [ "canister_goo", 8 ],
-      [ "canister_goo", 8 ],
       [ "recipe_labchem", 2 ],
       [ "recipe_creepy", 2 ],
       [ "recipe_animal", 1 ],

data/json/items/melee/swords_and_blades.json

@@ -897,24 +897,9 @@
     "faults": [ { "fault_group": "handle_short" }, { "fault_group": "blade_general", "weight_mult": 4 } ],
     "melee_damage": { "cut": 21 }
   },
-  {
-    "id": "survivor_machete",
-    "copy-from": "machete",
-    "type": "ITEM",
-    "subtypes": [ "TOOL" ],
-    "name": { "str": "combat machete" },
-    "description": "This common gardening tool has been customized and rebalanced to improve its performance as a weapon.",
-    "extend": { "techniques": [ "RAPID" ] },
-    "relative": {
-      "melee_damage": { "bash": 1, "cut": 2 },
-      "qualities": [ [ "BUTCHER", -5 ] ],
-      "price_postapoc": "10 USD",
-      "weight": "27 g"
-    }
-  },
   {
     "id": "survivor_machete_qt",
-    "copy-from": "survivor_machete",
+    "copy-from": "machete",
     "type": "ITEM",
     "subtypes": [ "TOOL" ],
     "name": { "str": "tempered steel combat machete" },
@@ -937,10 +922,11 @@
         "append": false
       }
     ],
-    "looks_like": "survivor_machete",
+    "extend": { "techniques": [ "RAPID" ] },
+    "looks_like": "machete",
     "replace_materials": { "steel": "qt_steel", "wood": "kevlar" },
     "proportional": { "price_postapoc": 1.15, "price": 1.15 },
-    "relative": { "melee_damage": { "cut": 5 }, "qualities": [ [ "BUTCHER", 4 ] ], "price_postapoc": "20 USD" }
+    "relative": { "melee_damage": { "cut": 7 }, "qualities": [ [ "BUTCHER", 4 ] ], "price_postapoc": "20 USD" }
   },
   {
     "id": "machete_gimmick",

data/json/items/tool/science.json

@@ -16,26 +16,6 @@
     "use_action": [ "WEATHER_TOOL" ],
     "flags": [ "BAROMETER" ]
   },
-  {
-    "id": "canister_goo",
-    "type": "ITEM",
-    "subtypes": [ "TOOL" ],
-    "name": { "str": "goo canister" },
-    "description": "A metal canister with a label reading: \"Warning: contains highly toxic and corrosive materials.  Contents may be sentient.  Open at your own risk.\" You think you can feel something moving inside it.",
-    "weight": "1596 g",
-    "volume": "270 ml",
-    "price": "350 USD",
-    "price_postapoc": "10 USD",
-    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
-    "material": [ "steel" ],
-    "symbol": ";",
-    "color": "dark_gray",
-    "initial_charges": 1,
-    "max_charges": 1,
-    "charges_per_use": 1,
-    "use_action": [ "CAN_GOO" ],
-    "melee_damage": { "bash": 2 }
-  },
   {
     "id": "chemistry_set",
     "//": "To Do: Create a bunsen burner that uses a mix of electricity and LPG, then convert this to use that.  Will need multimag",
@@ -773,36 +753,6 @@
     "use_action": [ "TELEPORT" ],
     "melee_damage": { "bash": 2 }
   },
-  {
-    "id": "weather_reader",
-    "type": "ITEM",
-    "subtypes": [ "TOOL" ],
-    "category": "tools",
-    "name": { "str": "Doppler Radar Turbo 2000" },
-    "description": "A briefcase with a built-in laptop that looks like it's from the 80s.  Its vintage monochrome monitor displays a plethora of meteorological data.  No sign of the FLDSMDFR, however.",
-    "weight": "1 kg",
-    "volume": "2500 ml",
-    "price": "2 USD",
-    "price_postapoc": "5 USD",
-    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
-    "material": [ "plastic", "aluminum" ],
-    "symbol": ";",
-    "color": "light_gray",
-    "charges_per_use": 5,
-    "use_action": [ "WEATHER_TOOL" ],
-    "flags": [ "THERMOMETER", "HYGROMETER", "BAROMETER", "WATER_BREAK", "ELECTRONIC" ],
-    "faults": [ { "fault_group": "electronic_general" } ],
-    "pocket_data": [
-      {
-        "pocket_type": "MAGAZINE_WELL",
-        "rigid": true,
-        "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_battery_cell"
-      }
-    ],
-    "melee_damage": { "bash": 2 },
-    "tool_ammo": [ "battery" ]
-  },
   {
     "id": "analytical_set_basic",
     "type": "ITEM",

data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json

@@ -228,8 +228,7 @@
       "place_loot": [
         { "item": "record_patient", "x": 2, "y": [ 1, 3 ], "chance": 100 },
         { "item": "decoy_elfa", "x": 1, "y": 3, "chance": 100 },
-        { "item": "wrench", "x": 1, "y": 3, "chance": 100 },
-        { "item": "canister_goo", "x": [ 1, 3 ], "y": [ 1, 3 ], "chance": 100 }
+        { "item": "wrench", "x": 1, "y": 3, "chance": 100 }
       ]
     }
   },

data/json/mapgen/map_extras/toxic_waste.json

@@ -9,7 +9,6 @@
       { "prob": 2, "group": "veggy_tainted_55gal_drum_3_50" },
       { "group": "toxic_waste_mx_chems", "prob": 35 },
       { "item": "55gal_drum", "prob": 50 },
-      { "item": "canister_goo", "prob": 5 },
       { "item": "slime_scrap", "prob": 10 }
     ]
   },

data/json/npcs/Kindred/NPC_Darren_Cooper.json

@@ -62,7 +62,7 @@
     "type": "item_group",
     "id": "KINDRED_COOPER_wield",
     "subtype": "collection",
-    "entries": [ { "item": "survivor_machete" } ]
+    "entries": [ { "item": "machete" } ]
   },
   {
     "type": "item_group",

data/json/npcs/robofac/robofac_ancilla_npcs/NC_ANCILLA_GRUNT.json

@@ -36,7 +36,7 @@
       { "item": "under_armor" },
       { "item": "under_armor_shorts" },
       { "item": "holster" },
-      { "item": "survivor_machete", "container-item": "scabbard" },
+      { "item": "survivor_machete_qt", "container-item": "scabbard" },
       { "item": "gloves_fingerless_mod" }
     ]
   },

data/json/obsoletion_and_migration_0.J/migration_items.json

@@ -254,6 +254,21 @@
     "id": "xs_legguard_lightplate",
     "replace": "armor_lc_leg_guard"
   },
+  {
+    "type": "MIGRATION",
+    "id": "canister_goo",
+    "replace": "canister_empty"
+  },
+  {
+    "type": "MIGRATION",
+    "id": "weather_reader",
+    "replace": "geiger_off"
+  },
+  {
+    "type": "MIGRATION",
+    "id": "survivor_machete",
+    "replace": "machete"
+  },
   {
     "type": "MIGRATION",
     "id": "sewage",

data/json/recipes/nested.json

@@ -8420,7 +8420,7 @@
     "name": "machetes",
     "description": "Recipes for making useful tools able to cut through both brush and zombie limbs.",
     "skill_used": "fabrication",
-    "nested_category_data": [ "machete", "makeshift_machete", "survivor_machete", "survivor_machete_qt" ],
+    "nested_category_data": [ "machete", "makeshift_machete", "survivor_machete_qt" ],
     "difficulty": 1
   },
   {

data/json/recipes/weapon/cutting.json

@@ -2264,22 +2264,6 @@
     "tools": [ [ [ "hotcut_any", 1, "LIST" ] ] ],
     "components": [ [ [ "katana", 1 ], [ "wakizashi", 1 ] ], [ [ "spear_shaft", 1 ] ] ]
   },
-  {
-    "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
-    "result": "survivor_machete",
-    "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_CUTTING",
-    "skill_used": "fabrication",
-    "difficulty": 6,
-    "skills_required": [ "melee", 5 ],
-    "time": "25 m",
-    "autolearn": true,
-    "using": [ [ "soldering_standard", 20 ], [ "glue_strong", 5 ] ],
-    "proficiencies": [ { "proficiency": "prof_metalworking" } ],
-    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "GRIND", "level": 2 } ],
-    "components": [ [ [ "machete", 1 ] ], [ [ "filament_durable", 20, "LIST" ] ], [ [ "leather", 2 ], [ "chunk_rubber", 1 ] ] ]
-  },
   {
     "result": "survivor_machete_qt",
     "type": "recipe",

data/json/requirements/melee.json

@@ -227,7 +227,6 @@
         [ "sword_bayonet", -1 ],
         [ "butterfly_swords", -1 ],
         [ "arisaka_bayonet", -1 ],
-        [ "survivor_machete", -1 ],
         [ "survivor_machete_qt", -1 ]
       ]
     ]