From ea9e9191eeffe7b4b9da5556fce6a478b19edb2d Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Wed, 18 Sep 2024 23:04:02 +1200 Subject: [PATCH] Removing module_specification --- .../prototypes/assembly-electronics.lua | 22 +++-- bobassembly/prototypes/assembly-updates.lua | 2 +- bobassembly/prototypes/assembly.lua | 33 ++++--- bobassembly/prototypes/centrifuge.lua | 4 +- .../prototypes/chemical-mixing-furnace.lua | 22 +++-- bobassembly/prototypes/chemical-plant.lua | 12 +-- bobassembly/prototypes/distillery.lua | 8 +- bobassembly/prototypes/electric-furnace.lua | 11 ++- bobassembly/prototypes/electrolyser.lua | 16 +--- bobassembly/prototypes/oil-refinery.lua | 6 +- bobgreenhouse/prototypes/entities.lua | 3 - bobmining/prototypes/drill-functions.lua | 2 +- bobmining/prototypes/pumpjacks.lua | 44 ++++++---- bobmining/prototypes/water-miner.lua | 48 ++++++---- bobmodules/prototypes/beacon.lua | 6 +- bobplates/prototypes/distillery.lua | 4 +- bobplates/prototypes/entity/entities.lua | 26 +++--- bobplates/prototypes/entity/pumps.lua | 88 ++++++++++++------- bobtech/prototypes/entity/entity-alien.lua | 9 +- bobtech/prototypes/entity/entity.lua | 9 +- 20 files changed, 216 insertions(+), 159 deletions(-) diff --git a/bobassembly/prototypes/assembly-electronics.lua b/bobassembly/prototypes/assembly-electronics.lua index e8550324..41ee8e51 100644 --- a/bobassembly/prototypes/assembly-electronics.lua +++ b/bobassembly/prototypes/assembly-electronics.lua @@ -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" }, }, @@ -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" }, }, @@ -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" }, }, diff --git a/bobassembly/prototypes/assembly-updates.lua b/bobassembly/prototypes/assembly-updates.lua index 13bc384a..73b391e4 100644 --- a/bobassembly/prototypes/assembly-updates.lua +++ b/bobassembly/prototypes/assembly-updates.lua @@ -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 diff --git a/bobassembly/prototypes/assembly.lua b/bobassembly/prototypes/assembly.lua index 72e20012..d8c479fe 100644 --- a/bobassembly/prototypes/assembly.lua +++ b/bobassembly/prototypes/assembly.lua @@ -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" }, }, @@ -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" }, }, @@ -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" }, }, diff --git a/bobassembly/prototypes/centrifuge.lua b/bobassembly/prototypes/centrifuge.lua index 0f9255e9..f98f93fc 100644 --- a/bobassembly/prototypes/centrifuge.lua +++ b/bobassembly/prototypes/centrifuge.lua @@ -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", }, }), @@ -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, }, }), diff --git a/bobassembly/prototypes/chemical-mixing-furnace.lua b/bobassembly/prototypes/chemical-mixing-furnace.lua index ec363290..059981ea 100644 --- a/bobassembly/prototypes/chemical-mixing-furnace.lua +++ b/bobassembly/prototypes/chemical-mixing-furnace.lua @@ -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" }, @@ -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" }, diff --git a/bobassembly/prototypes/chemical-plant.lua b/bobassembly/prototypes/chemical-plant.lua index 979ab780..229ab4ab 100644 --- a/bobassembly/prototypes/chemical-plant.lua +++ b/bobassembly/prototypes/chemical-plant.lua @@ -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 = { @@ -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 = { @@ -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 = { diff --git a/bobassembly/prototypes/distillery.lua b/bobassembly/prototypes/distillery.lua index 7ccbb5ae..174c9878 100644 --- a/bobassembly/prototypes/distillery.lua +++ b/bobassembly/prototypes/distillery.lua @@ -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", }, }), @@ -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", }, }), @@ -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", }, }), @@ -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, }, }), diff --git a/bobassembly/prototypes/electric-furnace.lua b/bobassembly/prototypes/electric-furnace.lua index 281a1ee7..b56fc76d 100644 --- a/bobassembly/prototypes/electric-furnace.lua +++ b/bobassembly/prototypes/electric-furnace.lua @@ -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" }, diff --git a/bobassembly/prototypes/electrolyser.lua b/bobassembly/prototypes/electrolyser.lua index 9a4529e5..da405d99 100644 --- a/bobassembly/prototypes/electrolyser.lua +++ b/bobassembly/prototypes/electrolyser.lua @@ -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 = { @@ -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 = { @@ -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 = { @@ -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 = { diff --git a/bobassembly/prototypes/oil-refinery.lua b/bobassembly/prototypes/oil-refinery.lua index 554233cb..52430f80 100644 --- a/bobassembly/prototypes/oil-refinery.lua +++ b/bobassembly/prototypes/oil-refinery.lua @@ -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 }, @@ -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 }, @@ -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 }, diff --git a/bobgreenhouse/prototypes/entities.lua b/bobgreenhouse/prototypes/entities.lua index e5183b75..9fa16a27 100644 --- a/bobgreenhouse/prototypes/entities.lua +++ b/bobgreenhouse/prototypes/entities.lua @@ -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", diff --git a/bobmining/prototypes/drill-functions.lua b/bobmining/prototypes/drill-functions.lua index 7eecebc6..5e0e4ea5 100644 --- a/bobmining/prototypes/drill-functions.lua +++ b/bobmining/prototypes/drill-functions.lua @@ -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 diff --git a/bobmining/prototypes/pumpjacks.lua b/bobmining/prototypes/pumpjacks.lua index e79f39dd..ff735d21 100644 --- a/bobmining/prototypes/pumpjacks.lua +++ b/bobmining/prototypes/pumpjacks.lua @@ -139,10 +139,13 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then mining_speed = 2, resource_searching_radius = 0.49, vector_to_place_result = { 0, 0 }, - module_specification = { - module_slots = 3, - module_info_icon_shift = { 0, 0.5 }, - module_info_multi_row_initial_height_modifier = -0.3, + module_slots = 3, + icons_positioning = { + { + inventory_index = defines.inventory.mining_drill_modules, + shift = {0, 0.5 }, + multi_row_initial_height_modifier = -0.3 + } }, fast_replaceable_group = "pumpjack", radius_visualisation_picture = { @@ -279,10 +282,13 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then mining_speed = 3, resource_searching_radius = 0.49, vector_to_place_result = { 0, 0 }, - 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.mining_drill_modules, + shift = { 0, 0.5 }, + multi_row_initial_height_modifier = -0.3 + } }, fast_replaceable_group = "pumpjack", radius_visualisation_picture = { @@ -419,10 +425,13 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then mining_speed = 4, resource_searching_radius = 0.49, vector_to_place_result = { 0, 0 }, - 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.mining_drill_modules, + shift = { 0, 0.5 }, + multi_row_initial_height_modifier = -0.3 + } }, fast_replaceable_group = "pumpjack", radius_visualisation_picture = { @@ -559,10 +568,13 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then mining_speed = 5, resource_searching_radius = 0.49, vector_to_place_result = { 0, 0 }, - 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.mining_drill_modules, + shift = { 0, 0.5 }, + multi_row_initial_height_modifier = -0.3 + } }, fast_replaceable_group = "pumpjack", radius_visualisation_picture = { diff --git a/bobmining/prototypes/water-miner.lua b/bobmining/prototypes/water-miner.lua index baec2e1a..cdea5725 100644 --- a/bobmining/prototypes/water-miner.lua +++ b/bobmining/prototypes/water-miner.lua @@ -159,9 +159,7 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re mining_speed = 1, resource_searching_radius = 0.49, vector_to_place_result = { 0, 0 }, - module_specification = { - module_slots = 1, - }, + module_slots = 1, radius_visualisation_picture = { filename = "__bobmining__/graphics/entity/water-miner/water-miner-radius-visualization.png", width = 12, @@ -226,10 +224,13 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re mining_speed = 2, resource_searching_radius = 0.49, vector_to_place_result = { 0, 0 }, - module_specification = { - module_slots = 2, - module_info_icon_shift = { 0, 0.5 }, - module_info_multi_row_initial_height_modifier = -0.3, + module_slots = 2, + icons_positioning = { + { + inventory_index = defines.inventory.mining_drill_modules, + shift = { 0, 0.5 }, + multi_row_initial_height_modifier = -0.3 + } }, fast_replaceable_group = "pumpjack", radius_visualisation_picture = { @@ -295,10 +296,13 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re mining_speed = 3, resource_searching_radius = 0.49, vector_to_place_result = { 0, 0 }, - module_specification = { - module_slots = 3, - module_info_icon_shift = { 0, 0.5 }, - module_info_multi_row_initial_height_modifier = -0.3, + module_slots = 3, + icons_positioning = { + { + inventory_index = defines.inventory.mining_drill_modules, + shift = { 0, 0.5 }, + multi_row_initial_height_modifier = -0.3 + } }, fast_replaceable_group = "pumpjack", radius_visualisation_picture = { @@ -364,10 +368,13 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re mining_speed = 4, resource_searching_radius = 0.49, vector_to_place_result = { 0, 0 }, - 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.mining_drill_modules, + shift = { 0, 0.5 }, + multi_row_initial_height_modifier = -0.3 + } }, fast_replaceable_group = "pumpjack", radius_visualisation_picture = { @@ -433,10 +440,13 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re mining_speed = 5, resource_searching_radius = 0.49, vector_to_place_result = { 0, 0 }, - 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.mining_drill_modules, + shift = { 0, 0.5 }, + multi_row_initial_height_modifier = -0.3 + } }, fast_replaceable_group = "pumpjack", radius_visualisation_picture = { diff --git a/bobmodules/prototypes/beacon.lua b/bobmodules/prototypes/beacon.lua index 39dd89c6..82c49725 100644 --- a/bobmodules/prototypes/beacon.lua +++ b/bobmodules/prototypes/beacon.lua @@ -34,7 +34,7 @@ data:extend({ next_upgrade = "beacon-3", supply_area_distance = 6, distribution_effectivity = 0.75, - module_specification = { module_slots = 4 }, + module_slots = 4, }, }), @@ -46,7 +46,7 @@ data:extend({ max_health = 400, supply_area_distance = 9, distribution_effectivity = 1, - module_specification = { module_slots = 6 }, + module_slots = 6, }, }), @@ -143,5 +143,3 @@ data:extend({ }) data.raw.beacon["beacon"].next_upgrade = "beacon-2" -data.raw.beacon["beacon-2"].module_specification.module_info_max_icons_per_row = nil -data.raw.beacon["beacon-3"].module_specification.module_info_max_icons_per_row = nil diff --git a/bobplates/prototypes/distillery.lua b/bobplates/prototypes/distillery.lua index b7b46a2f..f528aaa2 100644 --- a/bobplates/prototypes/distillery.lua +++ b/bobplates/prototypes/distillery.lua @@ -248,9 +248,7 @@ if settings.startup["bobmods-plates-purewater"].value == true then animation = bobmods.plates.distillery_animation({ r = 0.7, g = 0.7, b = 0.1 }), working_visualisations = bobmods.plates.distillery_working_visualisations(1), allowed_effects = { "consumption", "speed", "pollution" }, - module_specification = { - module_slots = 1, - }, + module_slots = 1, working_sound = { sound = { filename = "__base__/sound/boiler.ogg", diff --git a/bobplates/prototypes/entity/entities.lua b/bobplates/prototypes/entity/entities.lua index 9133b576..7df1baf3 100644 --- a/bobplates/prototypes/entity/entities.lua +++ b/bobplates/prototypes/entity/entities.lua @@ -107,9 +107,7 @@ data:extend({ max_health = 150, crafting_categories = { "electrolysis" }, allowed_effects = { "consumption", "speed", "productivity", "pollution" }, - module_specification = { - module_slots = 1, - }, + module_slots = 1, crafting_speed = 0.75, energy_usage = "420kW", energy_source = { @@ -369,10 +367,13 @@ data:extend({ collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } }, selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } }, - module_specification = { - module_slots = 2, - module_info_icon_shift = { 0, 0.5 }, - module_info_multi_row_initial_height_modifier = -0.3, + module_slots = 2, + icons_positioning = { + { + inventory_index = defines.inventory.assembling_machine_modules, + shift = { 0, 0.5 }, + multi_row_initial_height_modifier = -0.3 + } }, crafting_speed = 2, crafting_categories = { "smelting", "chemical-furnace" }, @@ -575,10 +576,13 @@ data:extend({ collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } }, selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } }, - module_specification = { - module_slots = 2, - module_info_icon_shift = { 0, 0.5 }, - module_info_multi_row_initial_height_modifier = -0.3, + module_slots = 2, + icons_positioning = { + { + inventory_index = defines.inventory.assembling_machine_modules, + shift = { 0, 0.5 }, + multi_row_initial_height_modifier = -0.3 + } }, crafting_speed = 2, crafting_categories = { "smelting", "mixing-furnace" }, diff --git a/bobplates/prototypes/entity/pumps.lua b/bobplates/prototypes/entity/pumps.lua index b4bba6a6..2f3524f8 100644 --- a/bobplates/prototypes/entity/pumps.lua +++ b/bobplates/prototypes/entity/pumps.lua @@ -9,10 +9,13 @@ data:extend({ max_health = 150, crafting_categories = { "air-pump" }, crafting_speed = 1, - module_specification = { - module_slots = 1, - module_info_icon_shift = { 0, 0.5 }, - module_info_multi_row_initial_height_modifier = -0.3, + module_slots = 1, + icons_positioning = { + { + inventory_index = defines.inventory.assembling_machine_modules, + shift = { 0, 0.5 }, + multi_row_initial_height_modifier = -0.3 + } }, allowed_effects = { "consumption", "speed", "pollution" }, fast_replaceable_group = "air-pump", @@ -94,10 +97,13 @@ data:extend({ max_health = 180, crafting_categories = { "air-pump" }, crafting_speed = 2, - module_specification = { - module_slots = 2, - module_info_icon_shift = { 0, 0.5 }, - module_info_multi_row_initial_height_modifier = -0.3, + module_slots = 2, + icons_positioning = { + { + inventory_index = defines.inventory.assembling_machine_modules, + shift = { 0, 0.5 }, + multi_row_initial_height_modifier = -0.3 + } }, allowed_effects = { "consumption", "speed", "pollution" }, fast_replaceable_group = "air-pump", @@ -179,10 +185,13 @@ data:extend({ max_health = 230, crafting_categories = { "air-pump" }, crafting_speed = 3.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 + } }, allowed_effects = { "consumption", "speed", "pollution" }, fast_replaceable_group = "air-pump", @@ -264,10 +273,13 @@ data:extend({ max_health = 300, crafting_categories = { "air-pump" }, crafting_speed = 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 + } }, allowed_effects = { "consumption", "speed", "pollution" }, fast_replaceable_group = "air-pump", @@ -348,10 +360,13 @@ data:extend({ max_health = 120, crafting_categories = { "water-pump", "barrelling" }, crafting_speed = 1, - module_specification = { - module_slots = 1, - module_info_icon_shift = { 0, 0.5 }, - module_info_multi_row_initial_height_modifier = -0.3, + module_slots = 1, + icons_positioning = { + { + inventory_index = defines.inventory.assembling_machine_modules, + shift = { 0, 0.5 }, + multi_row_initial_height_modifier = -0.3 + } }, allowed_effects = { "consumption", "speed", "pollution" }, fast_replaceable_group = "water-pump", @@ -754,10 +769,13 @@ data:extend({ max_health = 180, crafting_categories = { "water-pump", "barrelling" }, crafting_speed = 2, - module_specification = { - module_slots = 2, - module_info_icon_shift = { 0, 0.5 }, - module_info_multi_row_initial_height_modifier = -0.3, + module_slots = 2, + icons_positioning = { + { + inventory_index = defines.inventory.assembling_machine_modules, + shift = { 0, 0.5 }, + multi_row_initial_height_modifier = -0.3 + } }, allowed_effects = { "consumption", "speed", "pollution" }, fast_replaceable_group = "water-pump", @@ -839,10 +857,13 @@ data:extend({ max_health = 230, crafting_categories = { "water-pump", "barrelling" }, crafting_speed = 3.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 + } }, allowed_effects = { "consumption", "speed", "pollution" }, fast_replaceable_group = "water-pump", @@ -924,10 +945,13 @@ data:extend({ max_health = 300, crafting_categories = { "water-pump", "barrelling" }, crafting_speed = 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 + } }, allowed_effects = { "consumption", "speed", "pollution" }, fast_replaceable_group = "water-pump", diff --git a/bobtech/prototypes/entity/entity-alien.lua b/bobtech/prototypes/entity/entity-alien.lua index 93e86a6f..7e28ea61 100644 --- a/bobtech/prototypes/entity/entity-alien.lua +++ b/bobtech/prototypes/entity/entity-alien.lua @@ -162,9 +162,12 @@ then "alien-science-pack-green", "alien-science-pack-red", }, - module_specification = { - module_slots = 3, - module_info_icon_shift = { 0, 0.9 }, + module_slots = 3, + icons_positioning = { + { + inventory_index = defines.inventory.lab_modules, + shift = { 0, 0.9 }, + } }, fast_replaceable_group = "lab", }, diff --git a/bobtech/prototypes/entity/entity.lua b/bobtech/prototypes/entity/entity.lua index 76d19f66..7f9e35ae 100644 --- a/bobtech/prototypes/entity/entity.lua +++ b/bobtech/prototypes/entity/entity.lua @@ -154,9 +154,12 @@ data:extend({ "utility-science-pack", "space-science-pack", }, - module_specification = { - module_slots = 4, - module_info_icon_shift = { 0, 0.9 }, + module_slots = 4, + icons_positioning = { + { + inventory_index = defines.inventory.lab_modules, + shift = { 0, 0.9 }, + } }, fast_replaceable_group = "lab", },