Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Good bye Makeshift Arc Welder #4264

Merged
merged 3 commits into from
Feb 28, 2024
Merged

feat: Good bye Makeshift Arc Welder #4264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c63db2a
Good bye Makeshift Arc Welder
Lamandus Feb 28, 2024
ec76d4d
recipe obsolation
Lamandus Feb 28, 2024
c01dcc8
style(autofix.ci): automated formatting
autofix-ci[bot] Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions data/json/construction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
37 changes: 0 additions & 37 deletions data/json/items/tool/workshop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
37 changes: 37 additions & 0 deletions data/json/obsoletion/items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
]
]
}
]
6 changes: 6 additions & 0 deletions data/json/obsoletion/migration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1902,5 +1902,11 @@
"type": "MIGRATION",
"replace": "leg_warmers",
"flags": [ "resized_large" ]
},
{
"id": "welder_crude",
"type": "MIGRATION",
"replace": "welder",
"flags": [ "resized_large" ]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pfft, welder (XL).

}
]
5 changes: 5 additions & 0 deletions data/json/obsoletion/recipes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3264,5 +3264,10 @@
"type": "recipe",
"result": "sights_mount",
"obsolete": true
},
{
"type": "recipe",
"result": "welder_crude",
"obsolete": true
}
]
5 changes: 1 addition & 4 deletions data/json/recipes/ammo/other.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ],
Expand Down
16 changes: 8 additions & 8 deletions data/json/recipes/armor/feet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ],
Expand Down Expand Up @@ -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 ] ],
Expand All @@ -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" ] ],
Expand All @@ -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 ] ],
Expand Down Expand Up @@ -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 ] ],
Expand Down Expand Up @@ -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 ] ],
Expand Down Expand Up @@ -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 ] ],
Expand Down Expand Up @@ -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 ] ] ]
},
{
Expand Down
14 changes: 7 additions & 7 deletions data/json/recipes/armor/hands.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ] ],
Expand Down Expand Up @@ -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 ] ],
Expand All @@ -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" ] ],
Expand All @@ -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 ] ],
Expand Down Expand Up @@ -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" ] ],
Expand Down Expand Up @@ -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" ] ],
Expand Down Expand Up @@ -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 ] ],
Expand Down
Loading
Loading