From c413c3dadf5c906afd0ee91cf69faf9632ea2792 Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Fri, 11 Oct 2024 19:21:34 +0200 Subject: [PATCH] Condensed recipes in component crafting menu to reduce scrolling --- angelsindustries/changelog.txt | 15 ++++++---- .../prototypes/items/components-batteries.lua | 30 +++++++++---------- .../components-base-recipe-update.lua | 19 ++++++++++++ .../overrides/components-entity-update.lua | 4 +-- .../recipes/components-batteries-recipes.lua | 24 +++++++++++++++ .../recipes/components-cabling-recipes.lua | 20 +++++++++---- .../components-construction-recipes.lua | 20 +++++++++---- .../components-electronics-recipes.lua | 25 ++++++++++++---- .../recipes/components-mechanical-recipes.lua | 20 +++++++++---- .../recipes/components-weapons-recipes.lua | 20 +++++++++---- 10 files changed, 149 insertions(+), 48 deletions(-) diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt index e5ca16d2d..fbe1e9372 100644 --- a/angelsindustries/changelog.txt +++ b/angelsindustries/changelog.txt @@ -2,11 +2,16 @@ Version: 0.4.22 Date: ??? Changes: - - Added item description to Gravitational analyzer (984) - - Adjusted the recipes and science packs for Bob's Assembling Machines when Components or Technology Overhauls are enabled (985) - - Tech Overhaul: Hid Steam science pack from Bob's Technology mod (986) - - Adjust ingredients and tech prerequisites for Power armor and equipment when using Bob's mods (989) - - Added new settings to ease component mode progression + - Regular mode: + - Adjust ingredients and tech prerequisites for Power armor and equipment when using Bob's mods (989) + - Component mode: + - Adjusted the recipes for Bob's Assembling Machines when Components Overhaul is enabled (985) + - Added new settings to ease component mode progression + - Condensed recipes in component crafting menu to reduce scrolling + - Added item description to Gravitational analyzer (984) + - Science mode: + - Adjusted the science packs for Bob's Assembling Machines when Technology Overhauls is enabled (985) + - Hid Steam science pack from Bob's Technology mod (986) Bugfixes: - Fixed potential softlock with Tech Overhaul and Bob's Technology mod (986) --------------------------------------------------------------------------------------------------- diff --git a/angelsindustries/prototypes/items/components-batteries.lua b/angelsindustries/prototypes/items/components-batteries.lua index 273ad274e..b15b55d2e 100644 --- a/angelsindustries/prototypes/items/components-batteries.lua +++ b/angelsindustries/prototypes/items/components-batteries.lua @@ -176,7 +176,7 @@ if angelsmods.industries.components then }, icon_size = 64, subgroup = "angels-anodes", - order = "a", + order = "b", stack_size = 200, }, { @@ -190,7 +190,7 @@ if angelsmods.industries.components then }, icon_size = 64, subgroup = "angels-anodes", - order = "a", + order = "c", stack_size = 200, }, { @@ -204,7 +204,7 @@ if angelsmods.industries.components then }, icon_size = 64, subgroup = "angels-anodes", - order = "a", + order = "d", stack_size = 200, }, { @@ -218,7 +218,7 @@ if angelsmods.industries.components then }, icon_size = 64, subgroup = "angels-anodes", - order = "a", + order = "e", stack_size = 200, }, { @@ -232,7 +232,7 @@ if angelsmods.industries.components then }, icon_size = 64, subgroup = "angels-anodes", - order = "a", + order = "f", stack_size = 200, }, { @@ -260,7 +260,7 @@ if angelsmods.industries.components then }, icon_size = 64, subgroup = "angels-cathodes", - order = "a", + order = "b", stack_size = 200, }, { @@ -274,7 +274,7 @@ if angelsmods.industries.components then }, icon_size = 64, subgroup = "angels-cathodes", - order = "a", + order = "c", stack_size = 200, }, { @@ -288,7 +288,7 @@ if angelsmods.industries.components then }, icon_size = 64, subgroup = "angels-cathodes", - order = "a", + order = "d", stack_size = 200, }, { @@ -302,7 +302,7 @@ if angelsmods.industries.components then }, icon_size = 64, subgroup = "angels-cathodes", - order = "a", + order = "e", stack_size = 200, }, { @@ -316,7 +316,7 @@ if angelsmods.industries.components then }, icon_size = 64, subgroup = "angels-cathodes", - order = "a", + order = "f", stack_size = 200, }, ----------------------------------------------------------------------------- @@ -352,7 +352,7 @@ if angelsmods.industries.components then }, icon_size = 64, subgroup = "angels-electrolytes", - order = "a", + order = "b", default_temperature = 0, auto_barrel = false, heat_capacity = "0.01J", @@ -371,7 +371,7 @@ if angelsmods.industries.components then }, icon_size = 64, subgroup = "angels-electrolytes", - order = "a", + order = "c", default_temperature = 0, auto_barrel = false, heat_capacity = "0.01J", @@ -385,7 +385,7 @@ if angelsmods.industries.components then icons = { { icon = "__angelsindustries__/graphics/icons/battery_component_electrolyte.png" } }, icon_size = 64, subgroup = "angels-electrolytes", - order = "a", + order = "d", default_temperature = 0, auto_barrel = false, heat_capacity = "0.01J", @@ -404,7 +404,7 @@ if angelsmods.industries.components then }, icon_size = 64, subgroup = "angels-electrolytes", - order = "a", + order = "e", default_temperature = 0, auto_barrel = false, heat_capacity = "0.01J", @@ -423,7 +423,7 @@ if angelsmods.industries.components then }, icon_size = 64, subgroup = "angels-electrolytes", - order = "a", + order = "f", default_temperature = 0, auto_barrel = false, heat_capacity = "0.01J", diff --git a/angelsindustries/prototypes/overrides/components-base-recipe-update.lua b/angelsindustries/prototypes/overrides/components-base-recipe-update.lua index 894c4afc8..0d662fd0f 100644 --- a/angelsindustries/prototypes/overrides/components-base-recipe-update.lua +++ b/angelsindustries/prototypes/overrides/components-base-recipe-update.lua @@ -97,6 +97,25 @@ if angelsmods.industries.components then "battery-frame-6", "battery-casing-6", }) + -- patch battery 4 and 5 recipe ordening + OV.patch_recipes({ + { + name = "battery-frame-4", + subgroup = "angels-batteries", + }, + { + name = "battery-casing-4", + subgroup = "angels-anodes", + }, + { + name = "battery-frame-5", + subgroup = "angels-batteries", + }, + { + name = "battery-casing-5", + subgroup = "angels-anodes", + }, + }) end if mods["bobmodules"] then diff --git a/angelsindustries/prototypes/overrides/components-entity-update.lua b/angelsindustries/prototypes/overrides/components-entity-update.lua index cd2fc1a5f..7d0f3d546 100644 --- a/angelsindustries/prototypes/overrides/components-entity-update.lua +++ b/angelsindustries/prototypes/overrides/components-entity-update.lua @@ -2,8 +2,8 @@ local OV = angelsmods.functions.OV local RB = angelsmods.functions.RB local AI = angelsmods.functions.AI --require("prototypes.overrides.industries-override-functions") -local buildingmulti = angelsmods.marathon.buildingmulti -local buildingtime = angelsmods.marathon.buildingtime +--local buildingmulti = angelsmods.marathon.buildingmulti +--local buildingtime = angelsmods.marathon.buildingtime if angelsmods.industries.components then AI.add_con_mats() diff --git a/angelsindustries/prototypes/recipes/components-batteries-recipes.lua b/angelsindustries/prototypes/recipes/components-batteries-recipes.lua index 3d1a1a0c2..e15b8e6e1 100644 --- a/angelsindustries/prototypes/recipes/components-batteries-recipes.lua +++ b/angelsindustries/prototypes/recipes/components-batteries-recipes.lua @@ -128,6 +128,8 @@ if angelsmods.industries.components then { type = "recipe", name = "battery-casing-1", + subgroup = "angels-anodes", + order = "g", enabled = false, category = "crafting", energy_required = 5, @@ -154,6 +156,8 @@ if angelsmods.industries.components then { type = "recipe", name = "battery-frame-1", + subgroup = "angels-batteries", + order = "g", enabled = false, category = "crafting", energy_required = 0.5, @@ -232,6 +236,8 @@ if angelsmods.industries.components then { type = "recipe", name = "battery-casing-2", + subgroup = "angels-anodes", + order = "h", enabled = false, category = "crafting", energy_required = 5, @@ -258,6 +264,8 @@ if angelsmods.industries.components then { type = "recipe", name = "battery-frame-2", + subgroup = "angels-batteries", + order = "h", enabled = false, category = "crafting-with-fluid", energy_required = 1, @@ -378,6 +386,8 @@ if angelsmods.industries.components then { type = "recipe", name = "battery-casing-3", + subgroup = "angels-anodes", + order = "i", enabled = false, category = "crafting", energy_required = 5, @@ -404,6 +414,8 @@ if angelsmods.industries.components then { type = "recipe", name = "battery-frame-3", + subgroup = "angels-batteries", + order = "i", enabled = false, category = "crafting-with-fluid", energy_required = 1.5, @@ -483,6 +495,8 @@ if angelsmods.industries.components then { type = "recipe", name = "battery-casing-4", + subgroup = "angels-electrolytes", + order = "j", enabled = false, category = "crafting", energy_required = 5, @@ -510,6 +524,8 @@ if angelsmods.industries.components then { type = "recipe", name = "battery-frame-4", + subgroup = "angels-cathodes", + order = "j", enabled = false, category = "advanced-crafting", energy_required = 2, @@ -590,6 +606,8 @@ if angelsmods.industries.components then { type = "recipe", name = "battery-casing-5", + subgroup = "angels-electrolytes", + order = "k", enabled = false, category = "crafting", energy_required = 5, @@ -616,6 +634,8 @@ if angelsmods.industries.components then { type = "recipe", name = "battery-frame-5", + subgroup = "angels-cathodes", + order = "k", enabled = false, category = "crafting-with-fluid", energy_required = 3, @@ -697,6 +717,8 @@ if angelsmods.industries.components then { type = "recipe", name = "battery-casing-6", + subgroup = "angels-electrolytes", + order = "l", enabled = false, category = "crafting", energy_required = 5, @@ -723,6 +745,8 @@ if angelsmods.industries.components then { type = "recipe", name = "battery-frame-6", + subgroup = "angels-cathodes", + order = "l", enabled = false, category = "sintering-5", energy_required = 5, diff --git a/angelsindustries/prototypes/recipes/components-cabling-recipes.lua b/angelsindustries/prototypes/recipes/components-cabling-recipes.lua index f7ab2b890..ed611b0fe 100644 --- a/angelsindustries/prototypes/recipes/components-cabling-recipes.lua +++ b/angelsindustries/prototypes/recipes/components-cabling-recipes.lua @@ -70,6 +70,8 @@ if angelsmods.industries.components then { type = "recipe", name = "cable-harness-1", + subgroup = "angels-cable-shielding", + order = "f", energy_required = 1, category = "crafting", enabled = true, @@ -85,6 +87,8 @@ if angelsmods.industries.components then { type = "recipe", name = "cable-harness-2", + subgroup = "angels-cable-shielding", + order = "g", energy_required = 1.5, category = "advanced-crafting", enabled = false, @@ -99,6 +103,8 @@ if angelsmods.industries.components then { type = "recipe", name = "cable-harness-3", + subgroup = "angels-cable-shielding", + order = "h", energy_required = 2, category = "advanced-crafting", enabled = false, @@ -113,6 +119,8 @@ if angelsmods.industries.components then { type = "recipe", name = "cable-harness-4", + subgroup = "angels-cable-shielding", + order = "i", energy_required = 3.5, category = "crafting-with-fluid", enabled = false, @@ -127,6 +135,8 @@ if angelsmods.industries.components then { type = "recipe", name = "cable-harness-5", + subgroup = "angels-cable-shielding", + order = "j", energy_required = 5, category = "crafting-with-fluid", enabled = false, @@ -144,7 +154,7 @@ if angelsmods.industries.components then { type = "recipe", name = "cabling-cable-harness-1", - subgroup = "angels-cable-harness", + subgroup = "angels-servo-motor", order = "f", enabled = true, category = "crafting", @@ -171,7 +181,7 @@ if angelsmods.industries.components then { type = "recipe", name = "cabling-cable-harness-2", - subgroup = "angels-cable-harness", + subgroup = "angels-servo-motor", order = "g", enabled = false, category = "advanced-crafting", @@ -197,7 +207,7 @@ if angelsmods.industries.components then { type = "recipe", name = "cabling-cable-harness-3", - subgroup = "angels-cable-harness", + subgroup = "angels-servo-motor", order = "h", enabled = false, category = "advanced-crafting", @@ -223,7 +233,7 @@ if angelsmods.industries.components then { type = "recipe", name = "cabling-cable-harness-4", - subgroup = "angels-cable-harness", + subgroup = "angels-servo-motor", order = "h", enabled = false, category = "advanced-crafting", @@ -249,7 +259,7 @@ if angelsmods.industries.components then { type = "recipe", name = "cabling-cable-harness-5", - subgroup = "angels-cable-harness", + subgroup = "angels-servo-motor", order = "h", enabled = false, category = "advanced-crafting", diff --git a/angelsindustries/prototypes/recipes/components-construction-recipes.lua b/angelsindustries/prototypes/recipes/components-construction-recipes.lua index c46c8ddc7..05225807c 100644 --- a/angelsindustries/prototypes/recipes/components-construction-recipes.lua +++ b/angelsindustries/prototypes/recipes/components-construction-recipes.lua @@ -169,6 +169,8 @@ if angelsmods.industries.components then { type = "recipe", name = "angels-girder", + subgroup = "angels-construction-grates", + order = "f", enabled = true, category = "crafting", energy_required = 0.5, @@ -184,6 +186,8 @@ if angelsmods.industries.components then { type = "recipe", name = "angels-rivet", + subgroup = "angels-construction-grates", + order = "g", enabled = false, category = "advanced-crafting", energy_required = 1, @@ -198,6 +202,8 @@ if angelsmods.industries.components then { type = "recipe", name = "angels-bracket", + subgroup = "angels-construction-grates", + order = "h", enabled = false, category = "advanced-crafting", energy_required = 1.5, @@ -212,6 +218,8 @@ if angelsmods.industries.components then { type = "recipe", name = "angels-plating", + subgroup = "angels-construction-grates", + order = "i", enabled = false, category = "advanced-crafting", energy_required = 2, @@ -226,6 +234,8 @@ if angelsmods.industries.components then { type = "recipe", name = "angels-strut", + subgroup = "angels-construction-grates", + order = "j", enabled = false, category = "advanced-crafting", energy_required = 2.5, @@ -243,7 +253,7 @@ if angelsmods.industries.components then { type = "recipe", name = "construction-components-girder", - subgroup = "angels-construction-components", + subgroup = "angels-construction-frames", order = "f", enabled = true, category = "crafting", @@ -270,7 +280,7 @@ if angelsmods.industries.components then { type = "recipe", name = "construction-components-rivet", - subgroup = "angels-construction-components", + subgroup = "angels-construction-frames", order = "g", enabled = false, category = "advanced-crafting", @@ -296,7 +306,7 @@ if angelsmods.industries.components then { type = "recipe", name = "construction-components-bracket", - subgroup = "angels-construction-components", + subgroup = "angels-construction-frames", order = "h", enabled = false, category = "advanced-crafting", @@ -322,7 +332,7 @@ if angelsmods.industries.components then { type = "recipe", name = "construction-components-plating", - subgroup = "angels-construction-components", + subgroup = "angels-construction-frames", order = "h", enabled = false, category = "advanced-crafting", @@ -348,7 +358,7 @@ if angelsmods.industries.components then { type = "recipe", name = "construction-components-strut", - subgroup = "angels-construction-components", + subgroup = "angels-construction-frames", order = "h", enabled = false, category = "advanced-crafting", diff --git a/angelsindustries/prototypes/recipes/components-electronics-recipes.lua b/angelsindustries/prototypes/recipes/components-electronics-recipes.lua index 1055ff651..4df2df2de 100644 --- a/angelsindustries/prototypes/recipes/components-electronics-recipes.lua +++ b/angelsindustries/prototypes/recipes/components-electronics-recipes.lua @@ -6,6 +6,8 @@ if angelsmods.industries.components then { type = "recipe", name = "circuit-resistor", + subgroup = "angels-circuit-board", + order = "f", energy_required = 0.5, category = "crafting", --to allow hand crafting enabled = false, @@ -20,6 +22,8 @@ if angelsmods.industries.components then --{ -- type = "recipe", -- name = "circuit-resistor", + -- subgroup = "angels-circuit-board", + -- order = "f", -- energy_required = 3, -- category = "advanced-crafting", -- enabled = false, @@ -32,11 +36,12 @@ if angelsmods.industries.components then -- }, -- result = "circuit-resistor", -- icon_size = 32, - -- order = "b", --}, { type = "recipe", name = "circuit-transistor", + subgroup = "angels-circuit-board", + order = "g", energy_required = 1, category = "advanced-crafting", enabled = false, @@ -50,6 +55,8 @@ if angelsmods.industries.components then { type = "recipe", name = "circuit-microchip", + subgroup = "angels-circuit-board", + order = "h", energy_required = 1.5, category = "advanced-crafting", enabled = false, @@ -64,6 +71,8 @@ if angelsmods.industries.components then { type = "recipe", name = "circuit-transformer", + subgroup = "angels-circuit-board", + order = "i", energy_required = 2, category = "advanced-crafting", enabled = false, @@ -77,6 +86,8 @@ if angelsmods.industries.components then { type = "recipe", name = "circuit-cpu", + subgroup = "angels-circuit-board", + order = "j", energy_required = 2.5, category = "advanced-crafting", enabled = false, @@ -94,7 +105,7 @@ if angelsmods.industries.components then { type = "recipe", name = "electronic-parts-resistor", - subgroup = "angels-circuit-components", + subgroup = "angels-loaded-circuit-board", order = "f", energy_required = 1.5, category = "advanced-crafting", @@ -120,7 +131,7 @@ if angelsmods.industries.components then { type = "recipe", name = "electronic-parts-transistor", - subgroup = "angels-circuit-components", + subgroup = "angels-loaded-circuit-board", order = "g", energy_required = 1.5, category = "advanced-crafting", @@ -146,7 +157,7 @@ if angelsmods.industries.components then { type = "recipe", name = "electronic-parts-microchip", - subgroup = "angels-circuit-components", + subgroup = "angels-loaded-circuit-board", order = "h", energy_required = 1.5, category = "advanced-crafting", @@ -172,7 +183,7 @@ if angelsmods.industries.components then { type = "recipe", name = "electronic-parts-transformer", - subgroup = "angels-circuit-components", + subgroup = "angels-loaded-circuit-board", order = "i", energy_required = 1.5, category = "advanced-crafting", @@ -198,7 +209,7 @@ if angelsmods.industries.components then { type = "recipe", name = "electronic-parts-cpu", - subgroup = "angels-circuit-components", + subgroup = "angels-loaded-circuit-board", order = "j", energy_required = 1.5, category = "advanced-crafting", @@ -328,6 +339,8 @@ if angelsmods.industries.components then { type = "recipe", name = "circuit-grey", + subgroup = "angels-board", + order = "h", energy_required = 0.25, -- 1:1 ratio to boards category = "crafting", enabled = true, diff --git a/angelsindustries/prototypes/recipes/components-mechanical-recipes.lua b/angelsindustries/prototypes/recipes/components-mechanical-recipes.lua index 6c5d7e190..b921b833e 100644 --- a/angelsindustries/prototypes/recipes/components-mechanical-recipes.lua +++ b/angelsindustries/prototypes/recipes/components-mechanical-recipes.lua @@ -403,6 +403,8 @@ if angelsmods.industries.components then { type = "recipe", name = "angels-gear", + subgroup = "angels-motor-block", + order = "f", energy_required = 1, category = "crafting", enabled = true, -- enabled from the start @@ -418,6 +420,8 @@ if angelsmods.industries.components then { type = "recipe", name = "angels-axle", + subgroup = "angels-motor-block", + order = "g", energy_required = 1, category = "advanced-crafting", enabled = false, @@ -430,6 +434,8 @@ if angelsmods.industries.components then { type = "recipe", name = "angels-roller-chain", + subgroup = "angels-motor-block", + order = "h", energy_required = 1.5, category = "advanced-crafting", enabled = false, @@ -442,6 +448,8 @@ if angelsmods.industries.components then { type = "recipe", name = "angels-spring", + subgroup = "angels-motor-block", + order = "i", energy_required = 2, category = "advanced-crafting", enabled = false, @@ -454,6 +462,8 @@ if angelsmods.industries.components then { type = "recipe", name = "angels-bearing", + subgroup = "angels-motor-block", + order = "j", energy_required = 2.5, category = "advanced-crafting", enabled = false, @@ -471,7 +481,7 @@ if angelsmods.industries.components then { type = "recipe", name = "mechanical-parts-gear", - subgroup = "angels-mechanical-parts", + subgroup = "angels-motors", order = "f", energy_required = 3, category = "crafting", @@ -498,7 +508,7 @@ if angelsmods.industries.components then { type = "recipe", name = "mechanical-parts-axle", - subgroup = "angels-mechanical-parts", + subgroup = "angels-motors", order = "g", energy_required = 3, category = "advanced-crafting", @@ -524,7 +534,7 @@ if angelsmods.industries.components then { type = "recipe", name = "mechanical-parts-roller-chain", - subgroup = "angels-mechanical-parts", + subgroup = "angels-motors", order = "h", energy_required = 3, category = "advanced-crafting", @@ -550,7 +560,7 @@ if angelsmods.industries.components then { type = "recipe", name = "mechanical-parts-spring", - subgroup = "angels-mechanical-parts", + subgroup = "angels-motors", order = "i", energy_required = 3, category = "advanced-crafting", @@ -576,7 +586,7 @@ if angelsmods.industries.components then { type = "recipe", name = "mechanical-parts-bearing", - subgroup = "angels-mechanical-parts", + subgroup = "angels-motors", order = "j", energy_required = 3, category = "advanced-crafting", diff --git a/angelsindustries/prototypes/recipes/components-weapons-recipes.lua b/angelsindustries/prototypes/recipes/components-weapons-recipes.lua index ec14ff465..c4c7cf276 100644 --- a/angelsindustries/prototypes/recipes/components-weapons-recipes.lua +++ b/angelsindustries/prototypes/recipes/components-weapons-recipes.lua @@ -170,6 +170,8 @@ if angelsmods.industries.components then { type = "recipe", name = "angels-trigger", + subgroup = "angels-weapons-body", + order = "f", energy_required = 0.5, category = "crafting", enabled = false, @@ -183,6 +185,8 @@ if angelsmods.industries.components then { type = "recipe", name = "angels-explosionchamber", + subgroup = "angels-weapons-body", + order = "g", energy_required = 1, category = "advanced-crafting", enabled = false, @@ -195,6 +199,8 @@ if angelsmods.industries.components then { type = "recipe", name = "angels-fluidchamber", + subgroup = "angels-weapons-body", + order = "h", energy_required = 1.5, category = "advanced-crafting", enabled = false, @@ -207,6 +213,8 @@ if angelsmods.industries.components then { type = "recipe", name = "angels-energycrystal", + subgroup = "angels-weapons-body", + order = "i", energy_required = 2, category = "advanced-crafting", enabled = false, @@ -219,6 +227,8 @@ if angelsmods.industries.components then { type = "recipe", name = "angels-acceleratorcoil", + subgroup = "angels-weapons-body", + order = "j", energy_required = 2.5, category = "advanced-crafting", enabled = false, @@ -236,7 +246,7 @@ if angelsmods.industries.components then { type = "recipe", name = "weapon-parts-trigger", - subgroup = "angels-weapons-parts", + subgroup = "angels-weapons", order = "f", energy_required = 3, category = "advanced-crafting", @@ -262,7 +272,7 @@ if angelsmods.industries.components then { type = "recipe", name = "weapon-parts-explosionchamber", - subgroup = "angels-weapons-parts", + subgroup = "angels-weapons", order = "g", energy_required = 3, category = "advanced-crafting", @@ -288,7 +298,7 @@ if angelsmods.industries.components then { type = "recipe", name = "weapon-parts-fluidchamber", - subgroup = "angels-weapons-parts", + subgroup = "angels-weapons", order = "h", energy_required = 3, category = "advanced-crafting", @@ -314,7 +324,7 @@ if angelsmods.industries.components then { type = "recipe", name = "weapon-parts-energycrystal", - subgroup = "angels-weapons-parts", + subgroup = "angels-weapons", order = "i", energy_required = 3, category = "advanced-crafting", @@ -340,7 +350,7 @@ if angelsmods.industries.components then { type = "recipe", name = "weapon-parts-acceleratorcoil", - subgroup = "angels-weapons-parts", + subgroup = "angels-weapons", order = "j", energy_required = 3, category = "advanced-crafting",