Skip to content

Commit

Permalink
Removing module_specification
Browse files Browse the repository at this point in the history
  • Loading branch information
@KiwiHawk
KiwiHawk committed Sep 18, 2024
1 parent 09eb1ae commit ea9e919
Show file tree
Hide file tree
Showing 20 changed files with 216 additions and 159 deletions.
22 changes: 13 additions & 9 deletions bobassembly/prototypes/assembly-electronics.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,7 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
emissions_per_minute = 2,
},
energy_usage = "100kW",
module_specification = {
module_slots = 2,
},
module_slots = 2,
allowed_effects = { "consumption", "speed", "productivity", "pollution" },
},

Expand Down Expand Up @@ -294,9 +292,12 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
emissions_per_minute = 1,
},
energy_usage = "213.75kW",
module_specification = {
module_slots = 4,
module_info_max_icons_per_row = 3,
module_slots = 4,
icons_positioning = {
{
inventory_index = defines.inventory.assembling_machine_modules,
max_icons_per_row = 3,
}
},
allowed_effects = { "consumption", "speed", "productivity", "pollution" },
},
Expand Down Expand Up @@ -466,9 +467,12 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
emissions_per_minute = 0.5,
},
energy_usage = "360kW",
module_specification = {
module_slots = 6,
module_info_max_icons_per_row = 3,
module_slots = 6,
icons_positioning = {
{
inventory_index = defines.inventory.assembling_machine_modules,
max_icons_per_row = 3,
}
},
allowed_effects = { "consumption", "speed", "productivity", "pollution" },
},
Expand Down
2 changes: 1 addition & 1 deletion bobassembly/prototypes/assembly-updates.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ else
bobmods.lib.recipe.add_ingredient("assembling-machine-3", { type = "item", name = "iron-gear-wheel", amount = 5 })
end

data.raw["assembling-machine"]["assembling-machine-3"].module_specification.module_slots = 3
data.raw["assembling-machine"]["assembling-machine-3"].module_slots = 3
data.raw["assembling-machine"]["assembling-machine-3"].next_upgrade = "assembling-machine-4"

if data.raw.item["aluminium-plate"] then
Expand Down
33 changes: 21 additions & 12 deletions bobassembly/prototypes/assembly.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,13 @@ data:extend({
emissions_per_minute = 1.5,
},
energy_usage = "300kW",
module_specification = {
module_slots = 4,
module_info_icon_shift = { 0, 0.5 },
module_info_multi_row_initial_height_modifier = -0.3,
module_slots = 4,
icons_positioning = {
{
inventory_index = defines.inventory.assembling_machine_modules,
shift = {0, 0.5 },
multi_row_initial_height_modifier = -0.3
}
},
allowed_effects = { "consumption", "speed", "productivity", "pollution" },
},
Expand Down Expand Up @@ -277,10 +280,13 @@ data:extend({
emissions_per_minute = 1,
},
energy_usage = "390kW",
module_specification = {
module_slots = 5,
module_info_icon_shift = { 0, 0.5 },
module_info_multi_row_initial_height_modifier = -0.3,
module_slots = 5,
icons_positioning = {
{
inventory_index = defines.inventory.assembling_machine_modules,
shift = { 0, 0.5 },
multi_row_initial_height_modifier = -0.3
}
},
allowed_effects = { "consumption", "speed", "productivity", "pollution" },
},
Expand Down Expand Up @@ -455,10 +461,13 @@ data:extend({
emissions_per_minute = 0.75,
},
energy_usage = "480kW",
module_specification = {
module_slots = 6,
module_info_icon_shift = { 0, 0.5 },
module_info_multi_row_initial_height_modifier = -0.3,
module_slots = 6,
icons_positioning = {
{
inventory_index = defines.inventory.assembling_machine_modules,
shift = { 0, 0.5 },
multi_row_initial_height_modifier = -0.3
}
},
allowed_effects = { "consumption", "speed", "productivity", "pollution" },
},
Expand Down
4 changes: 2 additions & 2 deletions bobassembly/prototypes/centrifuge.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ if settings.startup["bobmods-assembly-centrifuge"].value == true then
crafting_speed = 2.25,
energy_usage = "750kW",
energy_source = { emissions_per_minute = 3 },
module_specification = { module_slots = 4 },
module_slots = 4,
next_upgrade = "centrifuge-3",
},
}),
Expand All @@ -81,7 +81,7 @@ if settings.startup["bobmods-assembly-centrifuge"].value == true then
crafting_speed = 3.5,
energy_usage = "1050kW",
energy_source = { emissions_per_minute = 2 },
module_specification = { module_slots = 6 },
module_slots = 6,
},
}),

