Skip to content

Commit

Permalink
Condensed recipes in component crafting menu to reduce scrolling
Browse files Browse the repository at this point in the history
  • Loading branch information
@LovelySanta
LovelySanta committed Oct 11, 2024
1 parent c5dd1be commit c413c3d
Show file tree
Hide file tree
Showing 10 changed files with 149 additions and 48 deletions.
15 changes: 10 additions & 5 deletions angelsindustries/changelog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
---------------------------------------------------------------------------------------------------
Expand Down
30 changes: 15 additions & 15 deletions angelsindustries/prototypes/items/components-batteries.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ if angelsmods.industries.components then
},
icon_size = 64,
subgroup = "angels-anodes",
order = "a",
order = "b",
stack_size = 200,
},
{
Expand All @@ -190,7 +190,7 @@ if angelsmods.industries.components then
},
icon_size = 64,
subgroup = "angels-anodes",
order = "a",
order = "c",
stack_size = 200,
},
{
Expand All @@ -204,7 +204,7 @@ if angelsmods.industries.components then
},
icon_size = 64,
subgroup = "angels-anodes",
order = "a",
order = "d",
stack_size = 200,
},
{
Expand All @@ -218,7 +218,7 @@ if angelsmods.industries.components then
},
icon_size = 64,
subgroup = "angels-anodes",
order = "a",
order = "e",
stack_size = 200,
},
{
Expand All @@ -232,7 +232,7 @@ if angelsmods.industries.components then
},
icon_size = 64,
subgroup = "angels-anodes",
order = "a",
order = "f",
stack_size = 200,
},
{
Expand Down Expand Up @@ -260,7 +260,7 @@ if angelsmods.industries.components then
},
icon_size = 64,
subgroup = "angels-cathodes",
order = "a",
order = "b",
stack_size = 200,
},
{
Expand All @@ -274,7 +274,7 @@ if angelsmods.industries.components then
},
icon_size = 64,
subgroup = "angels-cathodes",
order = "a",
order = "c",
stack_size = 200,
},
{
Expand All @@ -288,7 +288,7 @@ if angelsmods.industries.components then
},
icon_size = 64,
subgroup = "angels-cathodes",
order = "a",
order = "d",
stack_size = 200,
},
{
Expand All @@ -302,7 +302,7 @@ if angelsmods.industries.components then
},
icon_size = 64,
subgroup = "angels-cathodes",
order = "a",
order = "e",
stack_size = 200,
},
{
Expand All @@ -316,7 +316,7 @@ if angelsmods.industries.components then
},
icon_size = 64,
subgroup = "angels-cathodes",
order = "a",
order = "f",
stack_size = 200,
},
-----------------------------------------------------------------------------
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
19 changes: 19 additions & 0 deletions angelsindustries/prototypes/overrides/components-base-recipe-update.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions angelsindustries/prototypes/overrides/components-entity-update.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
24 changes: 24 additions & 0 deletions angelsindustries/prototypes/recipes/components-batteries-recipes.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
20 changes: 15 additions & 5 deletions angelsindustries/prototypes/recipes/components-cabling-recipes.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
Loading

0 comments on commit c413c3d

Please sign in to comment.