Change vehicle parts material to mild steel (#75850)

* Initial commit

* Lint

* HD frame and sheetmetal

* Uncrafts and steel plating

* more lc_steel

* revert mistakes

* lint

* more repair changes

* even more repair changes

* missing repairs

* sheet metal craft changes

* Attempt to amend test

data/json/items/vehicle/frames.json

@@ -37,6 +37,7 @@
     "id": "frame",
     "name": { "str": "steel frame" },
     "description": "A large frame made of steel.  Useful for crafting.",
+    "material": [ "lc_steel" ],
     "weight": "20000 g",
     "to_hit": -5,
     "color": "cyan",
@@ -54,7 +55,7 @@
     "weight": "100000 g",
     "to_hit": -6,
     "color": "green",
-    "material": [ "qt_steel", "steel" ],
+    "material": [ "lc_steel" ],
     "volume": "20 L",
     "price": "120 USD",
     "price_postapoc": "2 USD 50 cent",

data/json/items/vehicle/plating.json

@@ -43,7 +43,7 @@
     "to_hit": -1,
     "color": "light_cyan",
     "symbol": "]",
-    "material": [ "steel" ],
+    "material": [ "lc_steel" ],
     "volume": "3 L",
     "category": "veh_parts",
     "price": "120 USD",

data/json/recipes/other/parts.json

@@ -280,7 +280,7 @@
     "difficulty": 9,
     "time": "300 m",
     "autolearn": true,
-    "using": [ [ "blacksmithing_standard", 24 ], [ "steel_standard", 6 ] ],
+    "using": [ [ "blacksmithing_standard", 24 ], [ "lc_steel_standard", 6 ] ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
     "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ]
   },
@@ -314,7 +314,7 @@
     "difficulty": 5,
     "time": "180 m",
     "autolearn": true,
-    "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
+    "using": [ [ "blacksmithing_standard", 1 ], [ "lc_steel_tiny", 1 ] ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
     "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ]
   },

data/json/recipes/recipe_companion.json

@@ -25,7 +25,7 @@
     "time": "30 m",
     "autolearn": false,
     "never_learn": true,
-    "using": [ [ "forging_standard", 24 ], [ "steel_standard", 6 ] ],
+    "using": [ [ "forging_standard", 24 ], [ "lc_steel_standard", 6 ] ],
     "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 5 } ],
     "tools": [ [ [ "metalworking_tongs", -1 ] ], [ [ "metal_file", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ]
   },

data/json/recipes/recipe_vehicle.json

@@ -1030,7 +1030,7 @@
     "proficiencies": [ { "proficiency": "prof_blacksmithing", "time_multiplier": 10 } ],
     "reversible": true,
     "autolearn": true,
-    "using": [ [ "steel_standard", 20 ] ],
+    "using": [ [ "lc_steel_standard", 20 ] ],
     "qualities": [ { "id": "GLARE", "level": 1 } ],
     "tools": [
       [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ],
@@ -1057,7 +1057,7 @@
     "reversible": true,
     "autolearn": true,
     "qualities": [ { "id": "GLARE", "level": 1 } ],
-    "using": [ [ "steel_standard", 100 ] ],
+    "using": [ [ "lc_steel_standard", 100 ] ],
     "tools": [
       [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ],
       [
@@ -1179,7 +1179,7 @@
         [ "oxy_torch", 20 ]
       ]
     ],
-    "components": [ [ [ "steel_lump", 8 ] ] ]
+    "components": [ [ [ "lc_steel_lump", 8 ] ] ]
   },
   {
     "type": "recipe",

data/json/requirements/materials.json

@@ -407,6 +407,12 @@
     "//": "Materials for use when forging atypically small items from steel",
     "components": [ [ [ "steel_chunk", 1 ] ] ]
   },
+  {
+    "id": "lc_steel_tiny",
+    "type": "requirement",
+    "//": "Materials for use when forging atypically small items from mild steel",
+    "components": [ [ [ "lc_steel_chunk", 1 ] ] ]
+  },
   {
     "id": "bronze_tiny",
     "type": "requirement",

data/json/requirements/toolsets.json

@@ -206,6 +206,26 @@
       [ [ "steel_tiny", 1, "LIST" ] ]
     ]
   },
+  {
+    "id": "repair_welding_lc_steel",
+    "type": "requirement",
+    "//": "Repair of mild steel items - per 10 cm of weld (100 seconds each), done this way to use 1 chunk of steel per 10 cm",
+    "//1": "Arc welding is about 85% efficient, acetylene welding is about 40% efficient",
+    "qualities": [ { "id": "GLARE", "level": 1 }, { "id": "HAMMER", "level": 2 } ],
+    "tools": [
+      [
+        [ "welder", 200 ],
+        [ "welding_kit", 200 ],
+        [ "welder_crude", 400 ],
+        [ "integrated_welder", 300 ],
+        [ "oxy_torch", 10 ]
+      ]
+    ],
+    "components": [
+      [ [ "welding_rod_steel", 10 ], [ "welding_wire_steel", 10 ], [ "brazing_rod_bronze", 10 ] ],
+      [ [ "lc_steel_tiny", 1, "LIST" ] ]
+    ]
+  },
   {
     "id": "repair_welding_alloys",
     "type": "requirement",

data/json/vehicleparts/boards.json

@@ -96,7 +96,7 @@
         "using": [ [ "welding_standard", 200 ], [ "vehicle_bolt_install", 1 ] ]
       },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "10 m", "using": [ [ "repair_welding_standard", 5 ] ] }