Expand Down
22 changes: 14 additions & 8 deletions bobassembly/prototypes/chemical-mixing-furnace.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,13 @@ then
collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } },
selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },

module_specification = {
module_slots = 4,
module_info_icon_shift = { 0, 0.5 },
module_info_multi_row_initial_height_modifier = -0.3,
module_slots = 4,
icons_positioning = {
{
inventory_index = defines.inventory.assembling_machine_modules,
shift = {0, 0.5 },
multi_row_initial_height_modifier = -0.3
}
},
crafting_speed = 3,
crafting_categories = { "smelting", "mixing-furnace", "chemical-furnace" },
Expand Down Expand Up @@ -204,10 +207,13 @@ then
collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } },
selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },

module_specification = {
module_slots = 6,
module_info_icon_shift = { 0, 0.5 },
module_info_multi_row_initial_height_modifier = -0.3,
module_slots = 6,
icons_positioning = {
{
inventory_index = defines.inventory.assembling_machine_modules,
shift = {0, 0.5 },
multi_row_initial_height_modifier = -0.3
}
},
crafting_speed = 4,
crafting_categories = { "smelting", "mixing-furnace", "chemical-furnace" },
Expand Down
12 changes: 3 additions & 9 deletions bobassembly/prototypes/chemical-plant.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,9 +405,7 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } },
selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
allowed_effects = { "consumption", "speed", "productivity", "pollution" },
module_specification = {
module_slots = 4,
},
module_slots = 4,
crafting_speed = 1.75,
energy_usage = "260kW",
energy_source = {
Expand Down Expand Up @@ -439,9 +437,7 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } },
selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
allowed_effects = { "consumption", "speed", "productivity", "pollution" },
module_specification = {
module_slots = 5,
},
module_slots = 5,
crafting_speed = 2.75,
energy_usage = "390kW",
energy_source = {
Expand Down Expand Up @@ -473,9 +469,7 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } },
selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
allowed_effects = { "consumption", "speed", "productivity", "pollution" },
module_specification = {
module_slots = 6,
},
module_slots = 6,
crafting_speed = 3.5,
energy_usage = "480kW",
energy_source = {
Expand Down
8 changes: 4 additions & 4 deletions bobassembly/prototypes/distillery.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ then
working_visualisations = bobmods.plates.distillery_working_visualisations(1.5),
crafting_speed = 1.5,
energy_usage = "260kW",
module_specification = { module_slots = 2 },
module_slots = 2,
next_upgrade = "bob-distillery-3",
},
}),
Expand All @@ -137,7 +137,7 @@ then
working_visualisations = bobmods.plates.distillery_working_visualisations(2.1),
crafting_speed = 2.1,
energy_usage = "360kW",
module_specification = { module_slots = 3 },
module_slots = 3,
next_upgrade = "bob-distillery-4",
},
}),
Expand All @@ -153,7 +153,7 @@ then
working_visualisations = bobmods.plates.distillery_working_visualisations(2.8),
crafting_speed = 2.8,
energy_usage = "480kW",
module_specification = { module_slots = 4 },
module_slots = 4,
next_upgrade = "bob-distillery-5",
},
}),
Expand All @@ -169,7 +169,7 @@ then
working_visualisations = bobmods.plates.distillery_working_visualisations(3.5),
crafting_speed = 3.5,
energy_usage = "600kW",
module_specification = { module_slots = 5 },
module_slots = 5,
},
}),

