From abbb6ce0fe3b61c4c49c2d1fa168eaf9be3f5b90 Mon Sep 17 00:00:00 2001 From: Xygen Date: Wed, 18 Sep 2024 14:15:55 +0900 Subject: [PATCH] Obsolete and migrate legacy wire (#76204) * pull the trigger * migration * Edits 1 * edits 2 * chainmail * Lint * Piano wire migration * remove scrap wire recipe * charges to wire, fix camp recipe * recipe/uncraft consistency * restore camp crafting * lint * Update data/json/items/generic.json --------- Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/construction/embrasures.json | 2 +- data/json/construction/floors_indoors.json | 10 ++- .../json/construction/furniture_terrains.json | 4 +- data/json/construction/furniture_tools.json | 4 +- data/json/construction/manufactured.json | 2 +- data/json/construction/walls.json | 4 +- .../LIXA_furniture_and_terrain.json | 2 +- .../furniture-alien.json | 2 +- .../furniture-appliances.json | 4 +- .../furniture-decorative.json | 8 +- .../furniture-industrial.json | 44 +++++++--- .../furniture-recreation.json | 4 +- .../furniture_and_terrain/furniture-roof.json | 2 +- .../furniture-terrains.json | 2 +- .../furniture_and_terrain/terrain-doors.json | 8 +- .../terrain-fences-gates.json | 18 ++-- .../terrain-manufactured.json | 2 +- .../furniture_and_terrain/terrain-walls.json | 6 +- .../terrain_vitrified.json | 20 ++--- .../Locations_MapExtras/locations.json | 15 +++- .../locations_commercial.json | 8 +- .../Locations_MapExtras/mall_item_groups.json | 2 +- data/json/itemgroups/SUS/alien.json | 5 +- data/json/itemgroups/activities_hobbies.json | 4 +- data/json/itemgroups/supplies.json | 11 ++- data/json/itemgroups/tools.json | 2 +- data/json/itemgroups/trash_and_debris.json | 6 +- data/json/items/chemicals_and_resources.json | 2 +- data/json/items/generic.json | 8 +- data/json/items/tool/science.json | 2 +- data/json/mapgen/nested/basement_nested.json | 12 +-- data/json/npcs/NC_JUNK_SHOPKEEP.json | 2 +- data/json/npcs/godco/godco_missions.json | 8 +- data/json/npcs/holdouts/Mr_Lapin.json | 2 +- .../isherwood_farm/NPC_Jack_Isherwood.json | 2 +- .../surface_refugees/NPC_Draco_Dune.json | 2 +- .../migration_items.json | 20 +++++ data/json/recipes/ammo/weldgas.json | 2 +- data/json/recipes/armor/arms.json | 60 ++++++------- data/json/recipes/armor/feet.json | 20 ++--- data/json/recipes/armor/hands.json | 40 ++++----- data/json/recipes/armor/head.json | 2 +- data/json/recipes/armor/jewelry.json | 8 +- data/json/recipes/armor/legs.json | 6 +- data/json/recipes/armor/torso.json | 4 +- .../recipe_modular_outpost_cross.json | 2 +- .../recipe_modular_outpost_normal.json | 2 +- .../recipe_modular_radio_tower_common.json | 2 +- .../bare_bones_basecamp_recipe_groups.json | 2 +- .../modular_firestation_recipe_groups.json | 3 +- .../recipe_modular_field_common.json | 2 +- .../recipe_modular_field_common.json | 2 +- .../modular_workshop_recipe_groups.json | 6 +- .../json/recipes/basecamps/recipe_groups.json | 6 +- data/json/recipes/nested.json | 2 +- data/json/recipes/other/materials.json | 2 +- data/json/recipes/other/parts.json | 6 +- .../recipes/other/parts_construction.json | 2 +- data/json/recipes/other/vehicle.json | 6 +- data/json/recipes/recipe_companion.json | 2 +- .../recipes/recipe_music_instruments.json | 6 +- data/json/recipes/recipe_others.json | 88 ++----------------- data/json/recipes/recipe_traps.json | 2 +- data/json/recipes/recipe_vehicle.json | 20 ++--- data/json/recipes/tools/containers.json | 2 +- data/json/recipes/tools/lights.json | 6 +- data/json/recipes/tools/tool.json | 28 ++---- data/json/recipes/tools/tools_electronic.json | 4 +- data/json/recipes/weapon/ranged.json | 14 +-- data/json/requirements/materials.json | 8 +- data/json/requirements/tailoring.json | 8 -- data/json/uncraft/appliances/oven.json | 2 +- data/json/uncraft/armor.json | 2 +- data/json/uncraft/generic.json | 8 +- data/json/uncraft/recipe_deconstruction.json | 20 ++--- data/json/uncraft/tools.json | 14 +-- data/json/vehicleparts/vehicle_parts.json | 3 +- data/json/vehicleparts/windshields.json | 2 +- 78 files changed, 320 insertions(+), 367 deletions(-) diff --git a/data/json/construction/embrasures.json b/data/json/construction/embrasures.json index 5a5b939c6c50d..10fcdb37925c9 100644 --- a/data/json/construction/embrasures.json +++ b/data/json/construction/embrasures.json @@ -63,7 +63,7 @@ "components": [ [ [ "log", 3 ] ], [ - [ "wire", 6 ], + [ "lc_wire", 6 ], [ "wire_barbed", 4 ], [ "rope_6", 2 ], [ "rope_natural_short", 2, "LIST" ], diff --git a/data/json/construction/floors_indoors.json b/data/json/construction/floors_indoors.json index 5a51ffd278438..ee1412c5414e7 100644 --- a/data/json/construction/floors_indoors.json +++ b/data/json/construction/floors_indoors.json @@ -565,7 +565,7 @@ [ { "id": "DRILL", "level": 1 } ] ], "components": [ - [ [ "wire", 16 ], [ "spike", 16 ], [ "nails", 32, "LIST" ] ], + [ [ "lc_wire", 16 ], [ "spike", 16 ], [ "nails", 32, "LIST" ] ], [ [ "sheet_metal_small", 20 ], [ "scrap", 40 ] ], [ [ "sheet_metal", 4 ], @@ -629,7 +629,13 @@ "qualities": [ [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "log", 3 ] ], - [ [ "wire", 6 ], [ "wire_barbed", 4 ], [ "rope_natural_short", 2, "LIST" ], [ "chain", 1 ], [ "vine_30", 1 ] ] + [ + [ "lc_wire", 6 ], + [ "wire_barbed", 4 ], + [ "rope_natural_short", 2, "LIST" ], + [ "chain", 1 ], + [ "vine_30", 1 ] + ] ], "pre_terrain": "t_pit", "post_terrain": "t_palisade" diff --git a/data/json/construction/furniture_terrains.json b/data/json/construction/furniture_terrains.json index d340b31d45871..abf00642b7efb 100644 --- a/data/json/construction/furniture_terrains.json +++ b/data/json/construction/furniture_terrains.json @@ -564,7 +564,7 @@ [ { "id": "DRILL", "level": 1 } ] ], "components": [ - [ [ "wire", 16 ], [ "spike", 16 ], [ "nails", 32, "LIST" ] ], + [ [ "lc_wire", 16 ], [ "spike", 16 ], [ "nails", 32, "LIST" ] ], [ [ "sheet_metal_small", 10 ], [ "scrap", 10 ] ], [ [ "sheet_metal", 2 ], [ "steel_plate", 2 ], [ "frame", 2 ], [ "hdframe", 1 ], [ "xlframe", 4 ] ], [ [ "rebar", 2 ], [ "pipe", 4 ] ] @@ -582,7 +582,7 @@ "qualities": [ [ { "id": "SAW_M", "level": 1 } ] ], "using": [ [ "welding_standard", 400 ], [ "welding_standard", 400 ] ], "components": [ - [ [ "wire", 2 ] ], + [ [ "lc_wire", 2 ] ], [ [ "sheet_metal_small", 10 ], [ "scrap", 10 ] ], [ [ "sheet_metal", 2 ], [ "steel_plate", 2 ], [ "frame", 2 ], [ "hdframe", 1 ], [ "xlframe", 4 ] ], [ [ "rebar", 2 ], [ "pipe", 4 ] ] diff --git a/data/json/construction/furniture_tools.json b/data/json/construction/furniture_tools.json index 2309f07e7181c..fd6cf2b65b362 100644 --- a/data/json/construction/furniture_tools.json +++ b/data/json/construction/furniture_tools.json @@ -90,7 +90,7 @@ "time": "60m", "on_display": false, "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "2x4", 4 ] ], [ [ "tanned_hide", 2 ] ], [ [ "scrap", 20 ] ], [ [ "wire", 8 ] ] ], + "components": [ [ [ "2x4", 4 ] ], [ [ "tanned_hide", 2 ] ], [ [ "scrap", 20 ] ], [ [ "lc_wire", 8 ] ] ], "pre_flags": [ "FLAT" ], "post_terrain": "f_bellows" }, @@ -104,7 +104,7 @@ "qualities": [ [ { "id": "CUT", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ], "components": [ [ [ "stick_long", 6 ] ], - [ [ "rope_natural_short", 1, "LIST" ], [ "cordage", 2, "LIST" ], [ "wire", 8 ] ], + [ [ "rope_natural_short", 1, "LIST" ], [ "cordage", 2, "LIST" ], [ "lc_wire", 8 ] ], [ [ "pointy_stick", 2 ], [ "spike", 2 ] ] ], "pre_note": "Can be deconstructed without tools.", diff --git a/data/json/construction/manufactured.json b/data/json/construction/manufactured.json index 1b89e6e1fbddf..51ceff49baf9d 100644 --- a/data/json/construction/manufactured.json +++ b/data/json/construction/manufactured.json @@ -148,7 +148,7 @@ [ "reinforced_solar_panel_v2", 2 ] ], [ [ "storage_battery", 1 ], [ "medium_storage_battery", 5 ], [ "small_storage_battery", 50 ] ], - [ [ "sheet_metal", 2 ], [ "wire", 8 ] ], + [ [ "sheet_metal", 2 ], [ "lc_wire", 8 ] ], [ [ "pipe", 24 ] ] ], "pre_flags": [ "FLAT" ], diff --git a/data/json/construction/walls.json b/data/json/construction/walls.json index 596dd9fe280ae..e49c290683238 100644 --- a/data/json/construction/walls.json +++ b/data/json/construction/walls.json @@ -279,7 +279,7 @@ ], "components": [ [ [ "pipe", 6 ], [ "frame", 1 ], [ "xlframe", 1 ] ], - [ [ "wire", 8 ], [ "spike", 8 ], [ "nails", 16, "LIST" ] ], + [ [ "lc_wire", 8 ], [ "spike", 8 ], [ "nails", 16, "LIST" ] ], [ [ "scrap", 40 ], [ "sheet_metal", 1 ], [ "sheet_metal_small", 20 ] ] ], "pre_terrain": "t_pit", @@ -299,7 +299,7 @@ [ { "id": "DRILL", "level": 1 } ] ], "components": [ - [ [ "wire", 16 ], [ "spike", 16 ], [ "nails", 32, "LIST" ] ], + [ [ "lc_wire", 16 ], [ "spike", 16 ], [ "nails", 32, "LIST" ] ], [ [ "sheet_metal_small", 20 ], [ "scrap", 40 ] ], [ [ "sheet_metal", 4 ], diff --git a/data/json/furniture_and_terrain/LIXA_furniture_and_terrain.json b/data/json/furniture_and_terrain/LIXA_furniture_and_terrain.json index 9277af32518b7..a4d369b728ce2 100644 --- a/data/json/furniture_and_terrain/LIXA_furniture_and_terrain.json +++ b/data/json/furniture_and_terrain/LIXA_furniture_and_terrain.json @@ -312,7 +312,7 @@ "deconstruct": { "ter_set": "t_metal_floor", "items": [ - { "item": "wire", "count": [ 1, 3 ] }, + { "item": "lc_wire", "count": [ 1, 3 ] }, { "item": "pipe", "count": [ 1, 2 ] }, { "item": "steel_chunk", "count": [ 1, 4 ] }, { "item": "processor", "count": 1 }, diff --git a/data/json/furniture_and_terrain/furniture-alien.json b/data/json/furniture_and_terrain/furniture-alien.json index 4281e95d3a63f..4a76c7976581b 100644 --- a/data/json/furniture_and_terrain/furniture-alien.json +++ b/data/json/furniture_and_terrain/furniture-alien.json @@ -258,7 +258,7 @@ "items": [ { "item": "scrap", "count": [ 8, 12 ] }, { "item": "pipe", "count": [ 0, 3 ] }, - { "item": "wire", "count": [ 3, 10 ] }, + { "item": "lc_wire", "count": [ 3, 10 ] }, { "item": "sheet_metal", "count": [ 0, 2 ] }, { "item": "sheet_metal_small", "count": [ 20, 30 ] }, { "item": "exodii_chassis", "count": [ 0, 1 ] }, diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json index 77bd6577bdd09..080fbd20c087b 100644 --- a/data/json/furniture_and_terrain/furniture-appliances.json +++ b/data/json/furniture_and_terrain/furniture-appliances.json @@ -362,7 +362,7 @@ { "item": "tanned_hide", "count": [ 1, 2 ] }, { "item": "2x4", "count": [ 2, 4 ] }, { "item": "spring", "count": [ 1, 2 ] }, - { "item": "wire", "count": [ 1, 4 ] } + { "item": "lc_wire", "count": [ 1, 4 ] } ] }, "max_volume": "40 L", @@ -375,7 +375,7 @@ { "item": "leather", "count": [ 1, 4 ] }, { "item": "2x4", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 0, 6 ] }, - { "item": "wire", "count": [ 1, 3 ] } + { "item": "lc_wire", "count": [ 1, 3 ] } ] } }, diff --git a/data/json/furniture_and_terrain/furniture-decorative.json b/data/json/furniture_and_terrain/furniture-decorative.json index 458ce0a4291e8..0f7ffc874d185 100644 --- a/data/json/furniture_and_terrain/furniture-decorative.json +++ b/data/json/furniture_and_terrain/furniture-decorative.json @@ -195,7 +195,7 @@ { "item": "pipe", "count": 6 }, { "item": "steel_chunk", "count": [ 2, 6 ] }, { "item": "pipe_fittings", "count": [ 1, 3 ] }, - { "item": "wire", "count": 10 } + { "item": "lc_wire", "count": 10 } ] }, "bash": { @@ -203,7 +203,11 @@ "str_max": 10, "sound": "smash!", "sound_fail": "clang!", - "items": [ { "item": "pipe", "count": [ 1, 6 ] }, { "item": "wire", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 1, 6 ] } ] + "items": [ + { "item": "pipe", "count": [ 1, 6 ] }, + { "item": "lc_wire", "count": [ 1, 2 ] }, + { "item": "scrap", "count": [ 1, 6 ] } + ] } }, { diff --git a/data/json/furniture_and_terrain/furniture-industrial.json b/data/json/furniture_and_terrain/furniture-industrial.json index 08ec3019ed101..b90c5cf88b2ac 100644 --- a/data/json/furniture_and_terrain/furniture-industrial.json +++ b/data/json/furniture_and_terrain/furniture-industrial.json @@ -132,7 +132,10 @@ "flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE", "PLACE_ITEM" ], "deconstruct": { "items": [ - { "item": "wire", "count": [ 1, 3 ] }, + { "item": "lc_wire", "count": [ 1, 16 ], "prob": 80 }, + { "item": "mc_wire", "count": [ 1, 8 ], "prob": 15 }, + { "item": "hc_wire", "count": [ 1, 8 ], "prob": 15 }, + { "item": "qt_wire", "count": [ 1, 8 ], "prob": 15 }, { "item": "pipe", "count": [ 1, 2 ] }, { "item": "chain", "prob": 40 }, { "item": "cu_pipe", "prob": 40 }, @@ -150,7 +153,10 @@ "sound": "clang!", "sound_fail": "ting.", "items": [ - { "item": "wire", "count": 1 }, + { "item": "lc_wire", "count": [ 1, 8 ], "prob": 60 }, + { "item": "mc_wire", "count": [ 1, 4 ], "prob": 5 }, + { "item": "hc_wire", "count": [ 1, 4 ], "prob": 5 }, + { "item": "qt_wire", "count": [ 1, 4 ], "prob": 5 }, { "item": "pipe", "count": 2, "prob": 40 }, { "item": "chain", "prob": 20 }, { "item": "cu_pipe", "prob": 10 }, @@ -176,7 +182,10 @@ "flags": [ "CONTAINER", "SEALED", "PLACE_ITEM" ], "deconstruct": { "items": [ - { "item": "wire", "count": [ 1, 3 ] }, + { "item": "lc_wire", "count": [ 1, 16 ], "prob": 80 }, + { "item": "mc_wire", "count": [ 1, 8 ], "prob": 15 }, + { "item": "hc_wire", "count": [ 1, 8 ], "prob": 15 }, + { "item": "qt_wire", "count": [ 1, 8 ], "prob": 15 }, { "item": "pipe", "count": [ 1, 2 ] }, { "item": "chain", "prob": 60 }, { "item": "cu_pipe", "prob": 20 }, @@ -198,7 +207,10 @@ "sound": "clang!", "sound_fail": "ting.", "items": [ - { "item": "wire", "count": 1 }, + { "item": "lc_wire", "count": [ 1, 8 ], "prob": 60 }, + { "item": "mc_wire", "count": [ 1, 4 ], "prob": 5 }, + { "item": "hc_wire", "count": [ 1, 4 ], "prob": 5 }, + { "item": "qt_wire", "count": [ 1, 4 ], "prob": 5 }, { "item": "pipe", "count": 1 }, { "item": "chain", "prob": 20 }, { "item": "steel_lump", "count": 1 }, @@ -227,7 +239,10 @@ "flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE", "PLACE_ITEM" ], "deconstruct": { "items": [ - { "item": "wire", "count": 1 }, + { "item": "lc_wire", "count": [ 1, 16 ], "prob": 80 }, + { "item": "mc_wire", "count": [ 1, 8 ], "prob": 15 }, + { "item": "hc_wire", "count": [ 1, 8 ], "prob": 15 }, + { "item": "qt_wire", "count": [ 1, 8 ], "prob": 15 }, { "item": "pipe", "count": [ 1, 2 ] }, { "item": "chain", "prob": 40 }, { "item": "cu_pipe", "prob": 60 }, @@ -249,7 +264,10 @@ "sound": "clang!", "sound_fail": "ting.", "items": [ - { "item": "wire", "count": 1 }, + { "item": "lc_wire", "count": [ 1, 8 ], "prob": 60 }, + { "item": "mc_wire", "count": [ 1, 4 ], "prob": 5 }, + { "item": "hc_wire", "count": [ 1, 4 ], "prob": 5 }, + { "item": "qt_wire", "count": [ 1, 4 ], "prob": 5 }, { "item": "pipe", "count": [ 1, 2 ] }, { "item": "chain", "prob": 20 }, { "item": "cu_pipe", "prob": 10 }, @@ -277,7 +295,10 @@ "deconstruct": { "skill": { "skill": "electronics", "min": 1, "max": 8 }, "items": [ - { "item": "wire", "count": [ 1, 3 ] }, + { "item": "lc_wire", "count": [ 1, 16 ], "prob": 80 }, + { "item": "mc_wire", "count": [ 1, 8 ], "prob": 15 }, + { "item": "hc_wire", "count": [ 1, 8 ], "prob": 15 }, + { "item": "qt_wire", "count": [ 1, 8 ], "prob": 15 }, { "item": "pipe", "count": [ 1, 2 ] }, { "item": "steel_chunk", "count": [ 1, 4 ] }, { "item": "bearing", "charges": [ 2, 6 ] }, @@ -300,7 +321,10 @@ "sound": "clang!", "sound_fail": "ting.", "items": [ - { "item": "wire", "prob": 40 }, + { "item": "lc_wire", "count": [ 1, 8 ], "prob": 60 }, + { "item": "mc_wire", "count": [ 1, 4 ], "prob": 5 }, + { "item": "hc_wire", "count": [ 1, 4 ], "prob": 5 }, + { "item": "qt_wire", "count": [ 1, 4 ], "prob": 5 }, { "item": "pipe", "prob": 40 }, { "item": "steel_chunk", "prob": 40 }, { "item": "bearing", "charges": [ 2, 4 ] }, @@ -456,7 +480,7 @@ "flags": [ "TRANSPARENT", "FLAMMABLE", "PLACE_ITEM" ], "deconstruct": { "items": [ - { "item": "wire", "count": [ 1, 3 ] }, + { "item": "lc_wire", "count": [ 1, 3 ] }, { "item": "pipe", "count": [ 1, 2 ] }, { "item": "steel_chunk", "count": [ 1, 4 ] }, { "item": "processor", "count": 1 }, @@ -477,7 +501,7 @@ "sound": "clang!", "sound_fail": "ting.", "items": [ - { "item": "wire", "prob": 40 }, + { "item": "lc_wire", "prob": 40 }, { "item": "pipe", "prob": 40 }, { "item": "steel_chunk", "prob": 40 }, { "item": "processor", "prob": 40 }, diff --git a/data/json/furniture_and_terrain/furniture-recreation.json b/data/json/furniture_and_terrain/furniture-recreation.json index 147d96a6abd5a..d689327dd123b 100644 --- a/data/json/furniture_and_terrain/furniture-recreation.json +++ b/data/json/furniture_and_terrain/furniture-recreation.json @@ -559,7 +559,7 @@ { "item": "pipe", "count": 26 }, { "item": "2x4", "count": 12 }, { "item": "nail", "charges": [ 10, 15 ] }, - { "item": "wire", "count": [ 4, 12 ] }, + { "item": "lc_wire", "count": [ 4, 12 ] }, { "item": "plastic_chunk", "count": [ 1, 12 ] }, { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "cable", "count": [ 1, 3 ] }, @@ -575,7 +575,7 @@ { "item": "pipe", "count": [ 4, 12 ] }, { "item": "2x4", "count": [ 4, 8 ] }, { "item": "nail", "charges": [ 6, 12 ] }, - { "item": "wire", "count": [ 0, 4 ] }, + { "item": "lc_wire", "count": [ 0, 4 ] }, { "item": "splinter", "count": [ 1, 3 ] }, { "item": "plastic_chunk", "count": [ 1, 6 ] }, { "item": "steel_chunk", "count": [ 1, 4 ] }, diff --git a/data/json/furniture_and_terrain/furniture-roof.json b/data/json/furniture_and_terrain/furniture-roof.json index e51d95476eda2..23678ac6d1a7e 100644 --- a/data/json/furniture_and_terrain/furniture-roof.json +++ b/data/json/furniture_and_terrain/furniture-roof.json @@ -135,7 +135,7 @@ "items": [ { "item": "pipe", "count": 1 }, { "item": "pipe_fittings", "count": 1 }, - { "item": "wire", "count": 4 }, + { "item": "lc_wire", "count": 4 }, { "item": "sheet_metal_small", "count": 2 } ] }, diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index 18975f260dc72..17a2564ad5681 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -1160,7 +1160,7 @@ { "item": "scrap", "count": 10 }, { "item": "sheet_metal", "count": 2 }, { "item": "rebar", "count": 2 }, - { "item": "wire", "count": 2 } + { "item": "lc_wire", "count": 2 } ] }, "bash": { diff --git a/data/json/furniture_and_terrain/terrain-doors.json b/data/json/furniture_and_terrain/terrain-doors.json index bdde12b9396dd..e30ec5f429eb9 100644 --- a/data/json/furniture_and_terrain/terrain-doors.json +++ b/data/json/furniture_and_terrain/terrain-doors.json @@ -133,7 +133,7 @@ "ter_set": "t_mdoor_frame", "items": [ { "item": "glass_shard", "count": [ 42, 84 ] }, - { "item": "wire", "prob": 20 }, + { "item": "mc_wire", "prob": 20 }, { "item": "scrap", "count": [ 3, 5 ] } ] }, @@ -169,7 +169,7 @@ "ter_set": "t_thconc_floor", "items": [ { "item": "glass_shard", "count": [ 42, 84 ] }, - { "item": "wire", "prob": 20 }, + { "item": "mc_wire", "prob": 20 }, { "item": "scrap", "count": [ 3, 5 ] } ] }, @@ -204,7 +204,7 @@ "ter_set": "t_mdoor_frame", "items": [ { "item": "glass_shard", "count": [ 42, 84 ] }, - { "item": "wire", "prob": 20 }, + { "item": "mc_wire", "prob": 20 }, { "item": "scrap", "count": [ 3, 5 ] } ] } @@ -233,7 +233,7 @@ "ter_set": "t_thconc_floor", "items": [ { "item": "glass_shard", "count": [ 42, 84 ] }, - { "item": "wire", "prob": 20 }, + { "item": "mc_wire", "prob": 20 }, { "item": "scrap", "count": [ 3, 5 ] } ] } diff --git a/data/json/furniture_and_terrain/terrain-fences-gates.json b/data/json/furniture_and_terrain/terrain-fences-gates.json index e5728162310cb..009ec62ed78be 100644 --- a/data/json/furniture_and_terrain/terrain-fences-gates.json +++ b/data/json/furniture_and_terrain/terrain-fences-gates.json @@ -192,7 +192,7 @@ "result": "t_strconc_floor", "duration": "10 minutes", "message": "You finish cutting the metal.", - "byproducts": [ { "item": "chain", "count": [ 1, 2 ] }, { "item": "wire", "count": [ 8, 22 ] } ] + "byproducts": [ { "item": "chain", "count": [ 1, 2 ] }, { "item": "lc_wire", "count": [ 8, 22 ] } ] }, "flags": [ "TRANSPARENT", "PERMEABLE", "LOCKED", "PICKABLE", "THIN_OBSTACLE" ], "connect_groups": "WALL", @@ -203,7 +203,7 @@ "oxytorch": { "result": "t_strconc_floor", "duration": "9 seconds", - "byproducts": [ { "item": "chain", "count": [ 1, 2 ] }, { "item": "wire", "count": [ 8, 22 ] } ] + "byproducts": [ { "item": "chain", "count": [ 1, 2 ] }, { "item": "lc_wire", "count": [ 8, 22 ] } ] }, "bash": { "str_min": 17, @@ -214,7 +214,7 @@ "sound_fail": "clang!", "ter_set": "t_null", "items": [ - { "item": "wire", "count": [ 8, 20 ] }, + { "item": "lc_wire", "count": [ 8, 20 ] }, { "item": "chain", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 0, 12 ] } ] @@ -236,13 +236,13 @@ "result": "t_strconc_floor", "duration": "10 minutes", "message": "You finish cutting the metal.", - "byproducts": [ { "item": "chain", "count": [ 1, 2 ] }, { "item": "wire", "count": [ 8, 22 ] } ] + "byproducts": [ { "item": "chain", "count": [ 1, 2 ] }, { "item": "lc_wire", "count": [ 8, 22 ] } ] }, "open": "t_retractable_gate_o", "oxytorch": { "result": "t_strconc_floor", "duration": "9 seconds", - "byproducts": [ { "item": "chain", "count": [ 1, 2 ] }, { "item": "wire", "count": [ 8, 22 ] } ] + "byproducts": [ { "item": "chain", "count": [ 1, 2 ] }, { "item": "lc_wire", "count": [ 8, 22 ] } ] }, "bash": { "str_min": 17, @@ -253,7 +253,7 @@ "sound_fail": "clang!", "ter_set": "t_null", "items": [ - { "item": "wire", "count": [ 6, 15 ] }, + { "item": "lc_wire", "count": [ 6, 15 ] }, { "item": "chain", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 0, 12 ] } ] @@ -278,7 +278,7 @@ "sound_fail": "clang!", "ter_set": "t_null", "items": [ - { "item": "wire", "count": [ 6, 15 ] }, + { "item": "lc_wire", "count": [ 6, 15 ] }, { "item": "pipe", "count": [ 6, 15 ] }, { "item": "scrap", "count": [ 0, 12 ] } ] @@ -685,7 +685,7 @@ "examine_action": "chainfence", "deconstruct": { "ter_set": "t_chickenwire_fence_post", - "items": [ { "item": "wire", "count": 10 }, { "item": "nail", "charges": 20 } ] + "items": [ { "item": "lc_wire", "count": 10 }, { "item": "nail", "charges": 20 } ] }, "bash": { "str_min": 5, @@ -693,7 +693,7 @@ "sound": "metal rattling!", "sound_fail": "whack!", "ter_set": "t_chickenwire_fence_post", - "items": [ { "item": "wire", "count": [ 5, 10 ] } ] + "items": [ { "item": "lc_wire", "count": [ 5, 10 ] } ] } }, { diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json index b0eeba5eefc15..5e8aafa90fe88 100644 --- a/data/json/furniture_and_terrain/terrain-manufactured.json +++ b/data/json/furniture_and_terrain/terrain-manufactured.json @@ -1262,7 +1262,7 @@ "deconstruct": { "ter_set": "t_rock_floor", "items": [ - { "item": "wire", "count": 1 }, + { "item": "lc_wire", "count": 1 }, { "item": "pipe", "count": [ 1, 4 ] }, { "item": "chain", "prob": 10 }, { "item": "scrap", "count": [ 1, 5 ] }, diff --git a/data/json/furniture_and_terrain/terrain-walls.json b/data/json/furniture_and_terrain/terrain-walls.json index ac746fc86d64c..8b7704f3a1d83 100644 --- a/data/json/furniture_and_terrain/terrain-walls.json +++ b/data/json/furniture_and_terrain/terrain-walls.json @@ -2715,7 +2715,7 @@ "sound_vol": 20, "sound_fail_vol": 14, "ter_set": "t_floor", - "items": [ { "item": "glass_shard", "count": [ 42, 84 ] }, { "item": "wire", "prob": 20 } ] + "items": [ { "item": "glass_shard", "count": [ 42, 84 ] }, { "item": "mc_wire", "prob": 20 } ] }, "shoot": { "reduce_damage": [ 15, 30 ], @@ -2748,7 +2748,7 @@ "ter_set": "t_floor", "items": [ { "item": "glass_shard", "count": [ 42, 84 ] }, - { "item": "wire", "prob": 20 }, + { "item": "mc_wire", "prob": 20 }, { "item": "scrap", "count": [ 3, 5 ] } ] }, @@ -2783,7 +2783,7 @@ "ter_set": "t_floor", "items": [ { "item": "glass_shard", "count": [ 42, 84 ] }, - { "item": "wire", "prob": 20 }, + { "item": "mc_wire", "prob": 20 }, { "item": "scrap", "count": [ 3, 5 ] } ] }, diff --git a/data/json/furniture_and_terrain/terrain_vitrified.json b/data/json/furniture_and_terrain/terrain_vitrified.json index 1f8c6a50a1f84..d26842cc51cb0 100644 --- a/data/json/furniture_and_terrain/terrain_vitrified.json +++ b/data/json/furniture_and_terrain/terrain_vitrified.json @@ -25,7 +25,7 @@ "result": "t_quietfarm_border_ground", "duration": "5 seconds", "sound": "Snick, snick, gachunk!", - "byproducts": [ { "item": "wire", "count": 20 } ] + "byproducts": [ { "item": "lc_wire", "count": 20 } ] }, "flags": [ "TRANSPARENT", "NOITEM", "THIN_OBSTACLE", "PERMEABLE", "UNSTABLE", "CLIMBABLE", "AUTO_WALL_SYMBOL", "BURROWABLE" ], "connect_groups": "CHAINFENCE", @@ -34,13 +34,13 @@ "oxytorch": { "result": "t_quietfarm_border_ground", "duration": "9 seconds", - "byproducts": [ { "item": "pipe", "count": [ 1, 4 ] }, { "item": "wire", "count": [ 4, 16 ] } ] + "byproducts": [ { "item": "pipe", "count": [ 1, 4 ] }, { "item": "lc_wire", "count": [ 4, 16 ] } ] }, "hacksaw": { "result": "t_quietfarm_border_ground", "duration": "10 minutes", "message": "You finish cutting the metal.", - "byproducts": [ { "item": "pipe", "count": 6 }, { "item": "wire", "count": [ 4, 16 ] } ] + "byproducts": [ { "item": "pipe", "count": 6 }, { "item": "lc_wire", "count": [ 4, 16 ] } ] }, "bash": { "str_min": 10, @@ -48,7 +48,7 @@ "sound": "metal screeching!", "sound_fail": "clang!", "ter_set": "t_quietfarm_border_ground", - "items": [ { "item": "wire", "count": [ 8, 15 ] } ] + "items": [ { "item": "lc_wire", "count": [ 8, 15 ] } ] } }, { @@ -67,14 +67,14 @@ "oxytorch": { "result": "t_quietfarm_border_ground", "duration": "9 seconds", - "byproducts": [ { "item": "pipe", "count": [ 1, 4 ] }, { "item": "wire", "count": [ 4, 16 ] } ] + "byproducts": [ { "item": "pipe", "count": [ 1, 4 ] }, { "item": "lc_wire", "count": [ 4, 16 ] } ] }, "open": "t_quietfarm_border_fence_open", "hacksaw": { "result": "t_quietfarm_border_ground", "duration": "10 minutes", "message": "You finish cutting the metal.", - "byproducts": [ { "item": "pipe", "count": 6 }, { "item": "wire", "count": [ 4, 20 ] } ] + "byproducts": [ { "item": "pipe", "count": 6 }, { "item": "lc_wire", "count": [ 4, 20 ] } ] }, "bash": { "str_min": 10, @@ -85,7 +85,7 @@ "sound_fail": "clang!", "ter_set": "t_quietfarm_border_ground", "items": [ - { "item": "wire", "count": [ 6, 15 ] }, + { "item": "lc_wire", "count": [ 6, 15 ] }, { "item": "pipe", "count": [ 6, 15 ] }, { "item": "scrap", "count": [ 0, 12 ] } ] @@ -107,13 +107,13 @@ "oxytorch": { "result": "t_quietfarm_border_ground", "duration": "9 seconds", - "byproducts": [ { "item": "pipe", "count": [ 1, 4 ] }, { "item": "wire", "count": [ 4, 16 ] } ] + "byproducts": [ { "item": "pipe", "count": [ 1, 4 ] }, { "item": "lc_wire", "count": [ 4, 16 ] } ] }, "hacksaw": { "result": "t_quietfarm_border_ground", "duration": "10 minutes", "message": "You finish cutting the metal.", - "byproducts": [ { "item": "pipe", "count": 6 }, { "item": "wire", "count": [ 4, 20 ] } ] + "byproducts": [ { "item": "pipe", "count": 6 }, { "item": "lc_wire", "count": [ 4, 20 ] } ] }, "bash": { "str_min": 5, @@ -122,7 +122,7 @@ "sound_fail": "clang!", "ter_set": "t_quietfarm_border_ground", "items": [ - { "item": "wire", "count": [ 6, 15 ] }, + { "item": "lc_wire", "count": [ 6, 15 ] }, { "item": "pipe", "count": [ 6, 15 ] }, { "item": "scrap", "count": [ 0, 12 ] } ] diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index 79c825170ab48..d185ed2544a1b 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -523,10 +523,13 @@ { "item": "scrap", "prob": 50, "charges": [ 1, 3 ] }, { "item": "steel_chunk", "prob": 50, "charges": [ 1, 2 ] }, { "item": "steel_lump", "prob": 50, "charges": [ 1, 2 ] }, + { "item": "lc_wire", "prob": 80, "count": [ 0, 40 ] }, + { "item": "mc_wire", "prob": 20, "count": [ 0, 40 ] }, + { "item": "hc_wire", "prob": 20, "count": [ 0, 40 ] }, + { "item": "qt_wire", "prob": 10, "count": [ 0, 40 ] }, [ "chain", 35 ], [ "rebar", 35 ], [ "pipe", 40 ], - [ "wire", 40 ], [ "sheet_metal", 25 ], [ "sheet_metal_small", 25 ] ] @@ -539,10 +542,13 @@ { "item": "steel_lump", "prob": 5, "count": [ 1, 3 ] }, { "item": "steel_chunk", "prob": 15, "count": [ 1, 5 ] }, { "item": "scrap", "prob": 70, "count": [ 1, 10 ] }, + { "item": "lc_wire", "prob": 80, "count": [ 0, 40 ] }, + { "item": "mc_wire", "prob": 20, "count": [ 0, 40 ] }, + { "item": "hc_wire", "prob": 20, "count": [ 0, 40 ] }, + { "item": "qt_wire", "prob": 10, "count": [ 0, 40 ] }, [ "chain", 35 ], [ "rebar", 35 ], [ "pipe", 40 ], - [ "wire", 40 ], { "item": "sheet_metal", "prob": 5 }, { "item": "sheet_metal_small", "prob": 5, "count": [ 2, 4 ] }, { "item": "material_aluminium_ingot", "prob": 10, "count": [ 1, 5 ] } @@ -855,6 +861,10 @@ [ "jerrycan_big", 25 ], { "item": "jumper_cable_heavy", "prob": 20 }, { "item": "jumper_cable", "prob": 30 }, + { "item": "lc_wire", "prob": 80, "count": [ 0, 40 ] }, + { "item": "mc_wire", "prob": 20, "count": [ 0, 40 ] }, + { "item": "hc_wire", "prob": 20, "count": [ 0, 40 ] }, + { "item": "qt_wire", "prob": 10, "count": [ 0, 40 ] }, [ "wheel_metal", 25 ], [ "foot_crank", 25 ], [ "chain", 35 ], @@ -871,7 +881,6 @@ [ "fishing_hook_basic", 35 ], [ "spike", 30 ], [ "wire_barbed", 25 ], - [ "wire", 40 ], [ "sheet_metal", 25 ], [ "sheet_metal_small", 40 ], [ "frame", 20 ], diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json index ebb6d7d8e76fd..99d735c495495 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json +++ b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json @@ -2116,7 +2116,13 @@ "id": "farm_supply_wire", "type": "item_group", "subtype": "collection", - "items": [ { "item": "wire", "prob": 80, "count": [ 20, 50 ] }, { "item": "wire_barbed", "prob": 20, "count": [ 20, 50 ] } ] + "items": [ + { "item": "lc_wire", "prob": 50, "count": [ 20, 50 ] }, + { "item": "mc_wire", "prob": 5, "count": [ 0, 20 ] }, + { "item": "hc_wire", "prob": 5, "count": [ 0, 20 ] }, + { "item": "qt_wire", "prob": 5, "count": [ 0, 20 ] }, + { "item": "wire_barbed", "prob": 40, "count": [ 20, 50 ] } + ] }, { "id": "farm_supply_quicklime_and_saltpetre", diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json index cc3c9aab5e846..4cfc1686a83ec 100644 --- a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json +++ b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json @@ -21,7 +21,7 @@ [ "string_36", 5 ], [ "scrap", 10 ], { "item": "glass_shard", "prob": 10, "count": [ 1, 8 ] }, - [ "wire", 5 ], + [ "lc_wire", 5 ], [ "splinter", 10 ], [ "cotton_patchwork", 15 ], { "item": "cotton_patchwork", "prob": 10, "custom-flags": [ "FILTHY" ] }, diff --git a/data/json/itemgroups/SUS/alien.json b/data/json/itemgroups/SUS/alien.json index 751cba625df5b..82884c9829192 100644 --- a/data/json/itemgroups/SUS/alien.json +++ b/data/json/itemgroups/SUS/alien.json @@ -18,7 +18,10 @@ { "item": "pipe", "prob": 20, "count": [ 2, 8 ] }, { "item": "spike", "prob": 50, "count": [ 3, 40 ] }, { "item": "hinge", "prob": 20, "count": [ 1, 30 ] }, - { "item": "wire", "prob": 40, "count": [ 5, 20 ] }, + { "item": "lc_wire", "prob": 40, "count": [ 5, 20 ] }, + { "item": "mc_wire", "prob": 10, "count": [ 5, 20 ] }, + { "item": "hc_wire", "prob": 10, "count": [ 5, 20 ] }, + { "item": "qt_wire", "prob": 5, "count": [ 5, 20 ] }, { "item": "rebar", "prob": 30, "count": [ 2, 30 ] }, { "item": "sheet_metal", "prob": 20, "count": [ 2, 30 ] }, { "item": "sheet_metal_small", "prob": 40, "count": [ 5, 50 ] }, diff --git a/data/json/itemgroups/activities_hobbies.json b/data/json/itemgroups/activities_hobbies.json index 9366235271fc1..78ae8247c1ccb 100644 --- a/data/json/itemgroups/activities_hobbies.json +++ b/data/json/itemgroups/activities_hobbies.json @@ -343,7 +343,7 @@ { "group": "makeshift_archery_ammo", "prob": 7 }, { "group": "archery_ammo", "prob": 5 }, { "group": "archery_loaded_quivers", "prob": 2 }, - [ "wire", 50 ], + [ "lc_wire", 50 ], [ "rollmat", 40 ], [ "tent_kit", 17 ], [ "hammock", 5 ], @@ -520,7 +520,7 @@ { "item": "water_purifier", "prob": 5 }, { "item": "radio", "prob": 20, "charges": [ 0, 100 ] }, [ "string_36", 40 ], - [ "wire", 50 ], + [ "lc_wire", 50 ], [ "rollmat", 40 ], [ "tent_kit", 17 ], [ "ax", 8 ], diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index d7092aab8bd81..baff92b57dccb 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -191,7 +191,7 @@ { "item": "rebar", "prob": 40, "count": [ 5, 10 ] }, { "item": "brick", "prob": 40, "count": [ 5, 10 ] }, { "item": "pipe", "prob": 40, "count": [ 5, 10 ] }, - { "item": "wire", "prob": 40, "count": [ 5, 10 ] }, + { "item": "lc_wire", "prob": 40, "count": [ 5, 10 ] }, { "item": "screen_mesh", "prob": 40, "count": [ 5, 10 ] }, { "item": "spike", "prob": 40, "count": [ 5, 10 ] }, { "item": "nail", "prob": 60, "count": [ 5, 20 ] }, @@ -232,7 +232,7 @@ [ "metal_tank", 1 ], [ "jerrycan", 5 ], { "item": "scrap_copper", "prob": 15, "count": [ 1, 2 ] }, - [ "wire", 10 ], + [ "lc_wire", 10 ], { "group": "ammo_pocket_batteries_full", "prob": 50 }, [ "pilot_light", 50 ], { "item": "duct_tape", "prob": 200, "charges": [ 50, 200 ] }, @@ -392,7 +392,7 @@ [ "metal_tank_little", 10 ], [ "water_faucet", 10 ], [ "wood_panel", 10 ], - { "item": "wire", "prob": 50, "count": [ 1, 10 ] }, + { "item": "lc_wire", "prob": 50, "count": [ 1, 10 ] }, { "item": "wire_barbed", "prob": 20, "count": [ 1, 10 ] }, [ "duct_tape", 60 ], [ "compressor", 5 ], @@ -604,7 +604,10 @@ { "item": "tin", "prob": 10, "count": [ 1, 5 ] }, { "item": "material_aluminium_ingot", "prob": 10, "count": [ 1, 5 ] }, { "item": "scrap_copper", "prob": 5, "count": [ 1, 12 ] }, - { "item": "wire", "prob": 5 }, + { "item": "lc_wire", "prob": 30, "count": [ 5, 10 ] }, + { "item": "mc_wire", "prob": 5, "count": [ 1, 5 ] }, + { "item": "hc_wire", "prob": 5, "count": [ 1, 5 ] }, + { "item": "qt_wire", "prob": 5, "count": [ 1, 5 ] }, { "item": "scrap", "prob": 70, "count": [ 1, 10 ] }, { "item": "lc_steel_lump", "prob": 5, "count": [ 1, 3 ] }, { "item": "lc_steel_chunk", "prob": 15, "count": [ 1, 5 ] }, diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json index 1e549cc938b42..384d71c94cb76 100644 --- a/data/json/itemgroups/tools.json +++ b/data/json/itemgroups/tools.json @@ -43,7 +43,7 @@ { "item": "luthier_toolset", "prob": 100 }, { "item": "tonewood", "prob": 100, "count": [ 1, 6 ] }, { "item": "tuning_pegs", "prob": 100, "count": [ 5, 15 ] }, - { "item": "piano_wire", "prob": 100, "count": [ 1, 3 ] }, + { "item": "qt_wire", "prob": 100, "count": [ 1, 3 ] }, [ "hand_drill", 20 ], { "item": "super_glue", "prob": 100, "count": [ 1, 3 ] }, [ "chisel", 10 ], diff --git a/data/json/itemgroups/trash_and_debris.json b/data/json/itemgroups/trash_and_debris.json index 6062dc698352f..3c90484eac6fd 100644 --- a/data/json/itemgroups/trash_and_debris.json +++ b/data/json/itemgroups/trash_and_debris.json @@ -91,7 +91,7 @@ { "item": "cu_pipe", "prob": 5 }, { "item": "scrap", "prob": 20 }, { "item": "glass_shard", "prob": 10, "count": [ 1, 8 ] }, - { "item": "wire", "prob": 5 } + { "item": "lc_wire", "prob": 5 } ] }, { @@ -136,7 +136,7 @@ { "group": "tinware", "prob": 5 }, [ "can_drink", 5 ], [ "can_food", 5 ], - [ "wire", 5 ], + [ "lc_wire", 5 ], [ "plastic_sheet", 5 ], [ "jug_plastic", 5 ], [ "fuel_tin", 1 ], @@ -331,7 +331,7 @@ { "item": "brick", "prob": 20, "count": [ 10, 20 ], "damage-min": 0, "damage-max": 3 }, { "item": "pipe", "prob": 5, "count": [ 2, 6 ], "damage-min": 0, "damage-max": 3 }, { "item": "nail", "prob": 2, "count": [ 0, 1 ], "charges": [ 3, 15 ] }, - { "item": "wire", "prob": 3, "count": [ 2, 6 ], "damage-min": 0, "damage-max": 3 }, + { "item": "lc_wire", "prob": 3, "count": [ 2, 6 ], "damage-min": 0, "damage-max": 3 }, { "item": "charcoal", "prob": 3, "charges": [ 3, 7 ] }, { "item": "scrap_copper", "prob": 2, "count": [ 2, 4 ], "damage-min": 0, "damage-max": 3 }, { "item": "sheet_metal", "prob": 2, "count": [ 1, 4 ], "damage-min": 0, "damage-max": 3 }, diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index 24110d94ec1ac..790a741a27134 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -1684,7 +1684,7 @@ "material": [ "steel" ], "symbol": ";", "color": "light_gray", - "looks_like": "link_sheet", + "looks_like": "lc_link_sheet", "flags": [ "FRAGILE_MELEE" ], "melee_damage": { "bash": 2 } }, diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 157906cf92797..9316a632c4815 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -1029,8 +1029,8 @@ "id": "lc_wire", "symbol": ";", "color": "light_gray", - "name": { "str": "mild steel wire" }, - "description": "A length of thin, relatively stiff steel wire. Like the sort you find in chain link fences.", + "name": { "str": "steel wire" }, + "description": "A length of thin, relatively stiff wire made of mild steel. Ubiquitously found in everyday applications such as chain link fences.", "category": "spare_parts", "price": "200 USD", "price_postapoc": "1 USD", @@ -1043,6 +1043,7 @@ "id": "mc_wire", "copy-from": "lc_wire", "name": { "str": "medium steel wire" }, + "description": "A length of thin, stiff wire made of medium steel. Its balance between strength and flexibility makes it suitable for steel ropes and cables.", "material": [ "mc_steel" ] }, { @@ -1050,6 +1051,7 @@ "id": "hc_wire", "copy-from": "lc_wire", "name": { "str": "high steel wire" }, + "description": "A length of strong wire made of high carbon steel. Often used in industrial machinery and springs.", "material": [ "hc_steel" ] }, { @@ -1057,6 +1059,7 @@ "id": "ch_wire", "copy-from": "lc_wire", "name": { "str": "hardened steel wire" }, + "description": "A length of thin, relatively stiff steel wire, made of hardened steel.", "material": [ "ch_steel" ] }, { @@ -1064,6 +1067,7 @@ "id": "qt_wire", "copy-from": "lc_wire", "name": { "str": "tempered steel wire" }, + "description": "A length of flexible and durable steel wire, made of tempered spring steel. Often used in industrial and automotive springs, and the wire in musical instruments.", "material": [ "qt_steel" ] }, { diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index 75555317218db..22092f1709823 100644 --- a/data/json/items/tool/science.json +++ b/data/json/items/tool/science.json @@ -693,7 +693,7 @@ "material": [ "platinum" ], "symbol": ";", "color": "light_gray", - "looks_like": "link_sheet", + "looks_like": "lc_link_sheet", "flags": [ "FRAGILE_MELEE" ], "melee_damage": { "bash": 2 } }, diff --git a/data/json/mapgen/nested/basement_nested.json b/data/json/mapgen/nested/basement_nested.json index 55519e0b67632..e92a8d5216132 100644 --- a/data/json/mapgen/nested/basement_nested.json +++ b/data/json/mapgen/nested/basement_nested.json @@ -1783,9 +1783,9 @@ { "item": "amplifier_head", "x": 1, "y": 5, "chance": 100 }, { "item": "mixer_music", "x": 6, "y": 2, "chance": 100 }, { "item": "guitar_stand", "x": 3, "y": 3, "chance": 100 }, - { "item": "piano_wire", "x": 3, "y": 3, "chance": 20 }, + { "item": "qt_wire", "x": 3, "y": 3, "chance": 20 }, { "item": "guitar_stand", "x": 0, "y": 5, "chance": 100 }, - { "item": "piano_wire", "x": 0, "y": 5, "chance": 20 }, + { "item": "qt_wire", "x": 0, "y": 5, "chance": 20 }, { "item": "mic_stand_tall", "x": 5, "y": 5, "chance": 100 }, { "item": "microphone_xlr_generic", "x": 5, "y": 5, "chance": 100 }, { "item": "headphones_circumaural", "x": 6, "y": 2, "chance": 100 }, @@ -3354,7 +3354,7 @@ { "item": "amplifier_head", "x": 6, "y": 5, "chance": 100 }, { "item": "mixer_music", "x": [ 4, 7 ], "y": 3, "chance": 80, "repeat": [ 1, 4 ] }, { "item": "guitar_stand", "x": 7, "y": [ 5, 8 ], "chance": 70, "repeat": [ 1, 4 ] }, - { "item": "piano_wire", "x": 7, "y": 5, "chance": 20 }, + { "item": "qt_wire", "x": 7, "y": 5, "chance": 20 }, { "item": "guitar_stand", "x": 4, "y": 7, "chance": 100 }, { "item": "mic_stand_tall", "x": 7, "y": 5, "chance": 100 }, { "item": "mic_stand_tall", "x": 2, "y": 5, "chance": 100 }, @@ -3410,7 +3410,7 @@ { "item": "amplifier_head", "x": 4, "y": 4, "chance": 100 }, { "item": "amplifier_head", "x": 6, "y": 4, "chance": 100 }, { "item": "mixer_music", "x": [ 4, 7 ], "y": 6, "chance": 80, "repeat": [ 1, 4 ] }, - { "item": "piano_wire", "x": 4, "y": 6, "chance": 20 }, + { "item": "qt_wire", "x": 4, "y": 6, "chance": 20 }, { "item": "guitar_stand", "x": 7, "y": [ 1, 4 ], "chance": 70, "repeat": [ 1, 4 ] }, { "item": "guitar_stand", "x": 4, "y": 2, "chance": 100 }, { "item": "mic_stand_tall", "x": 7, "y": 4, "chance": 100 }, @@ -3469,7 +3469,7 @@ { "item": "amplifier_head", "x": 6, "y": 4, "chance": 100 }, { "item": "mixer_music", "x": [ 1, 4 ], "y": 6, "chance": 80, "repeat": [ 1, 4 ] }, { "item": "guitar_stand", "x": 7, "y": [ 1, 4 ], "chance": 70, "repeat": [ 1, 4 ] }, - { "item": "piano_wire", "x": 7, "y": 1, "chance": 20 }, + { "item": "qt_wire", "x": 7, "y": 1, "chance": 20 }, { "item": "guitar_stand", "x": 4, "y": 2, "chance": 100 }, { "item": "mic_stand_tall", "x": 7, "y": 4, "chance": 100 }, { "item": "mic_stand_tall", "x": 2, "y": 4, "chance": 100 }, @@ -3526,7 +3526,7 @@ { "item": "amplifier_head", "x": 4, "y": 4, "chance": 100 }, { "item": "amplifier_head", "x": 6, "y": 4, "chance": 100 }, { "item": "mixer_music", "x": [ 4, 7 ], "y": 6, "chance": 80, "repeat": [ 1, 4 ] }, - { "item": "piano_wire", "x": 5, "y": 6, "chance": 20 }, + { "item": "qt_wire", "x": 5, "y": 6, "chance": 20 }, { "item": "guitar_stand", "x": 7, "y": [ 1, 4 ], "chance": 70, "repeat": [ 1, 4 ] }, { "item": "guitar_stand", "x": 4, "y": 2, "chance": 100 }, { "item": "mic_stand_tall", "x": 7, "y": 4, "chance": 100 }, diff --git a/data/json/npcs/NC_JUNK_SHOPKEEP.json b/data/json/npcs/NC_JUNK_SHOPKEEP.json index 99097f5a111c5..8c65372112284 100644 --- a/data/json/npcs/NC_JUNK_SHOPKEEP.json +++ b/data/json/npcs/NC_JUNK_SHOPKEEP.json @@ -179,7 +179,7 @@ { "item": "metal_tank", "prob": 10 }, { "item": "metal_tank_little", "prob": 10 }, { "item": "water_faucet", "prob": 10 }, - { "item": "wire", "prob": 50 }, + { "item": "lc_wire", "prob": 50 }, { "item": "wire_barbed", "prob": 20 }, { "item": "jerrycan", "prob": 10 }, { "item": "lawnmower", "prob": 25 }, diff --git a/data/json/npcs/godco/godco_missions.json b/data/json/npcs/godco/godco_missions.json index 19609f30199d9..defa8da7d2b8c 100644 --- a/data/json/npcs/godco/godco_missions.json +++ b/data/json/npcs/godco/godco_missions.json @@ -192,19 +192,19 @@ "id": "MISSION_GODCO_GET_GUITAR_STRING", "type": "mission_definition", "name": { "str": "Obtain a guitar string" }, - "description": "Find a piano wire to be used as a guitar string.", + "description": "Find a length of tempered steel wire to be used as a guitar string.", "goal": "MGOAL_FIND_ITEM", "difficulty": 1, "value": 0, - "item": "piano_wire", + "item": "qt_wire", "count": 1, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { "describe": "I need a new guitar string.", - "offer": "One of my guitar strings busted from where I smacked a zombie. If you could get me a piano wire, I can fix my guitar.", + "offer": "One of my guitar strings busted from where I smacked a zombie. If you could get me a new string, I can fix my guitar.", "accepted": "Thanks. I'll give you a performance when you get back with it.", "rejected": "I guess I'll just skip that note.", - "advice": "Music shops should have some.", + "advice": "I read that musical wire is made of tempered steel. Music shops should have some, or you could take apart a piano.", "inquire": "Do you have it?", "success": "Thank you so much! This should last for a while.", "success_lie": "Thanks for trying… I guess.", diff --git a/data/json/npcs/holdouts/Mr_Lapin.json b/data/json/npcs/holdouts/Mr_Lapin.json index 0515316fd3580..3fac409fa0b44 100644 --- a/data/json/npcs/holdouts/Mr_Lapin.json +++ b/data/json/npcs/holdouts/Mr_Lapin.json @@ -160,7 +160,7 @@ "material_sand", "clay_lump", "nail", - "wire", + "lc_wire", "apple", "banana", "orange", diff --git a/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json index 31fed5abbcdfe..8a47bacf95a13 100644 --- a/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json @@ -329,7 +329,7 @@ "material_sand", "clay_lump", "nail", - "wire", + "lc_wire", "rock", "steel_chunk", "steel_lump" diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Draco_Dune.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Draco_Dune.json index 07e2e4819a3f7..37cefda890bfc 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Draco_Dune.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Draco_Dune.json @@ -46,7 +46,7 @@ "type": "item_group", "id": "REFUGEE_Draco_carried", "subtype": "collection", - "entries": [ { "item": "wire" } ] + "entries": [ { "item": "lc_wire" } ] }, { "type": "item_group", diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json index 73616e0885651..782cba11410ec 100644 --- a/data/json/obsoletion_and_migration_0.I/migration_items.json +++ b/data/json/obsoletion_and_migration_0.I/migration_items.json @@ -1918,6 +1918,26 @@ "type": "MIGRATION", "replace": "rail_laser_sight" }, + { + "id": "wire", + "type": "MIGRATION", + "replace": "lc_wire" + }, + { + "id": "piano_wire", + "type": "MIGRATION", + "replace": "qt_wire" + }, + { + "id": "chain_link", + "type": "MIGRATION", + "replace": "lc_chain_link" + }, + { + "id": "link_sheet", + "type": "MIGRATION", + "replace": "lc_link_sheet" + }, { "id": "acr_300blk", "type": "MIGRATION", diff --git a/data/json/recipes/ammo/weldgas.json b/data/json/recipes/ammo/weldgas.json index b3938193d82dc..1303a4c836719 100644 --- a/data/json/recipes/ammo/weldgas.json +++ b/data/json/recipes/ammo/weldgas.json @@ -154,7 +154,7 @@ { "proficiency": "prof_inorganic_chemistry" } ], "components": [ - [ [ "wire", 4 ] ], + [ [ "any_wire", 4, "LIST" ] ], [ [ "copper", 1 ] ], [ [ "any_strong_acid", 1, "LIST" ] ], [ [ "water", 3 ], [ "water_clean", 3 ] ] diff --git a/data/json/recipes/armor/arms.json b/data/json/recipes/armor/arms.json index 857d6bbf93694..c879634fe2da1 100644 --- a/data/json/recipes/armor/arms.json +++ b/data/json/recipes/armor/arms.json @@ -832,7 +832,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 8 ], [ "lc_steel_standard", 2 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_lc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -853,7 +853,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 12 ], [ "lc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_lc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -872,7 +872,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 8 ], [ "mc_steel_standard", 2 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_mc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -893,7 +893,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 12 ], [ "mc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_mc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -912,7 +912,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 8 ], [ "hc_steel_standard", 2 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_hc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -933,7 +933,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 12 ], [ "hc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_hc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -952,7 +952,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 8 ], [ "lc_steel_standard", 2 ], - [ "armor_chainmail_assembling", 1 ], + [ "armor_lc_chainmail_assembling", 1 ], [ "carbon", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], @@ -976,7 +976,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 12 ], [ "lc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 2 ], + [ "armor_lc_chainmail_assembling", 2 ], [ "carbon", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], @@ -996,7 +996,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 8 ], [ "mc_steel_standard", 2 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_mc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ], @@ -1018,7 +1018,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 12 ], [ "mc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_mc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ] @@ -1037,7 +1037,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 12 ], [ "lc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_lc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -1058,7 +1058,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 16 ], [ "lc_steel_standard", 4 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_lc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -1077,7 +1077,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 12 ], [ "mc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_mc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -1098,7 +1098,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 16 ], [ "mc_steel_standard", 4 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_mc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -1117,7 +1117,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 12 ], [ "hc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_hc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -1138,7 +1138,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 16 ], [ "hc_steel_standard", 4 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_hc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -1157,7 +1157,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 12 ], [ "lc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 1 ], + [ "armor_lc_chainmail_assembling", 1 ], [ "carbon", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], @@ -1181,7 +1181,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 16 ], [ "lc_steel_standard", 4 ], - [ "armor_chainmail_assembling", 2 ], + [ "armor_lc_chainmail_assembling", 2 ], [ "carbon", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], @@ -1201,7 +1201,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 12 ], [ "mc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_mc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ], @@ -1223,7 +1223,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 16 ], [ "mc_steel_standard", 4 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_mc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ] @@ -1242,7 +1242,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 16 ], [ "lc_steel_standard", 4 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_lc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -1263,7 +1263,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 20 ], [ "lc_steel_standard", 5 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_lc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -1282,7 +1282,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 16 ], [ "mc_steel_standard", 4 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_mc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -1303,7 +1303,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 20 ], [ "mc_steel_standard", 5 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_mc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -1322,7 +1322,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 16 ], [ "hc_steel_standard", 4 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_hc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -1343,7 +1343,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 20 ], [ "hc_steel_standard", 5 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_hc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -1362,7 +1362,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 16 ], [ "lc_steel_standard", 4 ], - [ "armor_chainmail_assembling", 1 ], + [ "armor_lc_chainmail_assembling", 1 ], [ "carbon", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], @@ -1386,7 +1386,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 20 ], [ "lc_steel_standard", 5 ], - [ "armor_chainmail_assembling", 2 ], + [ "armor_lc_chainmail_assembling", 2 ], [ "carbon", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], @@ -1406,7 +1406,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 16 ], [ "mc_steel_standard", 4 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_mc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ], @@ -1428,7 +1428,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 20 ], [ "mc_steel_standard", 5 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_mc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ] diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index e1aba7c5346b8..9cc015d0eaf96 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -1744,7 +1744,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 4 ], [ "lc_steel_standard", 1 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_lc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -1765,7 +1765,7 @@ [ "fabric_leather_fur_hide", 3 ], [ "blacksmithing_standard", 8 ], [ "lc_steel_standard", 2 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_lc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -1819,7 +1819,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 4 ], [ "mc_steel_standard", 1 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_mc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -1840,7 +1840,7 @@ [ "fabric_leather_fur_hide", 3 ], [ "blacksmithing_standard", 8 ], [ "mc_steel_standard", 2 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_mc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -1859,7 +1859,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 4 ], [ "hc_steel_standard", 1 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_hc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -1880,7 +1880,7 @@ [ "fabric_leather_fur_hide", 3 ], [ "blacksmithing_standard", 8 ], [ "hc_steel_standard", 2 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_hc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -1899,7 +1899,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 4 ], [ "lc_steel_standard", 1 ], - [ "armor_chainmail_assembling", 1 ], + [ "armor_lc_chainmail_assembling", 1 ], [ "carbon", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], @@ -1922,7 +1922,7 @@ [ "fabric_leather_fur_hide", 3 ], [ "blacksmithing_standard", 8 ], [ "lc_steel_standard", 2 ], - [ "armor_chainmail_assembling", 2 ], + [ "armor_lc_chainmail_assembling", 2 ], [ "carbon", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], @@ -1942,7 +1942,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 4 ], [ "mc_steel_standard", 1 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_mc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ], @@ -1964,7 +1964,7 @@ [ "fabric_leather_fur_hide", 3 ], [ "blacksmithing_standard", 8 ], [ "mc_steel_standard", 2 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_mc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ] diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json index d5cefae81c04f..36f54ea2a006f 100644 --- a/data/json/recipes/armor/hands.json +++ b/data/json/recipes/armor/hands.json @@ -1347,7 +1347,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 8 ], [ "lc_steel_standard", 2 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_lc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -1368,7 +1368,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 12 ], [ "lc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_lc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -1387,7 +1387,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 8 ], [ "mc_steel_standard", 2 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_mc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -1408,7 +1408,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 12 ], [ "mc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_mc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -1427,7 +1427,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 8 ], [ "hc_steel_standard", 2 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_hc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -1448,7 +1448,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 12 ], [ "hc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_hc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -1467,7 +1467,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 8 ], [ "lc_steel_standard", 2 ], - [ "armor_chainmail_assembling", 1 ], + [ "armor_lc_chainmail_assembling", 1 ], [ "carbon", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], @@ -1490,7 +1490,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 12 ], [ "lc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 2 ], + [ "armor_lc_chainmail_assembling", 2 ], [ "carbon", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], @@ -1510,7 +1510,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 8 ], [ "mc_steel_standard", 2 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_mc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ], @@ -1532,7 +1532,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 12 ], [ "mc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_mc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ] @@ -1551,7 +1551,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 12 ], [ "lc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_lc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -1572,7 +1572,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 16 ], [ "lc_steel_standard", 4 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_lc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -1626,7 +1626,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 12 ], [ "mc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_mc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -1647,7 +1647,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 16 ], [ "mc_steel_standard", 4 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_mc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -1666,7 +1666,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 12 ], [ "hc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_hc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -1687,7 +1687,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 16 ], [ "hc_steel_standard", 4 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_hc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] @@ -1706,7 +1706,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 12 ], [ "lc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 1 ], + [ "armor_lc_chainmail_assembling", 1 ], [ "carbon", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], @@ -1729,7 +1729,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 16 ], [ "lc_steel_standard", 4 ], - [ "armor_chainmail_assembling", 2 ], + [ "armor_lc_chainmail_assembling", 2 ], [ "carbon", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], @@ -1749,7 +1749,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 12 ], [ "mc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 1 ] + [ "armor_mc_chainmail_assembling", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ], @@ -1771,7 +1771,7 @@ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 16 ], [ "mc_steel_standard", 4 ], - [ "armor_chainmail_assembling", 2 ] + [ "armor_mc_chainmail_assembling", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ] diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index 239b36f6f2966..f5689846d3a0f 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -212,7 +212,7 @@ [ "beaker", 1 ], [ "flask_hip", 1 ] ], - [ [ "wire", 1 ] ], + [ [ "any_wire", 1, "LIST" ] ], [ [ "hose", 1 ], [ "makeshift_hose", 1 ] ] ], "flags": [ "BLIND_HARD" ] diff --git a/data/json/recipes/armor/jewelry.json b/data/json/recipes/armor/jewelry.json index c0704eca99e6a..b022768ca88af 100644 --- a/data/json/recipes/armor/jewelry.json +++ b/data/json/recipes/armor/jewelry.json @@ -70,7 +70,7 @@ "//2": "Water and cotton are present as tools to represent you needing or wanting to polish the casing before stringing it.", "qualities": [ { "id": "DRILL", "level": 1 }, { "id": "FILE", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "//3": "Metal sawing for removing the base, rim, and primer, and filing for smoothing down the resulting edges.", - "components": [ [ [ "wire", 1 ] ] ] + "components": [ [ [ "any_wire", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -95,7 +95,7 @@ "//2": "Water and cotton are present as tools to represent you needing or wanting to polish the casing before stringing it.", "qualities": [ { "id": "DRILL", "level": 1 }, { "id": "FILE", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "//3": "Metal sawing for removing the base, rim, and primer, and filing for smoothing down the resulting edges.", - "components": [ [ [ "wire", 1 ] ] ] + "components": [ [ [ "any_wire", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -120,7 +120,7 @@ "//2": "Water and cotton are present as tools to represent you needing or wanting to polish the casing before stringing it.", "qualities": [ { "id": "DRILL", "level": 1 }, { "id": "FILE", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "//3": "Metal sawing for removing the base, rim, and primer, and filing for smoothing down the resulting edges.", - "components": [ [ [ "wire", 1 ] ] ] + "components": [ [ [ "any_wire", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -140,6 +140,6 @@ "using": [ [ "cordage_short", 1 ] ], "//2": "The filing quality is only there to blunt the 'impossibly-sharp' monster teeth, probably not needed for other teeth.", "qualities": [ { "id": "FILE", "level": 1 } ], - "components": [ [ [ "wire", 1 ] ], [ [ "nm_teeth", 1 ] ] ] + "components": [ [ [ "any_wire", 1, "LIST" ] ], [ [ "nm_teeth", 1 ] ] ] } ] diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json index df34a9cc90786..d826f4e1abc88 100644 --- a/data/json/recipes/armor/legs.json +++ b/data/json/recipes/armor/legs.json @@ -1742,7 +1742,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 16 ], [ "lc_steel_standard", 4 ], - [ "armor_chainmail_assembling", 1 ], + [ "armor_lc_chainmail_assembling", 1 ], [ "carbon", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], @@ -1901,7 +1901,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 12 ], [ "lc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 1 ], + [ "armor_lc_chainmail_assembling", 1 ], [ "carbon", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], @@ -2060,7 +2060,7 @@ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 12 ], [ "lc_steel_standard", 3 ], - [ "armor_chainmail_assembling", 1 ], + [ "armor_lc_chainmail_assembling", 1 ], [ "carbon", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json index 45997296003b5..1f1d8bd4323e8 100644 --- a/data/json/recipes/armor/torso.json +++ b/data/json/recipes/armor/torso.json @@ -439,7 +439,7 @@ "time": "2 h", "autolearn": true, "using": [ [ "tailoring_cotton_patchwork", 1 ], [ "fastener_small", 3 ] ], - "components": [ [ [ "wire", 1 ] ] ], + "components": [ [ [ "lc_wire", 1 ] ] ], "proficiencies": [ { "proficiency": "prof_closures" } ] }, { @@ -448,7 +448,7 @@ "copy-from": "bra", "time": "3 h", "using": [ [ "tailoring_cotton_patchwork", 2 ], [ "fastener_small", 5 ] ], - "components": [ [ [ "wire", 2 ] ] ] + "components": [ [ [ "lc_wire", 2 ] ] ] }, { "result": "xs_bra", diff --git a/data/json/recipes/basecamps/base/fbmc_outpost/recipe_modular_outpost_cross.json b/data/json/recipes/basecamps/base/fbmc_outpost/recipe_modular_outpost_cross.json index 746a6fc3ae2fe..ce6d01fe92e32 100644 --- a/data/json/recipes/basecamps/base/fbmc_outpost/recipe_modular_outpost_cross.json +++ b/data/json/recipes/basecamps/base/fbmc_outpost/recipe_modular_outpost_cross.json @@ -178,7 +178,7 @@ "tools": [ ], "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "SCREW" } ], [ { "id": "WRENCH" } ] ], "components": [ - [ [ "sheet_metal", 2 ], [ "wire", 8 ] ], + [ [ "sheet_metal", 2 ], [ "lc_wire", 8 ] ], [ [ "pipe", 24 ] ], [ [ "processor", 2 ] ], [ [ "RAM", 2 ] ], diff --git a/data/json/recipes/basecamps/base/fbmc_outpost/recipe_modular_outpost_normal.json b/data/json/recipes/basecamps/base/fbmc_outpost/recipe_modular_outpost_normal.json index e996e2c331b41..1e9e1627aa07e 100644 --- a/data/json/recipes/basecamps/base/fbmc_outpost/recipe_modular_outpost_normal.json +++ b/data/json/recipes/basecamps/base/fbmc_outpost/recipe_modular_outpost_normal.json @@ -163,7 +163,7 @@ "tools": [ ], "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "SCREW" } ], [ { "id": "WRENCH" } ] ], "components": [ - [ [ "sheet_metal", 2 ], [ "wire", 8 ] ], + [ [ "sheet_metal", 2 ], [ "lc_wire", 8 ] ], [ [ "pipe", 24 ] ], [ [ "processor", 2 ] ], [ [ "RAM", 2 ] ], diff --git a/data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_common.json b/data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_common.json index ab156263e9fdf..561f65fbfcc5b 100644 --- a/data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_common.json +++ b/data/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_common.json @@ -234,7 +234,7 @@ [ "reinforced_solar_panel_v2", 8 ] ], [ [ "storage_battery", 4 ], [ "medium_storage_battery", 16 ] ], - [ [ "sheet_metal", 8 ], [ "wire", 32 ] ], + [ [ "sheet_metal", 8 ], [ "lc_wire", 32 ] ], [ [ "pipe", 24 ] ], [ [ "processor", 16 ] ], [ [ "RAM", 16 ] ], diff --git a/data/json/recipes/basecamps/base/recipe_bare_bones_basecamp/bare_bones_basecamp_recipe_groups.json b/data/json/recipes/basecamps/base/recipe_bare_bones_basecamp/bare_bones_basecamp_recipe_groups.json index 18cac58b1603e..179609f549a51 100644 --- a/data/json/recipes/basecamps/base/recipe_bare_bones_basecamp/bare_bones_basecamp_recipe_groups.json +++ b/data/json/recipes/basecamps/base/recipe_bare_bones_basecamp/bare_bones_basecamp_recipe_groups.json @@ -81,7 +81,7 @@ { "id": "metalworking_tongs", "description": " Craft: Pair of Flatjaw Tongs" }, { "id": "hotcut", "description": " Craft: Hotcut (chisel for metal working)" }, { "id": "nail", "description": " Craft: Nail" }, - { "id": "wire", "description": " Craft: Wire" }, + { "id": "lc_wire", "description": " Craft: Wire" }, { "id": "swage", "description": " Craft: Swage and Die Set" }, { "id": "blade", "description": " Craft: Blade" }, { "id": "bearing", "description": " Craft: Bearings" }, diff --git a/data/json/recipes/basecamps/base/recipe_modular_firestation_1/modular_firestation_recipe_groups.json b/data/json/recipes/basecamps/base/recipe_modular_firestation_1/modular_firestation_recipe_groups.json index 8014bce6a7bd0..063e8b6ed3d6d 100644 --- a/data/json/recipes/basecamps/base/recipe_modular_firestation_1/modular_firestation_recipe_groups.json +++ b/data/json/recipes/basecamps/base/recipe_modular_firestation_1/modular_firestation_recipe_groups.json @@ -98,7 +98,7 @@ { "id": "hammer", "description": " Craft: Hammer" }, { "id": "tongs", "description": " Craft: Pair of kitchen tongs" }, { "id": "nail", "description": " Craft: Nail" }, - { "id": "wire", "description": " Craft: Wire" }, + { "id": "lc_wire", "description": " Craft: Wire" }, { "id": "swage", "description": " Craft: Swage and Die Set" } ] }, @@ -310,7 +310,6 @@ { "id": "sheet_metal_npc_drop", "description": " Craft: Sheet Metal, Drop Hammer" }, { "id": "chain_npc_drop", "description": " Craft: Chain, Drop Hammer" }, { "id": "nail_npc_drop", "description": " Craft: Nail, Drop Hammer" }, - { "id": "wire_npc_drop", "description": " Craft: Wire, Drop Hammer" }, { "id": "pipe_npc_drop", "description": " Craft: Pipe, Drop Hammer" }, { "id": "rebar_npc_drop", "description": " Craft: Rebar, Drop Hammer" } ] diff --git a/data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_common.json b/data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_common.json index ebbb028cd38cf..1cec23efd6ed4 100644 --- a/data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_common.json +++ b/data/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_common.json @@ -493,7 +493,7 @@ [ "reinforced_solar_panel_v2", 2 ] ], [ [ "storage_battery", 1 ], [ "medium_storage_battery", 4 ], [ "small_storage_battery", 32 ] ], - [ [ "sheet_metal", 2 ], [ "wire", 8 ] ], + [ [ "sheet_metal", 2 ], [ "lc_wire", 8 ] ], [ [ "pipe", 24 ] ] ], "check_blueprint_needs": false diff --git a/data/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_common.json b/data/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_common.json index dec7d5aa3b038..80ec8e12fcf75 100644 --- a/data/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_common.json +++ b/data/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_common.json @@ -435,7 +435,7 @@ [ "reinforced_solar_panel_v2", 2 ] ], [ [ "storage_battery", 1 ], [ "medium_storage_battery", 4 ], [ "small_storage_battery", 32 ] ], - [ [ "sheet_metal", 2 ], [ "wire", 8 ] ], + [ [ "sheet_metal", 2 ], [ "lc_wire", 8 ] ], [ [ "pipe", 24 ] ] ], "check_blueprint_needs": false diff --git a/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/modular_workshop_recipe_groups.json b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/modular_workshop_recipe_groups.json index a7de8e36dcf44..817085805bdac 100644 --- a/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/modular_workshop_recipe_groups.json +++ b/data/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/modular_workshop_recipe_groups.json @@ -73,7 +73,6 @@ { "id": "metalworking_tongs_casting", "description": " Craft: Pair of Flatjaw Tongs" }, { "id": "hotcut", "description": " Craft: Hotcut (chisel for metal working)" }, { "id": "nail", "description": " Craft: Nail" }, - { "id": "wire", "description": " Craft: Wire" }, { "id": "swage", "description": " Craft: Swage and Die Set" }, { "id": "lc_wire", "description": " Craft: Mild Steel, Wire" }, { "id": "lc_chain_link_fabrication", "description": " Craft: Mild Steel, Link" }, @@ -102,9 +101,7 @@ { "id": "ch_link_sheet", "description": " Craft: Hardened Steel, Link Sheet" }, { "id": "mc_wire", "description": " Craft: Medium Steel, Wire" }, { "id": "mc_chain_link_fabrication", "description": " Craft: Medium Steel, Link" }, - { "id": "mc_link_sheet", "description": " Craft: Medium Steel, Link Sheet" }, - { "id": "chain_link_fabrication", "description": " Craft: Steel, Link" }, - { "id": "link_sheet_fabrication", "description": " Craft: Steel, Link Sheet" } + { "id": "mc_link_sheet", "description": " Craft: Medium Steel, Link Sheet" } ] }, { @@ -299,7 +296,6 @@ { "id": "sheet_metal_npc_drop", "description": " Craft: Sheet Metal, Drop Hammer" }, { "id": "chain_npc_drop", "description": " Craft: Chain, Drop Hammer" }, { "id": "nail_npc_drop", "description": " Craft: Nail, Drop Hammer" }, - { "id": "wire_npc_drop", "description": " Craft: Wire, Drop Hammer" }, { "id": "pipe_npc_drop", "description": " Craft: Pipe, Drop Hammer" }, { "id": "rebar_npc_drop", "description": " Craft: Rebar, Drop Hammer" } ] diff --git a/data/json/recipes/basecamps/recipe_groups.json b/data/json/recipes/basecamps/recipe_groups.json index 6a45004645072..0824a589d0353 100644 --- a/data/json/recipes/basecamps/recipe_groups.json +++ b/data/json/recipes/basecamps/recipe_groups.json @@ -451,7 +451,6 @@ { "id": "hammer", "description": " Craft: Hammer" }, { "id": "tongs", "description": " Craft: Pair of Kitchen Tongs" }, { "id": "nail", "description": " Craft: Nail" }, - { "id": "wire", "description": " Craft: Wire" }, { "id": "swage", "description": " Craft: Swage and Die Set" }, { "id": "mc_wire", "description": " Craft: Medium Steel, Wire" }, { "id": "mc_chain_link_fabrication", "description": " Craft: Medium Steel, Link" }, @@ -476,9 +475,7 @@ { "id": "hammer_sledge_from_scratch", "description": " Craft: Hammer, Sledge" }, { "id": "ch_wire", "description": " Craft: Hardened Steel, Wire" }, { "id": "ch_chain_link_fabrication", "description": " Craft: Hardened Steel, Link" }, - { "id": "ch_link_sheet", "description": " Craft: Hardened Steel, Link Sheet" }, - { "id": "chain_link_fabrication", "description": " Craft: Steel, Link" }, - { "id": "link_sheet_fabrication", "description": " Craft: Steel, Link Sheet" } + { "id": "ch_link_sheet", "description": " Craft: Hardened Steel, Link Sheet" } ] }, { @@ -678,7 +675,6 @@ { "id": "sheet_metal_npc_drop", "description": " Craft: Sheet Metal, Drop Hammer" }, { "id": "chain_npc_drop", "description": " Craft: Chain, Drop Hammer" }, { "id": "nail_npc_drop", "description": " Craft: Nail, Drop Hammer" }, - { "id": "wire_npc_drop", "description": " Craft: Wire, Drop Hammer" }, { "id": "pipe_npc_drop", "description": " Craft: Pipe, Drop Hammer" }, { "id": "rebar_npc_drop", "description": " Craft: Rebar, Drop Hammer" } ] diff --git a/data/json/recipes/nested.json b/data/json/recipes/nested.json index 406f924e02ea4..5e6db0cd6d968 100644 --- a/data/json/recipes/nested.json +++ b/data/json/recipes/nested.json @@ -7066,7 +7066,7 @@ "name": "chainmail sheets", "description": "Recipes related to making sheets of chainmail of different steel qualities.", "skill_used": "fabrication", - "nested_category_data": [ "link_sheet_fabrication", "lc_link_sheet", "mc_link_sheet", "hc_link_sheet", "ch_link_sheet", "qt_link_sheet" ], + "nested_category_data": [ "lc_link_sheet", "mc_link_sheet", "hc_link_sheet", "ch_link_sheet", "qt_link_sheet" ], "difficulty": 3 }, { diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json index c055cf36745cb..2b41d68db106a 100644 --- a/data/json/recipes/other/materials.json +++ b/data/json/recipes/other/materials.json @@ -1413,7 +1413,7 @@ "components": [ [ [ "rolling_paper", 1 ] ], [ [ "chem_black_powder", 3 ], [ "red_phosphorous_small", 3 ], [ "gunpowder", 30 ] ] ] }, { - "result": "wire", + "result": "lc_wire", "type": "recipe", "activity_level": "MODERATE_EXERCISE", "category": "CC_OTHER", diff --git a/data/json/recipes/other/parts.json b/data/json/recipes/other/parts.json index 2fe57ffdaa93d..90cc225a3cd5b 100644 --- a/data/json/recipes/other/parts.json +++ b/data/json/recipes/other/parts.json @@ -626,7 +626,7 @@ "//": "20cm weld", "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_welding_basic" }, { "proficiency": "prof_welding" } ], "qualities": [ { "id": "SAW_M", "level": 1 } ], - "components": [ [ [ "omnicamera", 1 ] ], [ [ "wire", 4 ] ] ] + "components": [ [ [ "omnicamera", 1 ] ], [ [ "mc_wire", 4 ], [ "hc_wire", 4 ], [ "ch_wire", 4 ], [ "qt_wire", 4 ] ] ] }, { "type": "recipe", @@ -839,7 +839,7 @@ "components": [ [ [ "pipe", 6 ] ], [ [ "steel_chunk", 4 ], [ "scrap", 12 ] ], - [ [ "wire", 3 ] ], + [ [ "any_wire", 3, "LIST" ] ], [ [ "cable", 10 ] ], [ [ "pipe_fittings", 4 ] ] ] @@ -863,7 +863,7 @@ "components": [ [ [ "processor", 1 ] ], [ [ "scrap", 2 ] ], - [ [ "wire", 5 ] ], + [ [ "any_wire", 5, "LIST" ] ], [ [ "power_supply", 2 ] ], [ [ "transponder", 1 ] ], [ [ "e_scrap", 2 ] ], diff --git a/data/json/recipes/other/parts_construction.json b/data/json/recipes/other/parts_construction.json index 7fd5f7ab60879..c288fd1a101ba 100644 --- a/data/json/recipes/other/parts_construction.json +++ b/data/json/recipes/other/parts_construction.json @@ -572,7 +572,7 @@ { "proficiency": "prof_welding" } ], "qualities": [ { "id": "SAW_M", "level": 1 } ], - "components": [ [ [ "glass_sheet", 1 ] ], [ [ "wire", 8 ] ] ] + "components": [ [ [ "glass_sheet", 1 ] ], [ [ "mc_wire", 8 ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/other/vehicle.json b/data/json/recipes/other/vehicle.json index 18b8134e7c493..eae68b4ed600a 100644 --- a/data/json/recipes/other/vehicle.json +++ b/data/json/recipes/other/vehicle.json @@ -29,7 +29,7 @@ "book_learn": [ [ "textbook_fabrication", 4 ], [ "textbook_mechanics", 2 ], [ "manual_mechanics", 2 ] ], "using": [ [ "welding_standard", 50 ], [ "steel_tiny", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 } ], - "components": [ [ [ "pipe", 8 ] ], [ [ "wire", 8 ] ], [ [ "pipe_fittings", 4 ] ] ] + "components": [ [ [ "pipe", 8 ] ], [ [ "any_wire", 8, "LIST" ] ], [ [ "pipe_fittings", 4 ] ] ] }, { "result": "pallet_lifter", @@ -116,7 +116,7 @@ [ [ "steel_standard", 1, "LIST" ] ], [ [ "clockworks", 2 ] ], [ [ "clockworks", 2 ], [ "lock", 1 ] ], - [ [ "wire", 1 ] ] + [ [ "any_wire", 1, "LIST" ] ] ] }, { @@ -166,7 +166,7 @@ "//": "60cm weld", "using": [ [ "rope_natural", 2 ], [ "welding_standard", 60 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 } ], - "components": [ [ [ "wire", 40 ] ], [ [ "pipe", 6 ] ], [ [ "pipe_fittings", 3 ] ] ] + "components": [ [ [ "any_wire", 40, "LIST" ] ], [ [ "pipe", 6 ] ], [ [ "pipe_fittings", 3 ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/recipe_companion.json b/data/json/recipes/recipe_companion.json index a6be5212eb6ed..8d9ae9ade3a89 100644 --- a/data/json/recipes/recipe_companion.json +++ b/data/json/recipes/recipe_companion.json @@ -64,7 +64,7 @@ { "type": "recipe", "activity_level": "MODERATE_EXERCISE", - "result": "wire", + "result": "lc_wire", "id_suffix": "npc_drop", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", diff --git a/data/json/recipes/recipe_music_instruments.json b/data/json/recipes/recipe_music_instruments.json index 751400eef0b14..bcc4d0f656120 100644 --- a/data/json/recipes/recipe_music_instruments.json +++ b/data/json/recipes/recipe_music_instruments.json @@ -16,7 +16,7 @@ [ [ "tonewood", 2 ] ], [ [ "super_glue", 2 ] ], [ [ "wood_panel", 1 ] ], - [ [ "piano_wire", 5 ] ], + [ [ "qt_wire", 5 ] ], [ [ "tuning_pegs", 5 ] ] ] }, @@ -37,7 +37,7 @@ [ [ "tonewood", 3 ] ], [ [ "super_glue", 2 ] ], [ [ "wood_panel", 1 ] ], - [ [ "piano_wire", 5 ] ], + [ [ "qt_wire", 5 ] ], [ [ "tuning_pegs", 5 ] ] ] }, @@ -58,7 +58,7 @@ [ [ "tonewood", 2 ] ], [ [ "super_glue", 2 ] ], [ [ "wood_panel", 1 ] ], - [ [ "piano_wire", 6 ] ], + [ [ "qt_wire", 6 ] ], [ [ "tuning_pegs", 6 ] ] ] }, diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index c5259635fc314..16f1c54cd9bdf 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -138,7 +138,7 @@ [ "birchbark_funnel", 1 ], [ "leather_funnel", 1 ] ], - [ [ "wire", 6 ], [ "rope_6", 6 ], [ "vine_6", 6 ], [ "rope_makeshift_6", 6 ] ], + [ [ "any_wire", 6, "LIST" ], [ "rope_6", 6 ], [ "vine_6", 6 ], [ "rope_makeshift_6", 6 ] ], [ [ "chain", 1 ], [ "rope_natural", 1, "LIST" ] ], [ [ "rebar", 2 ], [ "steel_chunk", 4 ] ], [ [ "rock", 40 ] ] @@ -177,7 +177,7 @@ [ "birchbark_funnel", 1 ], [ "leather_funnel", 1 ] ], - [ [ "wire", 6 ], [ "rope_6", 6 ], [ "vine_6", 6 ], [ "rope_makeshift_6", 6 ] ], + [ [ "any_wire", 6, "LIST" ], [ "rope_6", 6 ], [ "vine_6", 6 ], [ "rope_makeshift_6", 6 ] ], [ [ "chain", 1 ], [ "rope_natural", 1, "LIST" ] ], [ [ "rebar", 2 ], [ "steel_chunk", 4 ] ], [ [ "rock", 40 ] ] @@ -679,47 +679,6 @@ "flags": [ "BLIND_HARD" ], "components": [ [ [ "paper", 1 ] ] ] }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "wire", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "fabrication", - "difficulty": 3, - "time": "3 h", - "result_mult": 6, - "autolearn": true, - "using": [ [ "blacksmithing_scrap", 1 ] ], - "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ], - "components": [ [ [ "scrap", 1 ] ] ] - }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "wire", - "id_suffix": "wire_draw_machine", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "fabrication", - "difficulty": 3, - "time": "1 h 30 m", - "result_mult": 6, - "autolearn": true, - "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ], - "proficiencies": [ - { "proficiency": "prof_metalworking" }, - { "proficiency": "prof_blacksmithing" }, - { "proficiency": "prof_wiremaking" } - ], - "tools": [ - [ [ "metalworking_tongs_any", 1, "LIST" ] ], - [ [ "hotcut_any", 1, "LIST" ] ], - [ [ "forge", 40 ], [ "oxy_torch", 40 ] ], - [ [ "wire_draw_machine", 100 ] ] - ], - "components": [ [ [ "scrap", 1 ] ] ] - }, { "type": "recipe", "activity_level": "MODERATE_EXERCISE", @@ -947,7 +906,7 @@ "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 3 } ], "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], - "components": [ [ [ "wire", 2 ] ] ] + "components": [ [ [ "lc_wire", 2 ] ] ] }, { "type": "recipe", @@ -1113,7 +1072,7 @@ "decomp_learn": 0, "flags": [ "BLIND_HARD" ], "book_learn": [ [ "adv_chemistry", 1 ], [ "textbook_chemistry", 1 ] ], - "components": [ [ [ "cable", 10 ], [ "wire", 1 ] ], [ [ "hotplate", 1 ] ], [ [ "chemistry_set_basic", 1 ] ] ] + "components": [ [ [ "cable", 10 ], [ "any_wire", 1, "LIST" ] ], [ [ "hotplate", 1 ] ], [ [ "chemistry_set_basic", 1 ] ] ] }, { "type": "recipe", @@ -1185,10 +1144,7 @@ [ "mag_mechanics", 2 ], [ "mag_rifle", 2 ] ], - "components": [ - [ [ "wire", 2 ], [ "mc_wire", 2 ], [ "hc_wire", 2 ], [ "qt_wire", 2 ], [ "ch_wire", 2 ], [ "cable", 2 ] ], - [ [ "yarn", 1 ], [ "cotton_ball", 1 ], [ "wool_staple", 1 ] ] - ] + "components": [ [ [ "any_wire", 2, "LIST" ], [ "cable", 2 ] ], [ [ "yarn", 1 ], [ "cotton_ball", 1 ], [ "wool_staple", 1 ] ] ] }, { "type": "recipe", @@ -2523,21 +2479,6 @@ "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_case_hardening" } ], "tools": [ [ [ "forge", 16 ] ], [ [ "metalworking_tongs_any", 1, "LIST" ] ] ] }, - { - "type": "recipe", - "activity_level": "BRISK_EXERCISE", - "result": "chain_link", - "id_suffix": "fabrication", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "fabrication", - "difficulty": 2, - "time": "5 m", - "book_learn": [ [ "textbook_armwest", 1 ], [ "textbook_fabrication", 1 ], [ "recipe_melee", 1 ] ], - "qualities": [ { "id": "WRENCH", "level": 1 } ], - "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ], - "components": [ [ [ "wire", 1 ] ] ] - }, { "type": "recipe", "activity_level": "BRISK_EXERCISE", @@ -2613,21 +2554,6 @@ "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ], "components": [ [ [ "qt_wire", 1 ] ] ] }, - { - "type": "recipe", - "activity_level": "BRISK_EXERCISE", - "//": "1kg per sheet, wire is 0.15kg, links need to cover 850g = 2550 links", - "result": "link_sheet", - "id_suffix": "fabrication", - "category": "CC_*", - "subcategory": "CSC_*_NESTED", - "skill_used": "fabrication", - "difficulty": 3, - "time": "10 h", - "book_learn": [ [ "textbook_armwest", 2 ], [ "textbook_fabrication", 2 ], [ "recipe_melee", 2 ] ], - "using": [ [ "chainmail_standard", 1 ] ], - "components": [ [ [ "chain_link", 2550 ] ], [ [ "wire", 1 ] ] ] - }, { "type": "recipe", "activity_level": "BRISK_EXERCISE", @@ -2882,7 +2808,7 @@ [ [ "scrap", 6 ] ], [ [ "pipe", 18 ], [ "cu_pipe", 18 ], [ "frame", 3 ] ], [ [ "nails", 12, "LIST" ] ], - [ [ "wire", 6 ], [ "rope_6", 6 ], [ "vine_6", 6 ], [ "rope_makeshift_6", 6 ] ], + [ [ "any_wire", 6, "LIST" ], [ "rope_6", 6 ], [ "vine_6", 6 ], [ "rope_makeshift_6", 6 ] ], [ [ "chain", 1 ], [ "rope_natural", 1, "LIST" ] ], [ [ "spike", 4 ] ], [ [ "pipe_fittings", 15 ] ] @@ -2910,7 +2836,7 @@ [ [ "scrap", 6 ] ], [ [ "pipe", 15 ], [ "cu_pipe", 15 ], [ "frame", 2 ] ], [ [ "nails", 12, "LIST" ] ], - [ [ "wire", 6 ], [ "rope_natural_short", 6, "LIST" ] ], + [ [ "any_wire", 6, "LIST" ], [ "rope_natural_short", 6, "LIST" ] ], [ [ "spike", 4 ] ], [ [ "pipe_fittings", 30 ] ] ] diff --git a/data/json/recipes/recipe_traps.json b/data/json/recipes/recipe_traps.json index 86b65b1d86f71..d9b0387d4ce70 100644 --- a/data/json/recipes/recipe_traps.json +++ b/data/json/recipes/recipe_traps.json @@ -44,7 +44,7 @@ "using": [ [ "welding_standard", 5 ] ], "proficiencies": [ { "proficiency": "prof_welding_basic" }, { "proficiency": "prof_metalworking" } ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "VISE", "level": 1 } ], - "components": [ [ [ "wire_barbed", 10 ], [ "wire", 10 ], [ "nails", 10, "LIST" ] ] ] + "components": [ [ [ "wire_barbed", 10 ], [ "any_wire", 10, "LIST" ], [ "nails", 10, "LIST" ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/recipe_vehicle.json b/data/json/recipes/recipe_vehicle.json index a0b1b49d8acfd..1426b374f1534 100644 --- a/data/json/recipes/recipe_vehicle.json +++ b/data/json/recipes/recipe_vehicle.json @@ -459,7 +459,7 @@ [ [ "antenna", 1 ] ], [ [ "e_scrap", 5 ] ], [ [ "amplifier", 1 ] ], - [ [ "wire", 6 ] ], + [ [ "any_wire", 6, "LIST" ] ], [ [ "circuit", 2 ] ], [ [ "processor", 1 ] ], [ [ "RAM", 1 ] ], @@ -508,7 +508,7 @@ "//": "15cm weld", "using": [ [ "welding_standard", 15 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ], - "components": [ [ [ "large_space_heater", 1 ] ], [ [ "wire", 2 ] ] ] + "components": [ [ [ "large_space_heater", 1 ] ], [ [ "any_wire", 2, "LIST" ] ] ] }, { "result": "mountable_heater_small", @@ -525,7 +525,7 @@ "//": "15cm weld", "using": [ [ "welding_standard", 15 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ], - "components": [ [ [ "small_space_heater", 1 ] ], [ [ "wire", 2 ] ] ] + "components": [ [ [ "small_space_heater", 1 ] ], [ [ "any_wire", 2, "LIST" ] ] ] }, { "result": "mountable_cooler", @@ -551,7 +551,7 @@ [ [ "motor_tiny", 2 ] ], [ [ "refrigerant_tank", 1 ] ], [ [ "plastic_chunk", 11 ] ], - [ [ "wire", 4 ] ], + [ [ "any_wire", 4, "LIST" ] ], [ [ "scrap", 1 ] ] ] }, @@ -588,7 +588,7 @@ "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 2 }, { "id": "DRILL", "level": 2 } ], "components": [ [ [ "sheet_metal", 3 ] ], - [ [ "wire", 6 ] ], + [ [ "any_wire", 6, "LIST" ] ], [ [ "hose", 1 ], [ "makeshift_hose", 1 ] ], [ [ "e_scrap", 3 ] ], [ [ "circuit", 1 ] ], @@ -616,7 +616,7 @@ "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 2 }, { "id": "DRILL", "level": 2 } ], "components": [ [ [ "sheet_metal", 3 ] ], - [ [ "wire", 6 ] ], + [ [ "any_wire", 6, "LIST" ] ], [ [ "hose", 1 ], [ "makeshift_hose", 1 ] ], [ [ "e_scrap", 3 ] ], [ [ "circuit", 1 ] ], @@ -815,7 +815,7 @@ "autolearn": true, "proficiencies": [ { "proficiency": "prof_carpentry_basic" } ], "qualities": [ { "id": "DRILL", "level": 1 }, { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ], - "components": [ [ [ "nail", 12 ] ], [ [ "2x4", 2 ] ], [ [ "wire", 1 ] ] ] + "components": [ [ [ "nail", 12 ] ], [ [ "2x4", 2 ] ], [ [ "any_wire", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -893,7 +893,7 @@ "autolearn": true, "//": "40cm weld", "using": [ [ "welding_standard", 40 ], [ "cutting_wire_standard", 1 ] ], - "components": [ [ [ "wire", 40 ] ] ] + "components": [ [ [ "lc_wire", 40 ] ] ] }, { "type": "recipe", @@ -908,7 +908,7 @@ "autolearn": true, "//": "45cm weld", "using": [ [ "welding_standard", 45 ], [ "cutting_wire_standard", 1 ] ], - "components": [ [ [ "wire", 40 ], [ "basket", 1 ] ], [ [ "scrap", 8 ] ] ] + "components": [ [ [ "lc_wire", 40 ], [ "basket", 1 ] ], [ [ "scrap", 8 ] ] ] }, { "type": "recipe", @@ -923,7 +923,7 @@ "autolearn": true, "//": "10cm weld", "using": [ [ "welding_standard", 10 ], [ "cutting_wire_standard", 1 ] ], - "components": [ [ [ "wire", 8 ] ] ] + "components": [ [ [ "lc_wire", 8 ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/tools/containers.json b/data/json/recipes/tools/containers.json index 921bb75a41a1d..e81561d0e2654 100644 --- a/data/json/recipes/tools/containers.json +++ b/data/json/recipes/tools/containers.json @@ -979,7 +979,7 @@ "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_carving" } ], "components": [ [ [ "2x4", 2 ] ], - [ [ "wire", 1 ], [ "scrap", 2 ], [ "copper_scrap_equivalent", 1, "LIST" ] ], + [ [ "any_wire", 1, "LIST" ], [ "scrap", 2 ], [ "copper_scrap_equivalent", 1, "LIST" ] ], [ [ "cotton_patchwork", 2 ], [ "felt_patch", 2 ], [ "leather", 2 ], [ "fur", 2 ] ] ] }, diff --git a/data/json/recipes/tools/lights.json b/data/json/recipes/tools/lights.json index 11fc63cdafd43..2cf7b0d93cb82 100644 --- a/data/json/recipes/tools/lights.json +++ b/data/json/recipes/tools/lights.json @@ -270,7 +270,7 @@ [ [ "betavoltaic", 4 ] ], [ [ "power_supply", 1 ] ], [ [ "scrap", 2 ] ], - [ [ "wire", 2 ] ], + [ [ "any_wire", 2, "LIST" ] ], [ [ "lens", 1 ], [ "lens_small", 1 ] ], [ [ "cotton_patchwork", 4 ], @@ -366,7 +366,7 @@ "using": [ [ "welding_standard", 25 ], [ "glue_strong", 10 ] ], "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_welding_basic" }, { "proficiency": "prof_welding" } ], "qualities": [ { "id": "SAW_M", "level": 1 } ], - "components": [ [ [ "car_headlight", 1 ] ], [ [ "wire", 2 ] ] ] + "components": [ [ [ "car_headlight", 1 ] ], [ [ "mc_wire", 2 ], [ "hc_wire", 2 ], [ "ch_wire", 2 ], [ "qt_wire", 2 ] ] ] }, { "type": "recipe", @@ -382,7 +382,7 @@ "using": [ [ "welding_standard", 25 ], [ "glue_strong", 15 ] ], "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_welding_basic" }, { "proficiency": "prof_welding" } ], "qualities": [ { "id": "SAW_M", "level": 1 } ], - "components": [ [ [ "car_wide_headlight", 1 ] ], [ [ "wire", 3 ] ] ] + "components": [ [ [ "car_wide_headlight", 1 ] ], [ [ "mc_wire", 3 ], [ "hc_wire", 3 ], [ "ch_wire", 3 ], [ "qt_wire", 3 ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/tools/tool.json b/data/json/recipes/tools/tool.json index 6ab22c1a82003..8289389a3387d 100644 --- a/data/json/recipes/tools/tool.json +++ b/data/json/recipes/tools/tool.json @@ -295,7 +295,6 @@ "//": "First item in the components list is serving as a torsion wrench. Many small flat items can be jammed in and turned to apply torsion. Second item in the list is the pick itself which has to be a small, bent bit of wire or pin.", "components": [ [ - [ "wire", 1 ], [ "hairpin", 1 ], [ "fc_hairpin", 1 ], [ "copper_hairpin", 1 ], @@ -305,24 +304,9 @@ [ "knife_small", 1 ], [ "knife_butter", 1 ], [ "fork", 1 ], - [ "lc_wire", 1 ], - [ "hc_wire", 1 ], - [ "ch_wire", 1 ], - [ "lc_wire", 1 ], - [ "mc_wire", 1 ], - [ "qt_wire", 1 ] + [ "any_wire", 1, "LIST" ] ], - [ - [ "wire", 1 ], - [ "hairpin", 1 ], - [ "cable", 1 ], - [ "lc_wire", 1 ], - [ "hc_wire", 1 ], - [ "ch_wire", 1 ], - [ "lc_wire", 1 ], - [ "mc_wire", 1 ], - [ "qt_wire", 1 ] - ] + [ [ "hairpin", 1 ], [ "cable", 1 ], [ "any_wire", 1, "LIST" ] ] ] }, { @@ -539,7 +523,7 @@ ], "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], "using": [ [ "sewing_standard", 100 ], [ "cordage", 2 ] ], - "components": [ [ [ "leather", 30 ], [ "tanned_hide", 5 ], [ "fur", 30 ], [ "tanned_pelt", 5 ] ], [ [ "wire", 2 ] ] ] + "components": [ [ [ "leather", 30 ], [ "tanned_hide", 5 ], [ "fur", 30 ], [ "tanned_pelt", 5 ] ], [ [ "any_wire", 2, "LIST" ] ] ] }, { "result": "jack", @@ -876,7 +860,7 @@ "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 } ], - "components": [ [ [ "wire", 4 ] ] ] + "components": [ [ [ "lc_wire", 4 ] ] ] }, { "type": "recipe", @@ -1041,7 +1025,7 @@ "time": "2 m", "reversible": true, "autolearn": true, - "components": [ [ [ "wire_mesh", 1 ] ], [ [ "wire", 1 ] ] ] + "components": [ [ [ "wire_mesh", 1 ] ], [ [ "lc_wire", 1 ] ] ] }, { "result": "sieve_primitive", @@ -1512,7 +1496,7 @@ "autolearn": true, "proficiencies": [ { "proficiency": "prof_plasticworking" } ], "using": [ [ "soldering_standard", 10 ], [ "plastic_molding", 3 ] ], - "components": [ [ [ "plastic_chunk", 4 ] ], [ [ "lens", 1 ] ], [ [ "wire", 1 ] ] ] + "components": [ [ [ "plastic_chunk", 4 ] ], [ [ "lens", 1 ] ], [ [ "any_wire", 1, "LIST" ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/tools/tools_electronic.json b/data/json/recipes/tools/tools_electronic.json index 371c5f5649be9..7f241ba9a6575 100644 --- a/data/json/recipes/tools/tools_electronic.json +++ b/data/json/recipes/tools/tools_electronic.json @@ -11,7 +11,7 @@ "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "wire", 3 ], [ "cable", 30 ] ], [ [ "scrap", 2 ] ] ] + "components": [ [ [ "any_wire", 3, "LIST" ], [ "cable", 30 ] ], [ [ "scrap", 2 ] ] ] }, { "type": "recipe", @@ -408,7 +408,7 @@ "proficiencies": [ { "proficiency": "prof_elec_soldering", "skill_penalty": 0.125 }, { "proficiency": "prof_elec_circuits" } ], "components": [ [ [ "e_scrap", 2 ], [ "glowplug", 1 ] ], - [ [ "copper", 1 ], [ "nail", 1 ], [ "wire", 1 ] ], + [ [ "copper", 1 ], [ "nail", 1 ], [ "any_wire", 1, "LIST" ] ], [ [ "scrap", 1 ] ], [ [ "duct_tape", 10 ] ], [ [ "cable", 5 ] ] diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index 9b4dc08d54bba..2efd7c4aeb0bf 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -1371,12 +1371,7 @@ ], "proficiencies": [ { "proficiency": "prof_metalworking" } ], "tools": [ [ [ "bench_vise", -1 ] ] ], - "components": [ - [ [ "ruger_1022", 1 ] ], - [ [ "qt_wire", 1 ], [ "piano_wire", 1 ] ], - [ [ "sheet_metal_small", 2 ] ], - [ [ "super_glue", 5 ] ] - ] + "components": [ [ [ "ruger_1022", 1 ] ], [ [ "qt_wire", 1 ] ], [ [ "sheet_metal_small", 2 ] ], [ [ "super_glue", 5 ] ] ] }, { "type": "recipe", @@ -1399,11 +1394,6 @@ ], "proficiencies": [ { "proficiency": "prof_metalworking" } ], "tools": [ [ [ "bench_vise", -1 ] ] ], - "components": [ - [ [ "ruger_charger", 1 ] ], - [ [ "qt_wire", 1 ], [ "piano_wire", 1 ] ], - [ [ "sheet_metal_small", 2 ] ], - [ [ "super_glue", 5 ] ] - ] + "components": [ [ [ "ruger_charger", 1 ] ], [ [ "qt_wire", 1 ] ], [ [ "sheet_metal_small", 2 ] ], [ [ "super_glue", 5 ] ] ] } ] diff --git a/data/json/requirements/materials.json b/data/json/requirements/materials.json index 9dce20a21d479..c444e9127d513 100644 --- a/data/json/requirements/materials.json +++ b/data/json/requirements/materials.json @@ -369,7 +369,7 @@ "id": "rope_any_short", "type": "requirement", "//": "Materials used for lashing, when any rope or wire is sensible, per 216 g/180 cm of rope.", - "components": [ [ [ "rope_6", 1 ], [ "vine_6", 1 ], [ "rope_makeshift_6", 1 ], [ "wire", 1 ] ] ] + "components": [ [ [ "rope_6", 1 ], [ "vine_6", 1 ], [ "rope_makeshift_6", 1 ], [ "any_wire", 1, "LIST" ] ] ] }, { "id": "rope_superior", @@ -692,5 +692,11 @@ "type": "requirement", "//": "Prevents having to open condoms before crafts", "components": [ [ [ "condom", 1 ], [ "condom_sealed", 1 ] ] ] + }, + { + "id": "any_wire", + "type": "requirement", + "//": "All steel wires", + "components": [ [ [ "lc_wire", 1 ], [ "mc_wire", 1 ], [ "hc_wire", 1 ], [ "ch_wire", 1 ], [ "qt_wire", 1 ] ] ] } ] diff --git a/data/json/requirements/tailoring.json b/data/json/requirements/tailoring.json index 32af678cbbd9f..6a9121b994e5b 100644 --- a/data/json/requirements/tailoring.json +++ b/data/json/requirements/tailoring.json @@ -6,14 +6,6 @@ "qualities": [ { "id": "CUT", "level": 2 }, { "id": "SEW", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ], "components": [ [ [ "acidchitin_piece", 1 ] ], [ [ "filament", 1, "LIST" ] ] ] }, - { - "id": "armor_chainmail_assembling", - "type": "requirement", - "//": "Assembling chainmail rings into finished products, and riveting rings closed, per 1025 g of steel. It is assumed that each ring used comes with a prepared rivet. Time needed is 1 hour per unit (most of the time goes into making rings and then chainmail sheets first)", - "qualities": [ { "id": "WRENCH", "level": 1 } ], - "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ] ], - "components": [ [ [ "link_sheet", 1 ] ], [ [ "chain_link", 25 ] ] ] - }, { "id": "armor_lc_chainmail_assembling", "type": "requirement", diff --git a/data/json/uncraft/appliances/oven.json b/data/json/uncraft/appliances/oven.json index 5268e786a78b3..94de14f505790 100644 --- a/data/json/uncraft/appliances/oven.json +++ b/data/json/uncraft/appliances/oven.json @@ -31,7 +31,7 @@ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], - "components": [ [ [ "sheet_metal_small", 2 ] ], [ [ "spring", 1 ] ], [ [ "hinge", 1 ] ], [ [ "wire", 1 ] ], [ [ "e_scrap", 4 ] ] ] + "components": [ [ [ "sheet_metal_small", 2 ] ], [ [ "spring", 1 ] ], [ [ "hinge", 1 ] ], [ [ "lc_wire", 1 ] ], [ [ "e_scrap", 4 ] ] ] }, { "result": "oven_cabinet", diff --git a/data/json/uncraft/armor.json b/data/json/uncraft/armor.json index 7add3b8dc9a9f..0b2942fd93153 100644 --- a/data/json/uncraft/armor.json +++ b/data/json/uncraft/armor.json @@ -133,6 +133,6 @@ "activity_level": "LIGHT_EXERCISE", "time": "2 m", "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "cotton_patchwork", 2 ] ], [ [ "wire", 1 ] ], [ [ "button_plastic", 9 ] ] ] + "components": [ [ [ "cotton_patchwork", 2 ] ], [ [ "lc_wire", 1 ] ], [ [ "button_plastic", 9 ] ] ] } ] diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json index 468fbc240bf1b..a75dd17a65228 100644 --- a/data/json/uncraft/generic.json +++ b/data/json/uncraft/generic.json @@ -460,13 +460,7 @@ "difficulty": 1, "time": "22 s", "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ - [ [ "sheet_cotton", 7 ] ], - [ [ "cotton_patchwork", 4 ] ], - [ [ "sheet", 4 ] ], - [ [ "spring", 4 ] ], - [ [ "wire", 20 ] ] - ] + "components": [ [ [ "sheet_cotton", 7 ] ], [ [ "cotton_patchwork", 4 ] ], [ [ "sheet", 4 ] ], [ [ "hc_wire", 30 ] ] ] }, { "result": "character_sheet", diff --git a/data/json/uncraft/recipe_deconstruction.json b/data/json/uncraft/recipe_deconstruction.json index 179d76c8f8bcc..2a9f604ae64ec 100644 --- a/data/json/uncraft/recipe_deconstruction.json +++ b/data/json/uncraft/recipe_deconstruction.json @@ -2057,7 +2057,7 @@ "activity_level": "MODERATE_EXERCISE", "time": "20 m", "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 } ], - "components": [ [ [ "scrap", 10 ] ], [ [ "pipe", 8 ] ], [ [ "wire", 8 ] ] ] + "components": [ [ [ "scrap", 10 ] ], [ [ "pipe", 8 ] ], [ [ "lc_wire", 8 ] ] ] }, { "result": "cell_phone", @@ -3159,7 +3159,7 @@ "activity_level": "LIGHT_EXERCISE", "time": "3 m", "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "plastic_chunk", 3 ] ], [ [ "scrap_aluminum", 1 ] ], [ [ "wire", 5 ] ] ] + "components": [ [ [ "plastic_chunk", 3 ] ], [ [ "scrap_aluminum", 1 ] ], [ [ "lc_wire", 5 ] ] ] }, { "result": "lawnmower", @@ -3671,7 +3671,7 @@ "time": "15 m", "decomp_learn": 3, "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 } ], - "components": [ [ [ "pipe", 4 ] ], [ [ "scrap", 12 ] ], [ [ "wire", 2 ] ], [ [ "cable", 8 ] ] ] + "components": [ [ [ "pipe", 4 ] ], [ [ "scrap", 12 ] ], [ [ "lc_wire", 2 ] ], [ [ "cable", 8 ] ] ] }, { "result": "robot_controls", @@ -4444,14 +4444,6 @@ "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "scrap", 5 ] ] ] }, - { - "result": "wire", - "type": "uncraft", - "activity_level": "MODERATE_EXERCISE", - "time": "30 s", - "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "scrap", 1 ] ] ] - }, { "result": "wristwatch", "type": "uncraft", @@ -4718,7 +4710,7 @@ [ [ "steel_lump", 2 ] ], [ [ "scrap", 14 ] ], [ [ "steel_plate", 3 ] ], - [ [ "wire", 2 ] ], + [ [ "lc_wire", 2 ] ], [ [ "plastic_chunk", 8 ] ], [ [ "motor_small", 1 ] ] ] @@ -5713,7 +5705,7 @@ "difficulty": 1, "time": "5 m", "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "plastic_chunk", 3 ] ], [ [ "motor_micro", 1 ] ], [ [ "cable", 1 ] ], [ [ "element", 1 ] ], [ [ "wire", 2 ] ] ] + "components": [ [ [ "plastic_chunk", 3 ] ], [ [ "motor_micro", 1 ] ], [ [ "cable", 1 ] ], [ [ "element", 1 ] ], [ [ "lc_wire", 2 ] ] ] }, { "result": "curling_iron", @@ -5723,7 +5715,7 @@ "difficulty": 1, "time": "10 m", "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "element", 1 ] ], [ [ "ceramic_shard", 1 ] ], [ [ "scrap", 1 ] ], [ [ "cable", 1 ] ], [ [ "wire", 2 ] ] ] + "components": [ [ [ "element", 1 ] ], [ [ "ceramic_shard", 1 ] ], [ [ "scrap", 1 ] ], [ [ "cable", 1 ] ], [ [ "lc_wire", 2 ] ] ] }, { "result": "string_floss", diff --git a/data/json/uncraft/tools.json b/data/json/uncraft/tools.json index dfff880509c0f..46d0b95b1eb22 100644 --- a/data/json/uncraft/tools.json +++ b/data/json/uncraft/tools.json @@ -17,7 +17,7 @@ "difficulty": 1, "time": "50 s", "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "wire", 4 ] ], [ [ "splinter", 8 ] ] ] + "components": [ [ [ "lc_wire", 4 ] ], [ [ "splinter", 8 ] ] ] }, { "result": "hose_garden", @@ -194,7 +194,7 @@ "difficulty": 1, "time": "30 s", "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "plastic_chunk", 4 ] ], [ [ "lens", 1 ] ], [ [ "wire", 1 ] ] ] + "components": [ [ [ "plastic_chunk", 4 ] ], [ [ "lens", 1 ] ], [ [ "lc_wire", 1 ] ] ] }, { "result": "survivor_scope", @@ -217,7 +217,7 @@ "components": [ [ [ "string_36", 6 ] ], [ [ "fishing_hook_basic", 1 ] ], - [ [ "wire", 1 ] ], + [ [ "qt_wire", 1 ] ], [ [ "scrap", 1 ] ], [ [ "bismuth", 200 ] ] ] @@ -233,7 +233,7 @@ "components": [ [ [ "string_36", 6 ] ], [ [ "fishing_hook_basic", 1 ] ], - [ [ "wire", 1 ] ], + [ [ "qt_wire", 1 ] ], [ [ "scrap", 1 ] ], [ [ "bismuth", 200 ] ] ] @@ -250,7 +250,7 @@ "components": [ [ [ "string_36", 6 ] ], [ [ "fishing_hook_basic", 1 ] ], - [ [ "wire", 1 ] ], + [ [ "qt_wire", 1 ] ], [ [ "scrap", 1 ] ], [ [ "bismuth", 200 ] ] ] @@ -266,7 +266,7 @@ "components": [ [ [ "string_36", 6 ] ], [ [ "fishing_hook_basic", 1 ] ], - [ [ "wire", 1 ] ], + [ [ "qt_wire", 1 ] ], [ [ "scrap", 2 ] ], [ [ "bismuth", 200 ] ] ] @@ -283,7 +283,7 @@ "components": [ [ [ "string_36", 6 ] ], [ [ "fishing_hook_basic", 1 ] ], - [ [ "wire", 1 ] ], + [ [ "qt_wire", 1 ] ], [ [ "scrap", 2 ] ], [ [ "bismuth", 200 ] ] ] diff --git a/data/json/vehicleparts/vehicle_parts.json b/data/json/vehicleparts/vehicle_parts.json index ac065b8059963..b978dbb54ef67 100644 --- a/data/json/vehicleparts/vehicle_parts.json +++ b/data/json/vehicleparts/vehicle_parts.json @@ -227,8 +227,7 @@ { "count": [ 0, 2 ], "item": "sheet_cotton" }, { "count": [ 0, 5 ], "item": "cotton_patchwork" }, { "count": [ 9, 50 ], "item": "scrap_cotton" }, - { "count": [ 0, 1 ], "item": "spring" }, - { "count": [ 0, 2 ], "item": "wire" }, + { "count": [ 0, 16 ], "item": "hc_wire" }, { "charges": [ 3, 8 ], "item": "scrap" } ], "damage_reduction": { "all": 3, "bash": 5 }, diff --git a/data/json/vehicleparts/windshields.json b/data/json/vehicleparts/windshields.json index 9c20e431cac2d..43a8f49eccac3 100644 --- a/data/json/vehicleparts/windshields.json +++ b/data/json/vehicleparts/windshields.json @@ -79,7 +79,7 @@ "id": "reinforced_windshield", "type": "vehicle_part", "copy-from": "windshield", - "breaks_into": [ { "count": [ 25, 50 ], "item": "glass_shard" }, { "count": [ 4, 8 ], "item": "wire" } ], + "breaks_into": [ { "count": [ 25, 50 ], "item": "glass_shard" }, { "count": [ 4, 8 ], "item": "mc_wire" } ], "damage_modifier": 80, "damage_reduction": { "all": 16 }, "description": "A sheet of glass that lets you see outside the vehicle. Reinforced with wire to make it harder to break than normal glass.",