+      "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "10 m", "using": [ [ "repair_welding_lc_steel", 5 ] ] }
     },
     "damage_reduction": { "all": 7 }
   },
@@ -172,7 +172,7 @@
         "using": [ [ "welding_standard", 40 ], [ "vehicle_bolt_install", 1 ] ]
       },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "10 m", "using": [ [ "repair_welding_standard", 5 ] ] }
+      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "10 m", "using": [ [ "repair_welding_lc_steel", 5 ] ] }
     },
     "extend": { "categories": [ "cargo" ], "flags": [ "OPAQUE", "CARGO", "COVERED", "FULL_BOARD", "LOCKABLE_CARGO" ] },
     "damage_reduction": { "all": 7 }
@@ -205,7 +205,7 @@
         "using": [ [ "welding_standard", 40 ], [ "vehicle_bolt_install", 2 ] ]
       },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "24 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "10 m", "using": [ [ "repair_welding_standard", 5 ] ] }
+      "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "10 m", "using": [ [ "repair_welding_lc_steel", 5 ] ] }
     },
     "damage_reduction": { "all": 20 }
   },

data/json/vehicleparts/cargo.json

@@ -34,7 +34,7 @@
     "requirements": {
       "install": { "skills": [ [ "fabrication", 1 ] ], "time": "5 m", "using": [ [ "vehicle_bolt_install_simple", 1 ] ] },
       "removal": { "skills": [ [ "fabrication", 1 ] ], "time": "5 m", "using": [ [ "vehicle_wrench_1", 1 ] ] },
-      "repair": { "skills": [ [ "fabrication", 2 ], [ "mechanics", 2 ] ], "time": "5 m", "using": [ [ "repair_welding_standard", 5 ] ] }
+      "repair": { "skills": [ [ "fabrication", 2 ], [ "mechanics", 2 ] ], "time": "5 m", "using": [ [ "repair_welding_lc_steel", 5 ] ] }
     },
     "flags": [ "CARGO", "BOARDABLE", "CARGO_PASSABLE", "FLAT_SURF" ],
     "breaks_into": "ig_vp_sheet_metal",