Expand Down
11 changes: 7 additions & 4 deletions bobassembly/prototypes/electric-furnace.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,13 @@ if settings.startup["bobmods-assembly-furnaces"].value == true and data.raw.furn
},
collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } },
selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
module_specification = {
module_slots = input.module_slots or 2,
module_info_icon_shift = { 0, 0.8 },
module_info_multi_row_initial_height_modifier = -0.3,
module_slots = input.module_slots or 2,
icons_positioning = {
{
inventory_index = defines.inventory.assembling_machine_modules,
shift = {0, 0.8 },
multi_row_initial_height_modifier = -0.3
}
},
allowed_effects = { "consumption", "speed", "productivity", "pollution" },
crafting_categories = { "smelting" },
Expand Down
16 changes: 4 additions & 12 deletions bobassembly/prototypes/electrolyser.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,7 @@ then
max_health = 275,
crafting_categories = { "electrolysis" },
allowed_effects = { "consumption", "speed", "productivity", "pollution" },
module_specification = {
module_slots = 3,
},
module_slots = 3,
crafting_speed = 1.25,
energy_usage = "650kW",
energy_source = {
Expand Down Expand Up @@ -313,9 +311,7 @@ then
max_health = 375,
crafting_categories = { "electrolysis" },
allowed_effects = { "consumption", "speed", "productivity", "pollution" },
module_specification = {
module_slots = 4,
},
module_slots = 4,
crafting_speed = 2,
energy_usage = "960kW",
energy_source = {
Expand Down Expand Up @@ -347,9 +343,7 @@ then
max_health = 500,
crafting_categories = { "electrolysis" },
allowed_effects = { "consumption", "speed", "productivity", "pollution" },
module_specification = {
module_slots = 5,
},
module_slots = 5,
crafting_speed = 2.75,
energy_usage = "1210kW",
energy_source = {
Expand Down Expand Up @@ -380,9 +374,7 @@ then
max_health = 600,
crafting_categories = { "electrolysis" },
allowed_effects = { "consumption", "speed", "productivity", "pollution" },
module_specification = {
module_slots = 6,
},
module_slots = 6,
crafting_speed = 3.5,
energy_usage = "1400kW",
energy_source = {
Expand Down
6 changes: 3 additions & 3 deletions bobassembly/prototypes/oil-refinery.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then
minable = { result = "oil-refinery-2" },
next_upgrade = "oil-refinery-3",
max_health = 400,
module_specification = { module_slots = 4 },
module_slots = 4,
crafting_speed = 1.75,
energy_usage = "720kW",
energy_source = { emissions_per_minute = 5 },
Expand Down Expand Up @@ -122,7 +122,7 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then
minable = { result = "oil-refinery-3" },
next_upgrade = "oil-refinery-4",
max_health = 500,
module_specification = { module_slots = 5 },
module_slots = 5,
crafting_speed = 2.5,
energy_usage = "1MW",
energy_source = { emissions_per_minute = 4 },
Expand Down Expand Up @@ -195,7 +195,7 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then
icon_size = 64,
minable = { result = "oil-refinery-4" },
max_health = 600,
module_specification = { module_slots = 6 },
module_slots = 6,
crafting_speed = 3.5,
energy_usage = "1.35MW",
energy_source = { emissions_per_minute = 3 },
Expand Down
3 changes: 0 additions & 3 deletions bobgreenhouse/prototypes/entities.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ data:extend({
pipe_connections = { { type = "input", position = { 0, -2 } } },
},
},
module_specification = {
module_slots = 0,
},
allowed_effects = { "consumption", "speed", "productivity", "pollution" },
animation = {
filename = "__bobgreenhouse__/graphics/entity/greenhouse.png",
Expand Down
2 changes: 1 addition & 1 deletion bobmining/prototypes/drill-functions.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function bobmods.mining.electric_mining_drill(inputs)

mining_drill.energy_usage = inputs.energy_usage or "100kW"
mining_drill.mining_speed = inputs.mining_speed or 0.5
mining_drill.module_specification = { module_slots = inputs.module_slots or 3 }
mining_drill.module_slots = inputs.module_slots or 3
mining_drill.resource_searching_radius = inputs.resource_searching_radius or 2.49
mining_drill.circuit_wire_max_distance = inputs.circuit_wire_max_distance or default_circuit_wire_max_distance

Expand Down
Loading

0 comments on commit ea9e919

Please sign in to comment.