feat: Good bye Makeshift Arc Welder (#4264)

* Good bye Makeshift Arc Welder * recipe obsolation * style(autofix.ci): automated formatting --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
cataclysmbnteam · Feb 28, 2024 · 83ac7d2 · 83ac7d2
1 parent 05cb72e
commit 83ac7d2
Show file tree

Hide file tree

Showing 39 changed files with 198 additions and 362 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -680,7 +680,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 5 ] ],
     "time": "60 m",
-    "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ] ] ],
+    "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "toolset", 30 ] ] ],
     "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "GLARE", "level": 2 } ] ],
     "components": [ [ [ "pipe", 6 ] ], [ [ "sheet_metal", 2 ] ] ],
     "pre_terrain": "t_floor",
@@ -933,7 +933,7 @@
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "90 m",
     "qualities": [ { "id": "GLARE", "level": 2 } ],
-    "tools": [ [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ] ] ],
+    "tools": [ [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ] ] ],
     "components": [ [ [ "steel_plate", 2 ] ] ],
     "pre_terrain": "t_pit_shallow",
     "post_terrain": "t_scrap_wall_halfway"
@@ -947,7 +947,7 @@
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "90 m",
     "qualities": [ { "id": "GLARE", "level": 2 } ],
-    "tools": [ [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ] ] ],
+    "tools": [ [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ] ] ],
     "components": [ [ [ "steel_plate", 2 ] ] ],
     "pre_terrain": "t_scrap_wall_halfway",
     "post_terrain": "t_scrap_wall"
@@ -1187,7 +1187,7 @@
     "required_skills": [ [ "fabrication", 5 ] ],
     "time": "90 m",
     "qualities": [ { "id": "GLARE", "level": 2 } ],
-    "tools": [ [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ] ] ],
+    "tools": [ [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ] ] ],
     "components": [ [ [ "steel_plate", 2 ] ] ],
     "pre_note": "Must be supported on at least two sides.",
     "pre_special": "check_support",
@@ -3869,7 +3869,7 @@
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 5 ] ],
     "time": "90 m",
-    "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ] ] ],
+    "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "toolset", 30 ] ] ],
     "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "GLARE", "level": 2 } ] ],
     "components": [ [ [ "pipe", 12 ] ], [ [ "sheet_metal", 4 ] ] ],
     "pre_terrain": "t_window_reinforced",
@@ -3883,7 +3883,7 @@
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 5 ] ],
     "time": "90 m",
-    "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ] ] ],
+    "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "toolset", 30 ] ] ],
     "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "GLARE", "level": 2 } ] ],
     "components": [ [ [ "pipe", 12 ] ], [ [ "sheet_metal", 4 ] ] ],
     "pre_terrain": "t_window_reinforced_noglass",
@@ -3897,7 +3897,7 @@
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "30 m",
-    "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ] ] ],
+    "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "toolset", 30 ] ] ],
     "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "GLARE", "level": 2 } ] ],
     "components": [ [ [ "nail", 4 ] ], [ [ "sheet", 2 ] ], [ [ "stick", 1 ] ], [ [ "string_36", 1 ] ] ],
     "pre_terrain": "t_metal_grate_window",
@@ -3911,7 +3911,7 @@
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "30 m",
-    "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ] ] ],
+    "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "toolset", 30 ] ] ],
     "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "GLARE", "level": 2 } ] ],
     "components": [ [ [ "nail", 4 ] ], [ [ "sheet", 2 ] ], [ [ "stick", 1 ] ], [ [ "string_36", 1 ] ] ],
     "pre_terrain": "t_metal_grate_window",

diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json
@@ -1163,43 +1163,6 @@
     ],
     "magazine_well": "500 ml"
   },
