Obsolete and migrate legacy wire (CleverRaven#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>
NetSysFire · Sep 18, 2024 · abbb6ce · abbb6ce
1 parent 72a5b8a
commit abbb6ce
Show file tree

Hide file tree

Showing 78 changed files with 320 additions and 367 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -195,15 +195,19 @@
         { "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": {
       "str_min": 6,
       "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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 ] }
       ]
     }