From 717e695188fedda09991589847042de90ae3c522 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 11 Sep 2021 10:12:22 -0500 Subject: [PATCH] Obsoletion fixes (#51483) * Update obsolete.json * Fixes * Update recipes.json * Update item_groups.json * lint --- .../Aftershock/itemgroups/item_groups.json | 8 ---- data/mods/Aftershock/items/obsolete.json | 43 +------------------ data/mods/Aftershock/player/professions.json | 10 +---- .../Aftershock/recipes/bionic_recipes.json | 24 ----------- data/mods/Aftershock/recipes/recipes.json | 39 ----------------- .../vehicleparts/blaze_turrets_vanilla.json | 9 ---- .../CRT_EXPANSION/scenarios/crt_classes.json | 7 ++- .../blacklists/item_blacklist.json | 2 - 8 files changed, 6 insertions(+), 136 deletions(-) diff --git a/data/mods/Aftershock/itemgroups/item_groups.json b/data/mods/Aftershock/itemgroups/item_groups.json index 4fd117f6cb906..6cbb8c6dbaf99 100644 --- a/data/mods/Aftershock/itemgroups/item_groups.json +++ b/data/mods/Aftershock/itemgroups/item_groups.json @@ -8,7 +8,6 @@ [ "v29", 7 ], [ "afs_hydraulic_gauntlet", 3 ], [ "afs_energy_saber_off", 3 ], - [ "ftk93", 5 ], [ "afs_hardlight_longbow", 2 ], [ "grenade_cryo", 12 ], [ "afs_freeze_gauntlet", 5 ] @@ -49,8 +48,6 @@ "items": [ [ "afs_bag_of_holding", 1 ], [ "afs_atomic_smartphone", 5 ], - [ "laser_pack", 10 ], - [ "ftk93", 5 ], [ "iv_mutagen_mastodon", 5 ], [ "mutagen_mastodon", 10 ], [ "recipe_uplift", 2 ], @@ -156,11 +153,6 @@ "type": "item_group", "items": [ [ "textbook_atomic", 8 ] ] }, - { - "id": "guns_pistol_improvised", - "type": "item_group", - "items": [ [ "v29_cheap", 10 ] ] - }, { "type": "item_group", "id": "afs_gardener_worn", diff --git a/data/mods/Aftershock/items/obsolete.json b/data/mods/Aftershock/items/obsolete.json index 8f1405c1065c8..fdb9f62c2bfde 100644 --- a/data/mods/Aftershock/items/obsolete.json +++ b/data/mods/Aftershock/items/obsolete.json @@ -305,7 +305,7 @@ "need_charges_msg": "The helmet's batteries are dead." }, "flags": [ "WATERPROOF", "FLASH_PROTECTION", "ONLY_ONE", "STURDY" ], - "looks_like": "depowered_helmet", + "looks_like": "afs_hev_helmet_on", "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", @@ -335,46 +335,7 @@ "turns_per_charge": 20, "use_action": { "menu_text": "Turn off", "type": "transform", "msg": "The %s flicks off.", "target": "afs_hev_helmet" }, "flags": [ "LIGHT_500", "WATERPROOF", "FLASH_PROTECTION", "ONLY_ONE", "STURDY" ], - "looks_like": "depowered_helmet" - }, - { - "id": "afs_survivor_belt", - "copy-from": "survivor_belt", - "type": "ARMOR", - "name": { "str": "survivor utility belt (holster)", "str_pl": "survivor utility belts (holster)" }, - "description": "A custom-built leather utility belt covered with straps and pouches containing many useful hand tools and a clip for holding various equipment. Durable and carefully crafted to be comfortable to wear. Activate to clip something to it.", - "use_action": { "type": "holster", "holster_prompt": "Attach what to belt loop?", "holster_msg": "You clip your %s to your %s" } - }, - { - "id": "survivor_belt", - "copy-from": "survivor_belt", - "type": "ARMOR", - "name": { "str": "survivor utility belt (sheath)", "str_pl": "survivor utility belts (sheath)" } - }, - { - "id": "afs_mbr_titanium", - "type": "ARMOR", - "category": "armor", - "name": { "str": "MBR vest (titanium)", "str_pl": "MBR vests (titanium)" }, - "description": "A Modular Bullet Resistant Vest. Titanium scraps have been inserted to improve its protection. It has four pouches capable of carrying magazines.", - "weight": "3108 g", - "volume": "6 L", - "price": 110000, - "to_hit": -3, - "bashing": 6, - "material": [ "kevlar", "titanium" ], - "symbol": "[", - "looks_like": "kevlar", - "color": "light_gray", - "pocket_data": [ - { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 }, - { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 } - ], - "warmth": 15, - "material_thickness": 3, - "use_action": { "type": "holster", "holster_prompt": "Stash ammo", "holster_msg": "You stash your %s." }, - "flags": [ "STURDY", "OUTER" ], - "armor": [ { "encumbrance": [ 3, 7 ], "coverage": 85, "covers": [ "torso" ] } ] + "looks_like": "afs_hev_helmet" }, { "id": "afs_sunesthesia", diff --git a/data/mods/Aftershock/player/professions.json b/data/mods/Aftershock/player/professions.json index 1e9b92dc39f9d..dad0319061d48 100644 --- a/data/mods/Aftershock/player/professions.json +++ b/data/mods/Aftershock/player/professions.json @@ -5,15 +5,7 @@ "name": "Radio Tower Technician", "description": "From your spot at the top of the tower you were working on, you had a good view of the end of the world; of streaks of light falling from the sky, blossoming into mushroom clouds, barely a flicker on the horizon before your optical dampers flicked down. You rushed to safety before the shockwaves could blast you from your perch. The bionic implants included with your contract might come in handy now…", "points": 4, - "CBMs": [ - "bio_weight", - "bio_shock_absorber", - "bn_bio_solar", - "bio_power_storage_mkII", - "bio_flashlight", - "bio_tools", - "bio_sunglasses" - ], + "CBMs": [ "bio_weight", "bn_bio_solar", "bio_power_storage_mkII", "bio_flashlight", "bio_tools", "bio_sunglasses" ], "skills": [ { "level": 4, "name": "electronics" }, { "level": 2, "name": "launcher" } ], "items": { "both": { diff --git a/data/mods/Aftershock/recipes/bionic_recipes.json b/data/mods/Aftershock/recipes/bionic_recipes.json index b1d585037b51f..590a57f7fadc4 100644 --- a/data/mods/Aftershock/recipes/bionic_recipes.json +++ b/data/mods/Aftershock/recipes/bionic_recipes.json @@ -248,30 +248,6 @@ [ [ "burnt_out_bionic", 1 ] ] ] }, - { - "type": "recipe", - "activity_level": "fake", - "result": "bio_shock_absorber", - "category": "CC_ELECTRONIC", - "subcategory": "CSC_ELECTRONIC_CBMS", - "skill_used": "electronics", - "skills_required": [ "firstaid", 5 ], - "difficulty": 7, - "time": "6 h", - "reversible": true, - "decomp_learn": 7, - "book_learn": [ [ "recipe_lab_elec", 5 ], [ "recipe_augs", 5 ] ], - "using": [ [ "soldering_standard", 400 ] ], - "qualities": [ { "id": "BIONIC_ASSEMBLY", "level": 2 } ], - "components": [ - [ [ "afs_biomaterial_4", 6 ] ], - [ [ "afs_material_3", 12 ] ], - [ [ "afs_material_2", 2 ] ], - [ [ "afs_circuitry_2", 2 ] ], - [ [ "afs_neural_io_2", 2 ] ], - [ [ "burnt_out_bionic", 1 ] ] - ] - }, { "type": "recipe", "activity_level": "fake", diff --git a/data/mods/Aftershock/recipes/recipes.json b/data/mods/Aftershock/recipes/recipes.json index 176f173c53571..daf14bdfd2a1f 100644 --- a/data/mods/Aftershock/recipes/recipes.json +++ b/data/mods/Aftershock/recipes/recipes.json @@ -88,29 +88,6 @@ "components": [ [ [ "afs_power_cutter", 1 ] ], [ [ "steel_chunk", 3 ], [ "scrap", 6 ] ] ], "byproducts": [ [ "plastic_chunk" ], [ "plastic_chunk" ] ] }, - { - "type": "recipe", - "activity_level": "fake", - "result": "afs_survivor_belt", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_OTHER", - "skill_used": "fabrication", - "time": 1000, - "autolearn": true, - "components": [ [ [ "survivor_belt", 1 ] ] ] - }, - { - "type": "recipe", - "activity_level": "fake", - "result": "survivor_belt", - "id_suffix": "form_afs", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_OTHER", - "skill_used": "fabrication", - "time": 1000, - "autolearn": true, - "components": [ [ [ "afs_survivor_belt", 1 ] ] ] - }, { "type": "recipe", "activity_level": "fake", @@ -218,22 +195,6 @@ [ [ "can_drink", 5 ], [ "can_food", 5 ], [ "canister_empty", 5 ] ] ] }, - { - "type": "recipe", - "activity_level": "fake", - "result": "reloaded_laser_pack", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_OTHER", - "skill_used": "fabrication", - "skills_required": [ "electronics", 5 ], - "difficulty": 3, - "time": "10 m", - "reversible": true, - "decomp_learn": 4, - "book_learn": [ [ "recipe_lab_elec", 4 ] ], - "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "superglue", 1 ] ], [ [ "plut_cell", 1 ] ] ] - }, { "type": "recipe", "activity_level": "fake", diff --git a/data/mods/BlazeIndustries/vehicleparts/blaze_turrets_vanilla.json b/data/mods/BlazeIndustries/vehicleparts/blaze_turrets_vanilla.json index d60d9cf8b1c25..1e45b9fc4840d 100644 --- a/data/mods/BlazeIndustries/vehicleparts/blaze_turrets_vanilla.json +++ b/data/mods/BlazeIndustries/vehicleparts/blaze_turrets_vanilla.json @@ -44,15 +44,6 @@ "breaks_into": [ { "item": "american_180", "prob": 50 } ], "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ] }, "removal": { "skills": [ [ "mechanics", 1 ] ] } } }, - { - "id": "mounted_an94", - "copy-from": "turret", - "type": "vehicle_part", - "name": { "str": "mounted AN94" }, - "item": "an94", - "breaks_into": [ { "item": "an94", "prob": 50 } ], - "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ] }, "removal": { "skills": [ [ "mechanics", 1 ] ] } } - }, { "id": "mounted_ar15", "copy-from": "turret", diff --git a/data/mods/CRT_EXPANSION/scenarios/crt_classes.json b/data/mods/CRT_EXPANSION/scenarios/crt_classes.json index 496132eee507b..8107a648ea1e3 100644 --- a/data/mods/CRT_EXPANSION/scenarios/crt_classes.json +++ b/data/mods/CRT_EXPANSION/scenarios/crt_classes.json @@ -82,7 +82,7 @@ "ammo": 100, "items": [ "beret", - "modularvestkevlar", + "kevlar", "jacket_army", "army_top", "legguard_hard", @@ -120,7 +120,7 @@ "both": { "ammo": 100, "items": [ - "modularvestkevlar", + "kevlar", "crt_chestrig", "crt_pants", "legguard_hard", @@ -211,7 +211,7 @@ "crt_helmet_liner", "glasses_bal", "balclava", - "modularvestkevlar", + "kevlar", "jacket_army", "army_top", "crt_armguard", @@ -646,7 +646,6 @@ "ds_pulse_rifle", "ds_rivet_gun", "ds_ripper", - "toolbox", "lighter", "UPS_off", "id_military", diff --git a/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json b/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json index 1a1e196e542a3..2dcfd01d3c861 100644 --- a/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json +++ b/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json @@ -111,7 +111,6 @@ "bio_scent_mask", "bio_scent_vision", "bio_shock", - "bio_shock_absorber", "bio_shockwave", "bio_shotgun", "bio_soporific", @@ -141,7 +140,6 @@ "depowered_helmet", "emp_gun", "fetus", - "ftk93", "heavy_atomic_battery_cell", "hk_g80", "huge_atomic_battery_cell",