@@ -193,7 +193,7 @@
     "requirements": {
       "install": { "skills": [ [ "mechanics", 1 ] ], "time": "10 m", "using": [ [ "vehicle_screw", 1 ] ] },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "5 m", "using": [ [ "vehicle_screw", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "2 m", "using": [ [ "repair_welding_standard", 1 ] ] }
+      "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "2 m", "using": [ [ "repair_welding_lc_steel", 1 ] ] }
     },
     "flags": [ "CARGO", "BOARDABLE", "COVERED", "LOCKABLE_CARGO", "CARGO_PASSABLE" ],
     "breaks_into": "ig_vp_frame",

data/json/vehicleparts/doors.json

@@ -18,7 +18,7 @@
     "requirements": {
       "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_bolt_install", 1 ] ] },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "5 m", "using": [ [ "repair_welding_standard", 3 ] ] }
+      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "5 m", "using": [ [ "repair_welding_lc_steel", 3 ] ] }
     },
     "size": "2500 ml",
     "type": "vehicle_part",
@@ -93,7 +93,7 @@
     "requirements": {
       "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_bolt_install", 1 ] ] },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "8 m", "using": [ [ "repair_welding_standard", 4 ] ] }
+      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "8 m", "using": [ [ "repair_welding_lc_steel", 4 ] ] }
     },
     "type": "vehicle_part",
     "variants_bases": [ { "id": "full", "label": "Full" } ]
@@ -136,7 +136,7 @@
         "time": "40 m",
         "using": [ [ "vehicle_weld_removal", 1 ], [ "vehicle_wrench_2", 1 ] ]
       },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "5 m", "using": [ [ "repair_welding_standard", 3 ] ] }
+      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "5 m", "using": [ [ "repair_welding_lc_steel", 3 ] ] }
     },
     "size": "200 L",
     "extend": { "flags": [ "LOCKABLE_CARGO", "MULTISQUARE", "COVERED" ] },
@@ -174,7 +174,7 @@
         "time": "50 m",
         "using": [ [ "vehicle_weld_removal", 1 ], [ "vehicle_wrench_2", 1 ] ]
       },
-      "repair": { "skills": [ [ "mechanics", 4 ] ], "time": "8 m", "using": [ [ "repair_welding_standard", 4 ] ] }
+      "repair": { "skills": [ [ "mechanics", 4 ] ], "time": "8 m", "using": [ [ "repair_welding_lc_steel", 4 ] ] }
     },
     "size": "100 L",
     "type": "vehicle_part"
@@ -234,7 +234,7 @@
     "requirements": {
       "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 2 ] ] }
+      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_lc_steel", 2 ] ] }
     },
     "extend": { "flags": [ "LOW_FINAL_AIR_DRAG", "SIMPLE_PART", "NO_ROOF_NEEDED" ] },
     "delete": { "flags": [ "CARGO", "CARGO_PASSABLE", "COVERED", "LOCKABLE_CARGO" ] }
@@ -250,7 +250,7 @@
     "requirements": {
       "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 4 ] ] }
+      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_lc_steel", 4 ] ] }
     },
     "breaks_into": "ig_vp_hdframe",
     "delete": { "flags": [ "NO_ROOF_NEEDED" ] },
@@ -268,7 +268,7 @@
     "requirements": {
       "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 2 ] ] }
+      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_lc_steel", 2 ] ] }
     },
     "breaks_into": "ig_vp_sheet_metal",
     "extend": { "flags": [ "OPAQUE", "SIMPLE_PART" ] },

data/json/vehicleparts/engineering.json

@@ -96,11 +96,7 @@
     "durability": 300,
     "description": "A pair of forklift arms.  If it is in your line of sight and within two tiles of another vehicle, you will automatically use it when you want to jack up the other vehicle to change its wheels.  To use it to lift a heavy component like an engine that you are installing or removing, the crane must have line of sight to where it is going and it must be within four tiles of it.",
     "size": "12500 ml",
