From 5c87f27c97e96c28a70c0618351147fd69d4c63d Mon Sep 17 00:00:00 2001 From: Holli <78005870+Holli-Git@users.noreply.github.com> Date: Wed, 1 Jan 2025 00:13:43 -0700 Subject: [PATCH] Remove a few nonsense recipes (#78863) * Remove a few nonsense recipes * Lint The welding goggles were removed from part of the recipe as they'd be too dark to see through reliably --- data/json/recipes/armor/head.json | 44 +------------ .../recipes/other/parts_construction.json | 19 ------ data/json/recipes/practice/devices.json | 45 ------------- data/json/recipes/recipe_traps.json | 33 ---------- data/json/recipes/tools/tools_electronic.json | 66 ------------------- data/json/recipes/weapon/explosive.json | 22 ------- 6 files changed, 1 insertion(+), 228 deletions(-) diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index d916bb0ce4597..ab74fb8728e02 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -304,42 +304,6 @@ "components": [ [ [ "cordage", 1, "LIST" ] ], [ [ "glass_shard", 1 ], [ "flask_glass", 1 ], [ "test_tube", 2 ], [ "marble", 25 ] ] ], "proficiencies": [ { "proficiency": "prof_glassblowing" }, { "proficiency": "prof_leatherworking_basic" } ] }, - { - "result": "goggles_swim", - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_HEAD", - "skill_used": "fabrication", - "difficulty": 4, - "time": "45 m", - "autolearn": true, - "components": [ - [ [ "goggles_ski", 1 ], [ "goggles_welding", 1 ], [ "glasses_safety", 1 ] ], - [ [ "duct_tape", 120 ], [ "medical_tape", 120 ] ], - [ [ "super_glue", 1 ] ] - ], - "proficiencies": [ { "proficiency": "prof_plasticworking" } ] - }, - { - "result": "goggles_welding", - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_HEAD", - "skill_used": "mechanics", - "difficulty": 2, - "skills_required": [ "fabrication", 1 ], - "time": "1 h", - "autolearn": true, - "book_learn": [ [ "textbook_fabrication", 3 ], [ "welding_book", 3 ] ], - "components": [ - [ [ "goggles_ski", 1 ], [ "goggles_swim", 1 ], [ "glasses_safety", 1 ] ], - [ [ "eclipse_glasses", 1 ], [ "glass_tinted", 3 ] ], - [ [ "duct_tape", 40 ], [ "medical_tape", 40 ] ] - ], - "proficiencies": [ { "proficiency": "prof_plasticworking" } ] - }, { "result": "hat_boonie", "type": "recipe", @@ -2335,13 +2299,7 @@ "using": [ [ "adhesive", 1 ], [ "sewing_aramids", 10 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], "components": [ - [ - [ "goggles_ski", 1 ], - [ "goggles_welding", 1 ], - [ "sunglasses", 1 ], - [ "fancy_sunglasses", 1 ], - [ "fitover_sunglasses", 1 ] - ], + [ [ "goggles_ski", 1 ], [ "sunglasses", 1 ], [ "fancy_sunglasses", 1 ], [ "fitover_sunglasses", 1 ] ], [ [ "polycarbonate_chunk", 4 ], [ "glasses_bal", 2 ] ], [ [ "leather", 3 ] ], [ [ "sheet_kevlar_layered", 2 ] ] diff --git a/data/json/recipes/other/parts_construction.json b/data/json/recipes/other/parts_construction.json index 7458f0fc0657c..fbbb010f4111e 100644 --- a/data/json/recipes/other/parts_construction.json +++ b/data/json/recipes/other/parts_construction.json @@ -553,25 +553,6 @@ "qualities": [ { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "reinforced_glass_pane", 4 ] ] ] }, - { - "type": "recipe", - "activity_level": "ACTIVE_EXERCISE", - "result": "reinforced_glass_pane", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "fabrication", - "difficulty": 2, - "time": "40 m", - "book_learn": [ [ "textbook_fabrication", 3 ], [ "textbook_mechanics", 3 ], [ "welding_book", 5 ] ], - "using": [ [ "welding_standard", 80 ], [ "glue_strong", 250 ] ], - "proficiencies": [ - { "proficiency": "prof_metalworking" }, - { "proficiency": "prof_welding_basic", "skill_penalty": 0.5 }, - { "proficiency": "prof_welding" } - ], - "qualities": [ { "id": "SAW_M", "level": 1 } ], - "components": [ [ [ "glass_sheet", 1 ] ], [ [ "mc_wire", 8 ] ] ] - }, { "type": "recipe", "activity_level": "MODERATE_EXERCISE", diff --git a/data/json/recipes/practice/devices.json b/data/json/recipes/practice/devices.json index 9d9e2c5e7287b..39b93b34a11ff 100644 --- a/data/json/recipes/practice/devices.json +++ b/data/json/recipes/practice/devices.json @@ -36,50 +36,5 @@ "autolearn": [ [ "traps", 3 ] ], "book_learn": [ [ "book_lockpick", 1 ] ], "flags": [ "BLIND_EASY" ] - }, - { - "id": "prac_traps_military", - "type": "practice", - "activity_level": "NO_EXERCISE", - "category": "CC_PRACTICE", - "subcategory": "CSC_PRACTICE_DEVICES", - "name": "military traps", - "description": "Practice setting booby traps safely.", - "skill_used": "traps", - "practice_data": { "min_difficulty": 0, "max_difficulty": 3, "skill_limit": 3 }, - "proficiencies": [ { "proficiency": "prof_traps", "time_multiplier": 1, "skill_penalty": 0 } ], - "time": "1 h", - "using": [ [ "cordage_short", 1 ] ], - "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "clay_canister", 1 ], [ "can_drink", 1 ], [ "can_food", 1 ], [ "canister_empty", 1 ] ] ], - "autolearn": false, - "book_learn": [ [ "manual_traps_mil_basic", 1 ], [ "manual_traps_mil", 1 ] ], - "flags": [ "BLIND_HARD" ] - }, - { - "id": "prac_traps_military_advanced", - "type": "practice", - "activity_level": "NO_EXERCISE", - "category": "CC_PRACTICE", - "subcategory": "CSC_PRACTICE_DEVICES", - "name": "military traps (advanced)", - "description": "Practice setting and disarming booby traps and mines safely.", - "skill_used": "traps", - "practice_data": { "min_difficulty": 3, "max_difficulty": 3, "skill_limit": 6 }, - "proficiencies": [ - { "proficiency": "prof_traps", "time_multiplier": 0.2, "skill_penalty": 0 }, - { "proficiency": "prof_trapsetting", "time_multiplier": 1, "skill_penalty": 0 }, - { "proficiency": "prof_disarming", "time_multiplier": 1, "skill_penalty": 0 } - ], - "time": "1 h", - "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ - [ [ "super_glue", 1 ], [ "duct_tape", 25 ] ], - [ [ "scrap", 3 ], [ "steel_chunk", 1 ], [ "canister_empty", 1 ], [ "clay_canister", 1 ], [ "can_food", 1 ] ], - [ [ "bb", 60 ], [ "nails", 30, "LIST" ] ] - ], - "autolearn": false, - "book_learn": [ [ "manual_traps_mil", 3 ] ], - "flags": [ "BLIND_HARD" ] } ] diff --git a/data/json/recipes/recipe_traps.json b/data/json/recipes/recipe_traps.json index d9b0387d4ce70..22cbfc99d8fe7 100644 --- a/data/json/recipes/recipe_traps.json +++ b/data/json/recipes/recipe_traps.json @@ -212,38 +212,5 @@ "qualities": [ { "id": "CUT", "level": 2 } ], "proficiencies": [ { "proficiency": "prof_traps" }, { "proficiency": "prof_trapsetting" } ], "components": [ [ [ "grenade", 1 ] ], [ [ "clay_canister", 1 ], [ "can_drink", 1 ], [ "can_food", 1 ], [ "canister_empty", 1 ] ] ] - }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "landmine", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_TRAPS", - "skill_used": "traps", - "skills_required": [ "mechanics", 3 ], - "difficulty": 5, - "time": "30 m", - "reversible": true, - "book_learn": [ [ "manual_traps_mil", 5 ] ], - "qualities": [ { "id": "SCREW", "level": 1 } ], - "proficiencies": [ { "proficiency": "prof_traps" }, { "proficiency": "prof_trapsetting" } ], - "components": [ - [ [ "super_glue", 150 ], [ "duct_tape", 75 ] ], - [ [ "scrap", 3 ], [ "steel_chunk", 1 ], [ "canister_empty", 1 ], [ "clay_canister", 1 ], [ "can_food", 1 ] ], - [ [ "bb", 200 ], [ "nails", 100, "LIST" ] ], - [ - [ "gunpowder", 720 ], - [ "chem_black_powder", 720 ], - [ "shot_bird", 24 ], - [ "shot_00", 12 ], - [ "shot_slug", 12 ], - [ "shot_flechette", 12 ], - [ "shot_he", 3 ], - [ "gasoline", 600 ], - [ "diesel", 600 ], - [ "biodiesel", 600 ], - [ "grenade", 1 ] - ] - ] } ] diff --git a/data/json/recipes/tools/tools_electronic.json b/data/json/recipes/tools/tools_electronic.json index 7f241ba9a6575..6ad3a014e9b00 100644 --- a/data/json/recipes/tools/tools_electronic.json +++ b/data/json/recipes/tools/tools_electronic.json @@ -207,34 +207,6 @@ [ [ "cable", 10 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "portable_game", - "category": "CC_ELECTRONIC", - "subcategory": "CSC_ELECTRONIC_TOOLS", - "skill_used": "electronics", - "skills_required": [ "computer", 5 ], - "difficulty": 8, - "time": "1 h", - "book_learn": [ [ "textbook_electronics", 7 ], [ "textbook_robots", 6 ] ], - "using": [ [ "soldering_standard", 10 ], [ "glue_any", 1 ] ], - "qualities": [ { "id": "SCREW", "level": 1 } ], - "proficiencies": [ - { "proficiency": "prof_plasticworking", "time_multiplier": 1.5 }, - { "proficiency": "prof_elec_circuits" }, - { "proficiency": "prof_elec_soldering" }, - { "proficiency": "prof_elec_integrated_circuits" } - ], - "components": [ - [ [ "processor", 1 ] ], - [ [ "RAM", 2 ] ], - [ [ "amplifier", 1 ] ], - [ [ "cable", 2 ] ], - [ [ "plastic_chunk", 2 ] ], - [ [ "small_lcd_screen", 1 ] ] - ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -497,44 +469,6 @@ [ [ "cable", 15 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "geiger_off", - "category": "CC_ELECTRONIC", - "subcategory": "CSC_ELECTRONIC_TOOLS", - "skill_used": "electronics", - "difficulty": 5, - "time": "35 m", - "reversible": true, - "decomp_learn": 5, - "book_learn": [ [ "advanced_electronics", 4 ], [ "textbook_electronics", 4 ], [ "atomic_survival", 3 ] ], - "using": [ [ "soldering_standard", 14 ] ], - "proficiencies": [ { "proficiency": "prof_elec_soldering" }, { "proficiency": "prof_elec_semiconductors" } ], - "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "power_supply", 1 ] ], [ [ "amplifier", 2 ] ], [ [ "scrap_aluminum", 6 ] ], [ [ "cable", 10 ] ] ] - }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "rad_monitor", - "category": "CC_ELECTRONIC", - "subcategory": "CSC_ELECTRONIC_TOOLS", - "skill_used": "electronics", - "difficulty": 7, - "time": "35 m", - "reversible": true, - "decomp_learn": 7, - "book_learn": [ [ "advanced_electronics", 6 ], [ "textbook_electronics", 6 ], [ "atomic_survival", 5 ] ], - "proficiencies": [ - { "proficiency": "prof_plasticworking", "time_multiplier": 1.5 }, - { "proficiency": "prof_elec_soldering" }, - { "proficiency": "prof_elec_semiconductors" } - ], - "using": [ [ "soldering_standard", 14 ] ], - "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "processor", 1 ] ], [ [ "e_scrap", 1 ] ], [ [ "amplifier", 1 ] ], [ [ "plastic_chunk", 1 ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", diff --git a/data/json/recipes/weapon/explosive.json b/data/json/recipes/weapon/explosive.json index 23e82c640a95d..b7c49f44308fe 100644 --- a/data/json/recipes/weapon/explosive.json +++ b/data/json/recipes/weapon/explosive.json @@ -83,28 +83,6 @@ "qualities": [ { "id": "CUT", "level": 2 } ], "components": [ [ [ "firecracker", 25 ] ], [ [ "paper", 5 ] ], [ [ "cordage_short", 1, "LIST" ] ] ] }, - { - "result": "flashbang", - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_EXPLOSIVE", - "skill_used": "fabrication", - "skills_required": [ "chemistry", 5 ], - "difficulty": 6, - "time": "40 m", - "reversible": true, - "book_learn": [ [ "recipe_labchem", 5 ], [ "textbook_anarch", 7 ] ], - "proficiencies": [ { "proficiency": "prof_intro_chemistry" } ], - "qualities": [ { "id": "SCREW", "level": 1 } ], - "using": [ [ "small_grenade_case", 1 ] ], - "components": [ - [ [ "pilot_light", 1 ] ], - [ [ "super_glue", 4 ], [ "duct_tape", 10 ], [ "cordage", 1, "LIST" ] ], - [ [ "oxy_powder", 75 ] ], - [ [ "incendiary", 50 ] ] - ] - }, { "result": "gasbomb_makeshift", "type": "recipe",