Skip to content

Commit abbb6ce

Browse files
XygenSSMaleclypse
andauthored
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>
1 parent 72a5b8a commit abbb6ce

File tree

78 files changed

+320
-367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+320
-367
lines changed

data/json/construction/embrasures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"components": [
6464
[ [ "log", 3 ] ],
6565
[
66-
[ "wire", 6 ],
66+
[ "lc_wire", 6 ],
6767
[ "wire_barbed", 4 ],
6868
[ "rope_6", 2 ],
6969
[ "rope_natural_short", 2, "LIST" ],

data/json/construction/floors_indoors.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@
565565
[ { "id": "DRILL", "level": 1 } ]
566566
],
567567
"components": [
568-
[ [ "wire", 16 ], [ "spike", 16 ], [ "nails", 32, "LIST" ] ],
568+
[ [ "lc_wire", 16 ], [ "spike", 16 ], [ "nails", 32, "LIST" ] ],
569569
[ [ "sheet_metal_small", 20 ], [ "scrap", 40 ] ],
570570
[
571571
[ "sheet_metal", 4 ],
@@ -629,7 +629,13 @@
629629
"qualities": [ [ { "id": "DIG", "level": 2 } ] ],
630630
"components": [
631631
[ [ "log", 3 ] ],
632-
[ [ "wire", 6 ], [ "wire_barbed", 4 ], [ "rope_natural_short", 2, "LIST" ], [ "chain", 1 ], [ "vine_30", 1 ] ]
632+
[
633+
[ "lc_wire", 6 ],
634+
[ "wire_barbed", 4 ],
635+
[ "rope_natural_short", 2, "LIST" ],
636+
[ "chain", 1 ],
637+
[ "vine_30", 1 ]
638+
]
633639
],
634640
"pre_terrain": "t_pit",
635641
"post_terrain": "t_palisade"

data/json/construction/furniture_terrains.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@
564564
[ { "id": "DRILL", "level": 1 } ]
565565
],
566566
"components": [
567-
[ [ "wire", 16 ], [ "spike", 16 ], [ "nails", 32, "LIST" ] ],
567+
[ [ "lc_wire", 16 ], [ "spike", 16 ], [ "nails", 32, "LIST" ] ],
568568
[ [ "sheet_metal_small", 10 ], [ "scrap", 10 ] ],
569569
[ [ "sheet_metal", 2 ], [ "steel_plate", 2 ], [ "frame", 2 ], [ "hdframe", 1 ], [ "xlframe", 4 ] ],
570570
[ [ "rebar", 2 ], [ "pipe", 4 ] ]
@@ -582,7 +582,7 @@
582582
"qualities": [ [ { "id": "SAW_M", "level": 1 } ] ],
583583
"using": [ [ "welding_standard", 400 ], [ "welding_standard", 400 ] ],
584584
"components": [
585-
[ [ "wire", 2 ] ],
585+
[ [ "lc_wire", 2 ] ],
586586
[ [ "sheet_metal_small", 10 ], [ "scrap", 10 ] ],
587587
[ [ "sheet_metal", 2 ], [ "steel_plate", 2 ], [ "frame", 2 ], [ "hdframe", 1 ], [ "xlframe", 4 ] ],
588588
[ [ "rebar", 2 ], [ "pipe", 4 ] ]

data/json/construction/furniture_tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"time": "60m",
9191
"on_display": false,
9292
"qualities": [ { "id": "HAMMER", "level": 1 } ],
93-
"components": [ [ [ "2x4", 4 ] ], [ [ "tanned_hide", 2 ] ], [ [ "scrap", 20 ] ], [ [ "wire", 8 ] ] ],
93+
"components": [ [ [ "2x4", 4 ] ], [ [ "tanned_hide", 2 ] ], [ [ "scrap", 20 ] ], [ [ "lc_wire", 8 ] ] ],
9494
"pre_flags": [ "FLAT" ],
9595
"post_terrain": "f_bellows"
9696
},
@@ -104,7 +104,7 @@
104104
"qualities": [ [ { "id": "CUT", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ],
105105
"components": [
106106
[ [ "stick_long", 6 ] ],
107-
[ [ "rope_natural_short", 1, "LIST" ], [ "cordage", 2, "LIST" ], [ "wire", 8 ] ],
107+
[ [ "rope_natural_short", 1, "LIST" ], [ "cordage", 2, "LIST" ], [ "lc_wire", 8 ] ],
108108
[ [ "pointy_stick", 2 ], [ "spike", 2 ] ]
109109
],
110110
"pre_note": "Can be deconstructed without tools.",

data/json/construction/manufactured.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
[ "reinforced_solar_panel_v2", 2 ]
149149
],
150150
[ [ "storage_battery", 1 ], [ "medium_storage_battery", 5 ], [ "small_storage_battery", 50 ] ],
151-
[ [ "sheet_metal", 2 ], [ "wire", 8 ] ],
151+
[ [ "sheet_metal", 2 ], [ "lc_wire", 8 ] ],
152152
[ [ "pipe", 24 ] ]
153153
],
154154
"pre_flags": [ "FLAT" ],

data/json/construction/walls.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@
279279
],
280280
"components": [
281281
[ [ "pipe", 6 ], [ "frame", 1 ], [ "xlframe", 1 ] ],
282-
[ [ "wire", 8 ], [ "spike", 8 ], [ "nails", 16, "LIST" ] ],
282+
[ [ "lc_wire", 8 ], [ "spike", 8 ], [ "nails", 16, "LIST" ] ],
283283
[ [ "scrap", 40 ], [ "sheet_metal", 1 ], [ "sheet_metal_small", 20 ] ]
284284
],
285285
"pre_terrain": "t_pit",
@@ -299,7 +299,7 @@
299299
[ { "id": "DRILL", "level": 1 } ]
300300
],
301301
"components": [
302-
[ [ "wire", 16 ], [ "spike", 16 ], [ "nails", 32, "LIST" ] ],
302+
[ [ "lc_wire", 16 ], [ "spike", 16 ], [ "nails", 32, "LIST" ] ],
303303
[ [ "sheet_metal_small", 20 ], [ "scrap", 40 ] ],
304304
[
305305
[ "sheet_metal", 4 ],

data/json/furniture_and_terrain/LIXA_furniture_and_terrain.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@
312312
"deconstruct": {
313313
"ter_set": "t_metal_floor",
314314
"items": [
315-
{ "item": "wire", "count": [ 1, 3 ] },
315+
{ "item": "lc_wire", "count": [ 1, 3 ] },
316316
{ "item": "pipe", "count": [ 1, 2 ] },
317317
{ "item": "steel_chunk", "count": [ 1, 4 ] },
318318
{ "item": "processor", "count": 1 },

data/json/furniture_and_terrain/furniture-alien.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@
258258
"items": [
259259
{ "item": "scrap", "count": [ 8, 12 ] },
260260
{ "item": "pipe", "count": [ 0, 3 ] },
261-
{ "item": "wire", "count": [ 3, 10 ] },
261+
{ "item": "lc_wire", "count": [ 3, 10 ] },
262262
{ "item": "sheet_metal", "count": [ 0, 2 ] },
263263
{ "item": "sheet_metal_small", "count": [ 20, 30 ] },
264264
{ "item": "exodii_chassis", "count": [ 0, 1 ] },

data/json/furniture_and_terrain/furniture-appliances.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@
362362
{ "item": "tanned_hide", "count": [ 1, 2 ] },
363363
{ "item": "2x4", "count": [ 2, 4 ] },
364364
{ "item": "spring", "count": [ 1, 2 ] },
365-
{ "item": "wire", "count": [ 1, 4 ] }
365+
{ "item": "lc_wire", "count": [ 1, 4 ] }
366366
]
367367
},
368368
"max_volume": "40 L",
@@ -375,7 +375,7 @@
375375
{ "item": "leather", "count": [ 1, 4 ] },
376376
{ "item": "2x4", "count": [ 1, 2 ] },
377377
{ "item": "scrap", "count": [ 0, 6 ] },
378-
{ "item": "wire", "count": [ 1, 3 ] }
378+
{ "item": "lc_wire", "count": [ 1, 3 ] }
379379
]
380380
}
381381
},

data/json/furniture_and_terrain/furniture-decorative.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,19 @@
195195
{ "item": "pipe", "count": 6 },
196196
{ "item": "steel_chunk", "count": [ 2, 6 ] },
197197
{ "item": "pipe_fittings", "count": [ 1, 3 ] },
198-
{ "item": "wire", "count": 10 }
198+
{ "item": "lc_wire", "count": 10 }
199199
]
200200
},
201201
"bash": {
202202
"str_min": 6,
203203
"str_max": 10,
204204
"sound": "smash!",
205205
"sound_fail": "clang!",
206-
"items": [ { "item": "pipe", "count": [ 1, 6 ] }, { "item": "wire", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 1, 6 ] } ]
206+
"items": [
207+
{ "item": "pipe", "count": [ 1, 6 ] },
208+
{ "item": "lc_wire", "count": [ 1, 2 ] },
209+
{ "item": "scrap", "count": [ 1, 6 ] }
210+
]
207211
}
208212
},
209213
{

0 commit comments

Comments
 (0)