-    "breaks_into": [
-      { "item": "steel_lump", "count": [ 4, 6 ] },
-      { "item": "steel_chunk", "count": [ 4, 6 ] },
-      { "item": "scrap", "count": [ 4, 6 ] }
-    ],
+    "breaks_into": "ig_vp_frame",
     "qualities": [ [ "LIFT", 2 ], [ "JACK", 6 ] ],
     "//": "30 cm of weld per quadrant of damage, 60 cm of weld to install",
     "requirements": {
@@ -114,7 +110,7 @@
         "time": "30 m",
         "using": [ [ "vehicle_weld_removal", 1 ], [ "vehicle_wrench_2", 1 ] ]
       },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "5 m", "using": [ [ "repair_welding_standard", 3 ] ] }
+      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "5 m", "using": [ [ "repair_welding_lc_steel", 3 ] ] }
     },
     "flags": [ "CARGO", "PROTRUSION" ],
     "pseudo_tools": [ { "id": "crane_pseudo_item" } ],

data/json/vehicleparts/frames.json

@@ -125,7 +125,7 @@
         "time": "15 m",
         "using": [ [ "vehicle_weld_removal", 1 ], [ "vehicle_wrench_2", 1 ] ]
       },
-      "repair": { "skills": [ [ "mechanics", 1 ] ], "time": "9 m", "using": [ [ "repair_welding_standard", 5 ] ] }
+      "repair": { "skills": [ [ "mechanics", 1 ] ], "time": "9 m", "using": [ [ "repair_welding_lc_steel", 5 ] ] }
     }
   },
   {
@@ -225,7 +225,7 @@
         "time": "30 m",
         "using": [ [ "vehicle_weld_removal", 1 ], [ "vehicle_wrench_2", 1 ] ]
       },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "18 m", "using": [ [ "repair_welding_standard", 10 ] ] }
+      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "18 m", "using": [ [ "repair_welding_lc_steel", 10 ] ] }
     },
     "damage_reduction": { "all": 30 }
   },
@@ -289,7 +289,7 @@
     "durability": 150,
     "description": "The chassis of a concrete mixer.",
     "folded_volume": "10 L",
-    "breaks_into": [ { "item": "steel_chunk", "count": [ 1, 4 ] }, { "item": "scrap", "count": [ 5, 25 ] } ],
+    "breaks_into": [ { "item": "lc_steel_chunk", "count": [ 1, 4 ] }, { "item": "scrap", "count": [ 5, 25 ] } ],
     "extend": { "flags": [ "NO_INSTALL_HIDDEN", "CABLE_PORTS" ] },
     "damage_reduction": { "all": 7 }
   }

data/json/vehicleparts/rams.json

@@ -158,7 +158,12 @@
     "broken_color": "light_cyan",
     "durability": 825,
     "breaks_into": "ig_vp_steel_plate",
-    "damage_reduction": { "all": 70 }
+    "damage_reduction": { "all": 70 },
+    "requirements": {
+      "install": {  },
+      "removal": {  },
+      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "10 m", "using": [ [ "repair_welding_lc_steel", 6 ] ] }
+    }
   },
   {
     "id": "ram_wood",

data/json/vehicleparts/seats.json

@@ -169,7 +169,7 @@
   {
     "id": "metal_bench",
     "copy-from": "seat_back",
-    "breaks_into": "ig_vp_prison_bench",
+    "breaks_into": "ig_vp_steel_plate",
     "comfort": 0,
     "floor_bedding_warmth": 0,
     "description": "A steel bench with ankle and wrist restraints built in.  It looks very uncomfortable.",
@@ -180,7 +180,7 @@
     "requirements": {
       "install": { "skills": [ [ "mechanics", 1 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": "vehicle_weld_removal" },
-      "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 2 ] ] }
+      "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "repair_welding_lc_steel", 2 ] ] }
     },
     "type": "vehicle_part"
   }