From df98b40dd0e470c9e96d8db283965352b960aea8 Mon Sep 17 00:00:00 2001 From: Holli Date: Fri, 14 Nov 2025 12:25:27 -0700 Subject: [PATCH 1/3] Remove a few items --- .../itemgroups/Clothing_Gear/clothing.json | 1 - .../monster_drops_lairs.json | 3 +- .../Weapons_Mods_Ammo/melee_weapons.json | 1 - data/json/itemgroups/science_and_tech.json | 3 -- data/json/items/melee/swords_and_blades.json | 22 ++------ data/json/items/tool/science.json | 50 ------------------- .../lab_nested_maintenance.json | 3 +- data/json/mapgen/map_extras/toxic_waste.json | 1 - data/json/npcs/Kindred/NPC_Darren_Cooper.json | 2 +- .../NC_ANCILLA_GRUNT.json | 2 +- .../migration_items.json | 15 ++++++ data/json/recipes/nested.json | 2 +- data/json/recipes/weapon/cutting.json | 16 ------ data/json/requirements/melee.json | 1 - 14 files changed, 24 insertions(+), 98 deletions(-) diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index 842e23ccb1316..6607d3cfdc7ab 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/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 ], diff --git a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json index a3634ffb76a97..9b3957440bcf8 100644 --- a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json +++ b/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 } ] }, { diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/melee_weapons.json b/data/json/itemgroups/Weapons_Mods_Ammo/melee_weapons.json index 4eff5630440b4..2e548439a936f 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/melee_weapons.json +++ b/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 }, diff --git a/data/json/itemgroups/science_and_tech.json b/data/json/itemgroups/science_and_tech.json index 1526fc46e6266..291b5786bfe12 100644 --- a/data/json/itemgroups/science_and_tech.json +++ b/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 ], diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index b6581b9602c39..461b080d77c27 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/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", diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index fe3e9c67911d3..eb08f7840806c 100644 --- a/data/json/items/tool/science.json +++ b/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", diff --git a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json index ff34d0f1b6365..c27f69fbef406 100644 --- a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json +++ b/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 } ] } }, diff --git a/data/json/mapgen/map_extras/toxic_waste.json b/data/json/mapgen/map_extras/toxic_waste.json index 71c369a7cee3f..80ee8db82b342 100644 --- a/data/json/mapgen/map_extras/toxic_waste.json +++ b/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 } ] }, diff --git a/data/json/npcs/Kindred/NPC_Darren_Cooper.json b/data/json/npcs/Kindred/NPC_Darren_Cooper.json index da8d2f7ea5a66..06892fbf27f83 100644 --- a/data/json/npcs/Kindred/NPC_Darren_Cooper.json +++ b/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", diff --git a/data/json/npcs/robofac/robofac_ancilla_npcs/NC_ANCILLA_GRUNT.json b/data/json/npcs/robofac/robofac_ancilla_npcs/NC_ANCILLA_GRUNT.json index 2cc2f89a1c4c5..f1e6a2adec3c7 100644 --- a/data/json/npcs/robofac/robofac_ancilla_npcs/NC_ANCILLA_GRUNT.json +++ b/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" } ] }, diff --git a/data/json/obsoletion_and_migration_0.J/migration_items.json b/data/json/obsoletion_and_migration_0.J/migration_items.json index 3870254bbb257..53c3336cbaa8e 100644 --- a/data/json/obsoletion_and_migration_0.J/migration_items.json +++ b/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", diff --git a/data/json/recipes/nested.json b/data/json/recipes/nested.json index ec843a78e4660..6087d4f281de7 100644 --- a/data/json/recipes/nested.json +++ b/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 }, { diff --git a/data/json/recipes/weapon/cutting.json b/data/json/recipes/weapon/cutting.json index 299b6406f5b2d..b9ab821031a54 100644 --- a/data/json/recipes/weapon/cutting.json +++ b/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", diff --git a/data/json/requirements/melee.json b/data/json/requirements/melee.json index 61ea58a906744..a0626bfe27803 100644 --- a/data/json/requirements/melee.json +++ b/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 ] ] ] From 447ec4fac3b2663374af4c1dad7904b5f7572ab4 Mon Sep 17 00:00:00 2001 From: Holli Date: Sat, 15 Nov 2025 12:43:03 -0700 Subject: [PATCH 2/3] change chete descriptions --- data/json/items/melee/swords_and_blades.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 461b080d77c27..63bcbd5cb929d 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -903,12 +903,12 @@ "type": "ITEM", "subtypes": [ "TOOL" ], "name": { "str": "tempered steel combat machete" }, - "description": "This common gardening tool has been customized, rebalanced and tempered to dramatically improve its performance as a weapon.", + "description": "This common gardening tool has been tempered to dramatically improve its performance as a weapon.", "variants": [ { "id": "survivor_machete_qt_standard", "name": { "str": "tempered steel combat machete" }, - "description": "This common gardening tool has been customized, rebalanced and tempered to dramatically improve its performance as a weapon.", + "description": "This common gardening tool has been tempered to dramatically improve its performance as a weapon.", "color": "dark_gray", "weight": 1, "append": false @@ -916,7 +916,7 @@ { "id": "xedra_machete", "name": { "str": "hazardous environment blade" }, - "description": "This black tempered steel bushcraft machete has been reinforced for use in exotic environments. \"HE Blade\" is engraved in the steel.", + "description": "This black tempered steel bushcraft machete has been designed for use in exotic environments. \"HE Blade\" is engraved in the steel.", "color": "dark_gray", "weight": 0, "append": false From 219ca145f85e03f2351dc88bdf03cc82b23b35df Mon Sep 17 00:00:00 2001 From: Holli Date: Sat, 15 Nov 2025 14:19:24 -0700 Subject: [PATCH 3/3] Readd the goop --- data/json/itemgroups/science_and_tech.json | 2 ++ data/json/items/tool/science.json | 20 +++++++++++++++++++ .../lab_nested_maintenance.json | 3 ++- .../migration_items.json | 5 ----- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/data/json/itemgroups/science_and_tech.json b/data/json/itemgroups/science_and_tech.json index 291b5786bfe12..2cd3ad9dfe005 100644 --- a/data/json/itemgroups/science_and_tech.json +++ b/data/json/itemgroups/science_and_tech.json @@ -73,6 +73,7 @@ { "item": "rad_monitor", "prob": 2, "charges": [ 0, 50 ] }, [ "teleporter", 10 ], [ "RTG_coffee", 2 ], + [ "canister_goo", 8 ], [ "EMPbomb", 2 ], [ "flux_comp_gen", 3 ], [ "portal", 2 ], @@ -478,6 +479,7 @@ { "item": "lighter", "prob": 60, "charges": [ 0, 100 ] }, [ "boots_rubber", 20 ], [ "recipe_medicalmut", 2 ], + [ "canister_goo", 16 ], [ "recipe_labchem", 2 ], [ "recipe_creepy", 2 ], [ "recipe_animal", 1 ], diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index eb08f7840806c..cd3cdb15f4eba 100644 --- a/data/json/items/tool/science.json +++ b/data/json/items/tool/science.json @@ -16,6 +16,26 @@ "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", diff --git a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json index c27f69fbef406..ff34d0f1b6365 100644 --- a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json +++ b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json @@ -228,7 +228,8 @@ "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": "wrench", "x": 1, "y": 3, "chance": 100 }, + { "item": "canister_goo", "x": [ 1, 3 ], "y": [ 1, 3 ], "chance": 100 } ] } }, diff --git a/data/json/obsoletion_and_migration_0.J/migration_items.json b/data/json/obsoletion_and_migration_0.J/migration_items.json index 53c3336cbaa8e..9d661623d9c06 100644 --- a/data/json/obsoletion_and_migration_0.J/migration_items.json +++ b/data/json/obsoletion_and_migration_0.J/migration_items.json @@ -254,11 +254,6 @@ "id": "xs_legguard_lightplate", "replace": "armor_lc_leg_guard" }, - { - "type": "MIGRATION", - "id": "canister_goo", - "replace": "canister_empty" - }, { "type": "MIGRATION", "id": "weather_reader",