Skip to content

Commit

Permalink
feat(balance): allow alternatives to rubber gloves for deconstruction…
Browse files Browse the repository at this point in the history 
…, moved advanced deconstruct to `OTHER` (#5865)
  • Loading branch information
@chaosvolt
chaosvolt authored Jan 2, 2025
1 parent 06b04a9 commit 9df762b
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 18 deletions.
34 changes: 17 additions & 17 deletions data/json/deconstruction.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@
"type": "construction",
"id": "constr_remove_object_fireplace",
"//": "Breaks a fireplace apart giving you back most of the rocks used in its construction.",
"category": "CONSTRUCT",
"category": "OTHER",
"required_skills": [ [ "fabrication", 2 ] ],
"time": "90 m",
"using": [ [ "object_deconstruction_advanced", 1 ] ],
Expand All @@ -795,7 +795,7 @@
"type": "construction",
"id": "constr_remove_electrical_conduit",
"//": "Breaks an electrical conduit.",
"category": "CONSTRUCT",
"category": "OTHER",
"required_skills": [ [ "fabrication", 2 ], [ "electronics", 3 ] ],
"time": "90 m",
"using": [ [ "advanced_electronics_high_voltage", 1 ] ],
Expand All @@ -813,7 +813,7 @@
"type": "construction",
"id": "constr_remove_capacitor_bank",
"//": "Removes a capacitor bank",
"category": "CONSTRUCT",
"category": "OTHER",
"required_skills": [ [ "fabrication", 3 ], [ "electronics", 8 ] ],
"time": "120 m",
"using": [ [ "advanced_electronics_high_voltage", 1 ] ],
Expand All @@ -834,7 +834,7 @@
{
"type": "construction",
"id": "constr_remove_t_console_broken",
"category": "CONSTRUCT",
"category": "OTHER",
"required_skills": [ [ "electronics", 0 ] ],
"time": "20 m",
"qualities": [ { "id": "SCREW", "level": 1 } ],
Expand All @@ -857,7 +857,7 @@
{
"type": "construction",
"id": "constr_remove_t_console",
"category": "CONSTRUCT",
"category": "OTHER",
"required_skills": [ [ "electronics", 0 ] ],
"time": "20 m",
"qualities": [ { "id": "SCREW", "level": 1 } ],
Expand All @@ -881,7 +881,7 @@
"type": "construction",
"id": "constr_remove_plut_generator",
"//": "Removes a Plut Gen.",
"category": "CONSTRUCT",
"category": "OTHER",
"required_skills": [ [ "fabrication", 2 ], [ "electronics", 6 ] ],
"time": "90 m",
"using": [ [ "advanced_electronics_high_voltage", 1 ] ],
Expand All @@ -898,7 +898,7 @@
"type": "construction",
"id": "constr_remove_grid_plut_generator",
"//": "Removes a Plut Gen from grid.",
"category": "CONSTRUCT",
"category": "OTHER",
"required_skills": [ [ "fabrication", 2 ], [ "electronics", 6 ] ],
"time": "30 m",
"using": [ [ "advanced_electronics_high_voltage", 1 ] ],
Expand All @@ -914,7 +914,7 @@
{
"type": "construction",
"id": "constr_remove_sai_box",
"category": "CONSTRUCT",
"category": "OTHER",
"required_skills": [ [ "electronics", 1 ] ],
"time": "30 m",
"using": [ [ "advanced_electronics_low_voltage", 1 ] ],
Expand All @@ -936,7 +936,7 @@
{
"type": "construction",
"id": "constr_remove_sai_box_damaged",
"category": "CONSTRUCT",
"category": "OTHER",
"required_skills": [ [ "electronics", 1 ] ],
"time": "35 m",
"using": [ [ "advanced_electronics_low_voltage", 1 ] ],
Expand All @@ -957,7 +957,7 @@
{
"type": "construction",
"id": "constr_remove_t_oil_circ_brkr_l",
"category": "CONSTRUCT",
"category": "OTHER",
"required_skills": [ [ "electronics", 5 ] ],
"time": "60 m",
"using": [ [ "advanced_electronics_high_voltage", 1 ] ],
Expand All @@ -977,7 +977,7 @@
{
"type": "construction",
"id": "constr_remove_t_oil_circ_brkr_s",
"category": "CONSTRUCT",
"category": "OTHER",
"required_skills": [ [ "electronics", 5 ] ],
"time": "45 m",
"using": [ [ "advanced_electronics_high_voltage", 1 ] ],
Expand All @@ -997,7 +997,7 @@
{
"type": "construction",
"id": "constr_remove_t_switchgear_l",
"category": "CONSTRUCT",
"category": "OTHER",
"required_skills": [ [ "electronics", 1 ] ],
"time": "45 m",
"using": [ [ "advanced_electronics_low_voltage", 1 ] ],
Expand All @@ -1020,7 +1020,7 @@
{
"type": "construction",
"id": "constr_remove_t_switchgear_s",
"category": "CONSTRUCT",
"category": "OTHER",
"required_skills": [ [ "electronics", 1 ] ],
"time": "35 m",
"using": [ [ "advanced_electronics_low_voltage", 1 ] ],
Expand All @@ -1043,7 +1043,7 @@
{
"type": "construction",
"id": "constr_remove_t_lgtn_arrest",
"category": "CONSTRUCT",
"category": "OTHER",
"required_skills": [ [ "electronics", 0 ] ],
"time": "20 m",
"using": [ [ "advanced_electronics_low_voltage", 1 ] ],
Expand All @@ -1060,7 +1060,7 @@
{
"type": "construction",
"id": "constr_remove_t_station_disc",
"category": "CONSTRUCT",
"category": "OTHER",
"required_skills": [ [ "electronics", 2 ] ],
"time": "35 m",
"using": [ [ "advanced_electronics_high_voltage", 1 ] ],
Expand All @@ -1085,7 +1085,7 @@
{
"type": "construction",
"id": "constr_remove_t_current_trans",
"category": "CONSTRUCT",
"category": "OTHER",
"required_skills": [ [ "electronics", 3 ] ],
"time": "45 m",
"using": [ [ "advanced_electronics_high_voltage", 1 ] ],
Expand All @@ -1104,7 +1104,7 @@
{
"type": "construction",
"id": "constr_remove_t_potential_trans",
"category": "CONSTRUCT",
"category": "OTHER",
"required_skills": [ [ "electronics", 4 ] ],
"time": "55 m",
"using": [ [ "advanced_electronics_high_voltage", 1 ] ],
Expand Down
1 change: 1 addition & 0 deletions data/json/items/armor/power_armor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@
},
{
"id": "exosuit_industrial",
"sub": "gloves_rubber",
"type": "TOOL_ARMOR",
"category": "armor",
"name": { "str": "industrial exo-suit" },
Expand Down
3 changes: 2 additions & 1 deletion data/json/requirements/toolsets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@
"id": "advanced_electronics_high_voltage",
"type": "requirement",
"//": "For electronics and electrical terrain with voltage so high it kills you just for looking at it funny, includes wirecutting and pliers",
"//2": "Any TOOL_ARMOR electrical protection can be added as an alternative by setting it as a substitute for rubber gloves, but non-armor alternatives have to be explicitly added here.",
"tools": [
[
[ "hacksaw", -1 ],
Expand All @@ -249,7 +250,7 @@
],
[ [ "multitool", -1 ], [ "pliers", -1 ], [ "toolset", -1 ] ],
[ [ "voltmeter", 10 ] ],
[ [ "gloves_rubber", -1 ] ]
[ [ "gloves_rubber", -1 ], [ "chainmail_suit_faraday", -1 ], [ "shark_suit_faraday", -1 ] ]
],
"qualities": [ { "id": "PRY", "level": 2 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ]
},
Expand Down

0 comments on commit 9df762b

Please sign in to comment.