feat(balance): Electrical terrain/furn requires varying skills and lo…

…ts of tools, easier to train (#5722) * suffering * Update deconstruction.json * style(autofix.ci): automated formatting * Update data/json/requirements/toolsets.json --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Chaosvolt <[email protected]>
cataclysmbnteam · Nov 16, 2024 · ac7253c · ac7253c
1 parent 7b7e35f
commit ac7253c
Show file tree

Hide file tree

Showing 6 changed files with 338 additions and 172 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -4778,9 +4778,9 @@
     "id": "constr_gridplut_generator",
     "group": "install_plut_generator",
     "category": "WORKSHOP",
-    "required_skills": [  ],
-    "time": "10 m",
-    "qualities": [  ],
+    "required_skills": [ [ "fabrication", 2 ], [ "electronics", 6 ] ],
+    "time": "20 m",
+    "using": [ [ "advanced_electronics_high_voltage", 1 ] ],
     "components": [ [ [ "plut_generator_item", 1 ] ], [ [ "cable", 15 ] ], [ [ "power_supply", 3 ] ] ],
     "pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
     "pre_special": "check_empty",

diff --git a/data/json/deconstruction.json b/data/json/deconstruction.json
@@ -796,9 +796,9 @@
     "id": "constr_remove_electrical_conduit",
     "//": "Breaks an electrical conduit.",
     "category": "CONSTRUCT",
-    "required_skills": [ [ "fabrication", 2 ], [ "electronics", 1 ] ],
+    "required_skills": [ [ "fabrication", 2 ], [ "electronics", 3 ] ],
     "time": "90 m",
-    "using": [ [ "object_deconstruction_advanced", 1 ] ],
+    "using": [ [ "advanced_electronics_high_voltage", 1 ] ],
     "byproducts": [
       { "item": "scrap", "count": [ 1, 4 ] },
       { "item": "scrap_copper", "count": [ 10, 20 ] },
@@ -814,9 +814,9 @@
     "id": "constr_remove_capacitor_bank",
     "//": "Removes a capacitor bank",
     "category": "CONSTRUCT",
-    "required_skills": [ [ "fabrication", 4 ], [ "mechanics", 4 ], [ "electronics", 8 ] ],
+    "required_skills": [ [ "fabrication", 3 ], [ "electronics", 8 ] ],
     "time": "120 m",
-    "using": [ [ "object_deconstruction_advanced", 1 ] ],
+    "using": [ [ "advanced_electronics_high_voltage", 1 ] ],
     "byproducts": [
       { "item": "scrap", "count": [ 1, 4 ] },
       { "item": "cable", "charges": [ 100, 800 ] },
@@ -830,5 +830,295 @@
     "pre_furniture": "f_capacitor",
     "post_furniture": "f_null",
     "group": "advanced_object_deconstruction"
+  },
+  {
+    "type": "construction",
+    "id": "constr_remove_t_console_broken",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "electronics", 0 ] ],
+    "time": "20 m",
+    "qualities": [ { "id": "SCREW", "level": 1 } ],
+    "byproducts": [
+      { "item": "processor", "count": [ 1, 2 ] },
+      { "item": "RAM", "count": [ 4, 8 ] },
+      { "item": "cable", "charges": [ 4, 6 ] },
+      { "item": "large_lcd_screen", "count": 1 },
+      { "item": "e_scrap", "count": [ 10, 16 ] },
+      { "item": "circuit", "count": [ 6, 10 ] },
+      { "item": "power_supply", "count": [ 2, 4 ] },
+      { "item": "amplifier", "count": [ 2, 4 ] },
+      { "item": "plastic_chunk", "count": [ 10, 12 ] },
+      { "item": "scrap", "count": [ 6, 8 ] }
+    ],
+    "pre_terrain": "t_console_broken",
+    "post_terrain": "t_floor",
+    "group": "advanced_object_deconstruction"
+  },
+  {
+    "type": "construction",
+    "id": "constr_remove_t_console",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "electronics", 0 ] ],
+    "time": "20 m",
+    "qualities": [ { "id": "SCREW", "level": 1 } ],
+    "byproducts": [
+      { "item": "processor", "count": [ 1, 2 ] },
+      { "item": "RAM", "count": [ 4, 8 ] },
+      { "item": "cable", "charges": [ 4, 6 ] },
+      { "item": "large_lcd_screen", "count": 1 },
+      { "item": "e_scrap", "count": [ 10, 16 ] },
+      { "item": "circuit", "count": [ 6, 10 ] },
+      { "item": "power_supply", "count": [ 2, 4 ] },
+      { "item": "amplifier", "count": [ 2, 4 ] },
+      { "item": "plastic_chunk", "count": [ 10, 12 ] },
+      { "item": "scrap", "count": [ 6, 8 ] }
+    ],
+    "pre_terrain": "t_console",
+    "post_terrain": "t_floor",
+    "group": "advanced_object_deconstruction"
+  },
+  {
+    "type": "construction",
+    "id": "constr_remove_plut_generator",
+    "//": "Removes a Plut Gen.",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 2 ], [ "electronics", 6 ] ],
+    "time": "90 m",
+    "using": [ [ "advanced_electronics_high_voltage", 1 ] ],
+    "byproducts": [
+      { "item": "plut_generator_item", "charges": [ 1, 1 ] },
+      { "item": "power_supply", "charges": [ 3, 3 ] },
+      { "item": "cable", "charges": [ 15, 15 ] }
+    ],
+    "pre_terrain": "t_plut_generator",
+    "post_terrain": "t_concrete",
+    "group": "advanced_object_deconstruction"
+  },
+  {
+    "type": "construction",
+    "id": "constr_remove_plut_generator",
+    "//": "Removes a Plut Gen from grid.",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 2 ], [ "electronics", 6 ] ],
+    "time": "30 m",
+    "using": [ [ "advanced_electronics_high_voltage", 1 ] ],
+    "byproducts": [
+      { "item": "scrap", "count": [ 1, 4 ] },
+      { "item": "scrap_copper", "count": [ 10, 20 ] },
+      { "item": "cable", "charges": [ 20, 100 ] },
+      { "item": "pipe", "count": [ 1, 2 ] }
+    ],
+    "pre_furniture": "f_grid_plut_generator",
+    "post_furniture": "f_null",
+    "group": "advanced_object_deconstruction"
+  },
+  {
+    "type": "construction",
+    "id": "constr_remove_sai_box",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "electronics", 1 ] ],
+    "time": "30 m",
+    "using": [ [ "advanced_electronics_low_voltage", 1 ] ],
+    "byproducts": [
+      { "item": "RAM", "count": [ 4, 8 ] },
+      { "item": "cable", "charges": [ 16, 40 ] },
+      { "item": "small_lcd_screen", "count": [ 2, 4 ] },
+      { "item": "e_scrap", "count": [ 12, 24 ] },
+      { "item": "circuit", "count": [ 6, 30 ] },
+      { "item": "power_supply", "count": [ 4, 8 ] },
+      { "item": "amplifier", "count": [ 3, 6 ] },
+      { "item": "plastic_chunk", "count": [ 4, 8 ] },
+      { "item": "scrap", "count": [ 8, 16 ] }
+    ],
+    "pre_terrain": "t_sai_box",
+    "post_terrain": "t_concrete",
+    "group": "advanced_object_deconstruction"
+  },
+  {
+    "type": "construction",
+    "id": "constr_remove_sai_box_damaged",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "electronics", 1 ] ],
+    "time": "35 m",
+    "using": [ [ "advanced_electronics_low_voltage", 1 ] ],
+    "byproducts": [
+      { "item": "RAM", "count": [ 1, 2 ] },
+      { "item": "cable", "charges": [ 4, 24 ] },
+      { "item": "e_scrap", "count": [ 4, 12 ] },
+      { "item": "circuit", "count": [ 2, 12 ] },
+      { "item": "power_supply", "count": [ 1, 4 ] },
+      { "item": "amplifier", "count": [ 1, 3 ] },
+      { "item": "plastic_chunk", "count": [ 2, 6 ] },
+      { "item": "scrap", "count": [ 6, 12 ] }
+    ],
+    "pre_terrain": "t_sai_box_damaged",
+    "post_terrain": "t_concrete",
+    "group": "advanced_object_deconstruction"
+  },
+  {
+    "type": "construction",
+    "id": "constr_remove_t_oil_circ_brkr_l",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "electronics", 5 ] ],
+    "time": "60 m",
+    "using": [ [ "advanced_electronics_high_voltage", 1 ] ],
+    "byproducts": [
+      { "item": "cable", "charges": [ 8, 24 ] },
+      { "item": "power_supply", "count": [ 4, 8 ] },
+      { "item": "amplifier", "count": [ 8, 16 ] },
+      { "item": "steel_chunk", "count": [ 4, 16 ] },
+      { "item": "scrap", "count": [ 12, 24 ] },
+      { "item": "sheet_metal", "count": [ 6, 12 ] },
+      { "item": "ceramic_shard", "count": [ 2, 6 ] }
+    ],
+    "pre_terrain": "t_oil_circ_brkr_l",
+    "post_terrain": "t_concrete",
+    "group": "advanced_object_deconstruction"
+  },
+  {
+    "type": "construction",
+    "id": "constr_remove_t_oil_circ_brkr_s",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "electronics", 5 ] ],
+    "time": "45 m",
+    "using": [ [ "advanced_electronics_high_voltage", 1 ] ],
+    "byproducts": [
+      { "item": "cable", "charges": [ 4, 12 ] },
+      { "item": "power_supply", "count": [ 3, 6 ] },
+      { "item": "amplifier", "count": [ 6, 12 ] },
+      { "item": "steel_chunk", "count": [ 2, 12 ] },
+      { "item": "scrap", "count": [ 8, 18 ] },
+      { "item": "sheet_metal", "count": [ 4, 8 ] },
+      { "item": "ceramic_shard", "count": [ 1, 4 ] }
+    ],
+    "pre_terrain": "t_oil_circ_brkr_s",
+    "post_terrain": "t_concrete",
+    "group": "advanced_object_deconstruction"
+  },
+  {
+    "type": "construction",
+    "id": "constr_remove_t_switchgear_l",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "electronics", 1 ] ],
+    "time": "45 m",
+    "using": [ [ "advanced_electronics_low_voltage", 1 ] ],
+    "byproducts": [
+      { "item": "RAM", "count": [ 2, 6 ] },
+      { "item": "cable", "charges": [ 4, 24 ] },
+      { "item": "small_lcd_screen", "count": [ 6, 12 ] },
+      { "item": "e_scrap", "count": [ 16, 24 ] },
+      { "item": "circuit", "count": [ 12, 30 ] },
+      { "item": "power_supply", "count": [ 6, 8 ] },
+      { "item": "amplifier", "count": [ 6, 8 ] },
+      { "item": "plastic_chunk", "count": [ 2, 4 ] },
+      { "item": "scrap", "count": [ 8, 16 ] },
+      { "item": "sheet_metal", "count": [ 2, 4 ] }
+    ],
+    "pre_terrain": "t_switchgear_l",
+    "post_terrain": "t_concrete",
+    "group": "advanced_object_deconstruction"
+  },
+  {
+    "type": "construction",
+    "id": "constr_remove_t_switchgear_s",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "electronics", 1 ] ],
+    "time": "35 m",
+    "using": [ [ "advanced_electronics_low_voltage", 1 ] ],
+    "byproducts": [
+      { "item": "RAM", "count": [ 1, 2 ] },
+      { "item": "cable", "charges": [ 2, 8 ] },
+      { "item": "small_lcd_screen", "count": [ 2, 6 ] },
+      { "item": "e_scrap", "count": [ 6, 12 ] },
+      { "item": "circuit", "count": [ 8, 24 ] },
+      { "item": "power_supply", "count": [ 2, 6 ] },
+      { "item": "amplifier", "count": [ 1, 4 ] },
+      { "item": "plastic_chunk", "count": [ 1, 2 ] },
+      { "item": "scrap", "count": [ 4, 8 ] },
+      { "item": "sheet_metal", "count": [ 1, 2 ] }
+    ],
+    "pre_terrain": "t_switchgear_s",
+    "post_terrain": "t_concrete",
+    "group": "advanced_object_deconstruction"
+  },
+  {
+    "type": "construction",
+    "id": "constr_remove_t_lgtn_arrest",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "electronics", 0 ] ],
+    "time": "20 m",
+    "using": [ [ "advanced_electronics_low_voltage", 1 ] ],
+    "byproducts": [
+      { "item": "cable", "charges": [ 0, 4 ] },
+      { "item": "scrap", "count": [ 8, 12 ] },
+      { "item": "steel_chunk", "count": [ 2, 4 ] },
+      { "item": "ceramic_shard", "count": [ 8, 16 ] }
+    ],
+    "pre_terrain": "t_lgtn_arrest",
+    "post_terrain": "t_concrete",
+    "group": "advanced_object_deconstruction"
+  },
+  {
+    "type": "construction",
+    "id": "constr_remove_t_station_disc",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "electronics", 2 ] ],
+    "time": "35 m",
+    "using": [ [ "advanced_electronics_high_voltage", 1 ] ],
+    "byproducts": [
+      { "item": "RAM", "count": [ 12, 24 ] },
+      { "item": "cable", "charges": [ 6, 12 ] },
+      { "item": "small_lcd_screen", "count": [ 8, 16 ] },
+      { "item": "e_scrap", "count": [ 8, 12 ] },
+      { "item": "circuit", "count": [ 6, 18 ] },
+      { "item": "power_supply", "count": [ 8, 12 ] },
+      { "item": "amplifier", "count": [ 2, 4 ] },
+      { "item": "plastic_chunk", "count": [ 4, 8 ] },
+      { "item": "scrap", "count": [ 2, 6 ] },
+      { "item": "sheet_metal", "count": [ 1, 2 ] },
+      { "item": "lead", "charges": [ 1, 2 ] },
+      { "item": "ceramic_shard", "count": [ 2, 6 ] }
+    ],
+    "pre_terrain": "t_station_disc",
+    "post_terrain": "t_concrete",
+    "group": "advanced_object_deconstruction"
+  },
+  {
+    "type": "construction",
+    "id": "constr_remove_t_current_trans",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "electronics", 3 ] ],
+    "time": "45 m",
+    "using": [ [ "advanced_electronics_high_voltage", 1 ] ],
+    "byproducts": [
+      { "item": "scrap", "count": [ 12, 16 ] },
+      { "item": "steel_chunk", "count": [ 4, 6 ] },
+      { "item": "lead", "charges": [ 4, 16 ] },
+      { "item": "cable", "charges": [ 60, 120 ] },
+      { "item": "sheet_metal", "count": [ 2, 6 ] },
+      { "item": "ceramic_shard", "count": [ 4, 12 ] }
+    ],
+    "pre_terrain": "t_current_trans",
+    "post_terrain": "t_concrete",
+    "group": "advanced_object_deconstruction"
+  },
+  {
+    "type": "construction",
+    "id": "constr_remove_t_potential_trans",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "electronics", 4 ] ],
+    "time": "55 m",
+    "using": [ [ "advanced_electronics_high_voltage", 1 ] ],
+    "byproducts": [
+      { "item": "scrap", "count": [ 12, 16 ] },
+      { "item": "steel_chunk", "count": [ 4, 6 ] },
+      { "item": "lead", "charges": [ 12, 32 ] },
+      { "item": "cable", "charges": [ 20, 40 ] },
+      { "item": "sheet_metal", "count": [ 2, 6 ] },
+      { "item": "ceramic_shard", "count": [ 4, 12 ] }
+    ],
+    "pre_terrain": "t_potential_trans",
+    "post_terrain": "t_concrete",
+    "group": "advanced_object_deconstruction"
   }
 ]