-  {
-    "id": "welder_crude",
-    "type": "TOOL",
-    "category": "tools",
-    "name": { "str": "makeshift arc welder" },
-    "description": "This crude arc welder has been fashioned from a few small transformers, some wire, improvised electrode holder and complete disregard for personal safety.  While it's not as efficient as a factory welder, it will serve in a pinch.",
-    "weight": "7250 g",
-    "volume": "3500 ml",
-    "price": 5000,
-    "price_postapoc": 250,
-    "to_hit": -2,
-    "bashing": 7,
-    "material": "steel",
-    "symbol": ";",
-    "color": "light_red",
-    "ammo": "battery",
-    "charges_per_use": 10,
-    "qualities": [ [ "WELD", 1 ] ],
-    "use_action": [
-      {
-        "type": "repair_item",
-        "item_action_type": "repair_metal",
-        "materials": [ "iron", "steel", "hardsteel", "aluminum", "copper", "bronze", "silver", "gold", "platinum", "superalloy", "glass" ],
-        "skill": "fabrication",
-        "tool_quality": 5,
-        "cost_scaling": 0.1,
-        "move_cost": 1000
-      }
-    ],
-    "flags": [ "ALLOWS_REMOTE_USE" ],
-    "magazines": [
-      [
-        "battery",
-        [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ]
-      ]
-    ]
-  },
   {
     "id": "wood_smoother",
     "type": "GENERIC",

diff --git a/data/json/obsoletion/items.json b/data/json/obsoletion/items.json
@@ -5027,5 +5027,42 @@
     "copy-from": "AID_abstract",
     "name": { "str_sp": "Weather Reader CBM installation data" },
     "description": "Precise step-by-step instructions and other required data for installation of Weather Reader CBM, stored on a data card of proprietary form-factor, designed to be used extensively by an Autodoc, and allowing bionic installation with minimal failure chance.  Integrated security subroutine renders it unusable after installation."
+  },
+  {
+    "id": "welder_crude",
+    "type": "TOOL",
+    "category": "tools",
+    "name": { "str": "makeshift arc welder" },
+    "description": "This crude arc welder has been fashioned from a few small transformers, some wire, improvised electrode holder and complete disregard for personal safety.  While it's not as efficient as a factory welder, it will serve in a pinch.",
+    "weight": "7250 g",
+    "volume": "3500 ml",
+    "price": 5000,
+    "price_postapoc": 250,
+    "to_hit": -2,
+    "bashing": 7,
+    "material": "steel",
+    "symbol": ";",
+    "color": "light_red",
+    "ammo": "battery",
+    "charges_per_use": 10,
+    "qualities": [ [ "WELD", 1 ] ],
+    "use_action": [
+      {
+        "type": "repair_item",
+        "item_action_type": "repair_metal",
+        "materials": [ "iron", "steel", "hardsteel", "aluminum", "copper", "bronze", "silver", "gold", "platinum", "superalloy", "glass" ],
+        "skill": "fabrication",
+        "tool_quality": 5,
+        "cost_scaling": 0.1,
+        "move_cost": 1000
+      }
+    ],
+    "flags": [ "ALLOWS_REMOTE_USE" ],
+    "magazines": [
+      [
+        "battery",
+        [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ]
+      ]
+    ]
   }
 ]
diff --git a/data/json/obsoletion/migration.json b/data/json/obsoletion/migration.json
@@ -1902,5 +1902,11 @@
     "type": "MIGRATION",
     "replace": "leg_warmers",
     "flags": [ "resized_large" ]
+  },
+  {
+    "id": "welder_crude",
+    "type": "MIGRATION",
+    "replace": "welder",
+    "flags": [ "resized_large" ]
   }
 ]
diff --git a/data/json/obsoletion/recipes.json b/data/json/obsoletion/recipes.json
@@ -3264,5 +3264,10 @@
     "type": "recipe",
     "result": "sights_mount",
     "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "welder_crude",
+    "obsolete": true
   }
 ]
diff --git a/data/json/recipes/ammo/other.json b/data/json/recipes/ammo/other.json
@@ -179,10 +179,7 @@
     "time": "8 m",
     "book_learn": [ [ "manual_launcher", 4 ] ],
     "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 1 } ],
-    "tools": [
-      [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "welder_crude", 45 ], [ "toolset", 45 ] ],
-      [ [ "hotplate", 50 ], [ "toolset", 50 ] ]
-    ],
+    "tools": [ [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "toolset", 45 ] ], [ [ "hotplate", 50 ], [ "toolset", 50 ] ] ],
     "components": [
       [ [ "pipe", 2 ] ],
       [ [ "spike", 1 ] ],

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
@@ -62,7 +62,7 @@
     "time": "2 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 80 ] ],
-    "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ],
+    "tools": [ [ [ "welder", 21 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ],
     "components": [
       [ [ "nomex", 8 ] ],
       [ [ "kevlar_plate", 4 ] ],
@@ -96,7 +96,7 @@
     "time": "2 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 80 ] ],
-    "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ],
+    "tools": [ [ [ "welder", 21 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ],
     "components": [
       [ [ "plastic_chunk", 4 ] ],
       [ [ "kevlar_plate", 4 ] ],
@@ -116,7 +116,7 @@
     "time": "2 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 60 ] ],
-    "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ],
+    "tools": [ [ [ "welder", 42 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ],
     "components": [
       [ [ "fabric_standard", 4, "LIST" ] ],
       [ [ "fabric_hides_proper", 4, "LIST" ] ],
@@ -137,7 +137,7 @@
     "time": "2 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 60 ] ],
-    "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ],
+    "tools": [ [ [ "welder", 42 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ],
     "components": [
       [ [ "rag", 4 ] ],
       [ [ "leather", 4 ] ],
@@ -185,7 +185,7 @@
     "time": "2 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 80 ] ],
-    "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ],
+    "tools": [ [ [ "welder", 21 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ],
     "components": [
       [ [ "rag", 8 ] ],
       [ [ "kevlar_plate", 4 ] ],
@@ -243,7 +243,7 @@
     "time": "2 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 80 ] ],
-    "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ],
+    "tools": [ [ [ "welder", 21 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ],
     "components": [
       [ [ "fabric_hides_proper", 8, "LIST" ] ],
       [ [ "kevlar_plate", 4 ] ],
@@ -286,7 +286,7 @@
     "time": "2 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 80 ] ],
-    "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ],
+    "tools": [ [ [ "welder", 21 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ],
     "components": [
       [ [ "fur", 12 ] ],
       [ [ "kevlar_plate", 4 ] ],
@@ -518,7 +518,7 @@
     "time": "30 m",
     "book_learn": [ [ "mag_swimming", 3 ], [ "manual_swimming", 2 ] ],
     "using": [ [ "sewing_standard", 20 ] ],
-    "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ],
+    "tools": [ [ [ "welder", 42 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ],
     "components": [ [ [ "plastic_chunk", 8 ] ], [ [ "duct_tape", 80 ], [ "medical_tape", 80 ] ], [ [ "superglue", 1 ] ] ]
   },
   {

diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json
@@ -187,7 +187,7 @@
     "time": "1 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 50 ] ],
-    "tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ],
+    "tools": [ [ [ "welder", 14 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ],
     "components": [
       [ [ "nomex", 6 ] ],
       [ [ "fabric_hides_proper", 2, "LIST" ] ],
@@ -221,7 +221,7 @@
     "time": "1 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 50 ] ],
-    "tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ],
+    "tools": [ [ [ "welder", 14 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ],
     "components": [
       [ [ "plastic_chunk", 4 ] ],
       [ [ "duct_tape", 120 ] ],
@@ -240,7 +240,7 @@
     "time": "1 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 40 ] ],
-    "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ],
+    "tools": [ [ [ "welder", 28 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ],
     "components": [
       [ [ "fabric_standard", 2, "LIST" ] ],
       [ [ "fabric_hides_proper", 2, "LIST" ] ],
@@ -267,7 +267,7 @@
     "time": "1 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 40 ] ],
-    "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ],
+    "tools": [ [ [ "welder", 28 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ],
     "components": [
       [ [ "rag", 2 ] ],
       [ [ "leather", 2 ] ],
@@ -345,7 +345,7 @@
     "time": "1 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 50 ] ],
-    "tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ],
+    "tools": [ [ [ "welder", 14 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ],
     "components": [
       [ [ "rag", 6 ] ],
       [ [ "fabric_hides_proper", 2, "LIST" ] ],
@@ -406,7 +406,7 @@
     "time": "1 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 50 ] ],
-    "tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ],
+    "tools": [ [ [ "welder", 14 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ],
     "components": [
       [ [ "fabric_standard", 2, "LIST" ] ],
       [ [ "fabric_hides_proper", 6, "LIST" ] ],
@@ -504,7 +504,7 @@
     "time": "1 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 50 ] ],
-    "tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ],
+    "tools": [ [ [ "welder", 14 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ],
     "components": [
       [ [ "fabric_standard", 2, "LIST" ] ],
       [ [ "fur", 8 ] ],