aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-27 11:35:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #257 from PHIDIAS0303/dev5

Browse Source 
fixed non prod module insertion with recipe
This commit is contained in:
Cooldude2606
2023-12-21 20:16:24 +00:00
committed by GitHub
parent ca25401653 d0dec6bae3
commit e43cb3d6a4
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/module.lua
View File

@@ -1,6 +1,6 @@
return { return {
-- type of machine to handle together -- type of machine to handle together
default_module_row_count = 4, default_module_row_count = 6,
module_slot_max = 4, module_slot_max = 4,
machine_prod_disallow = { machine_prod_disallow = {
['beacon'] = true ['beacon'] = true

23
modules/gui/module.lua
View File

@@ -67,21 +67,36 @@ local function clear_module(player, area, machine)
end end
end end
local function apply_module(player, area, machine, module) local function apply_module(player, area, machine, modules)
for _, entity in pairs(player.surface.find_entities_filtered{area=area, name=machine, force=player.force}) do for _, entity in pairs(player.surface.find_entities_filtered{area=area, name=machine, force=player.force}) do
if config.machine_craft[machine] then if config.machine_craft[machine] then
local m_current_recipe = entity.get_recipe() local m_current_recipe = entity.get_recipe()
if m_current_recipe ~= nil then if m_current_recipe ~= nil then
if config.module_allowed[m_current_recipe.name] then if config.module_allowed[m_current_recipe.name] then
entity.surface.create_entity{name='item-request-proxy', target=entity, position=entity.position, force=entity.force, modules=module} end entity.surface.create_entity{name='item-request-proxy', target=entity, position=entity.position, force=entity.force, modules=modules}
entity.last_user = player
else
for k in pairs(modules) do
if k:find('productivity') then
modules[k:gsub('productivity', 'effectivity')] = modules[k]
modules[k] = nil
end
end
entity.surface.create_entity{name='item-request-proxy', target=entity, position=entity.position, force=entity.force, modules=modules}
entity.last_user = player
end
else else
entity.surface.create_entity{name='item-request-proxy', target=entity, position=entity.position, force=entity.force, modules=module} entity.surface.create_entity{name='item-request-proxy', target=entity, position=entity.position, force=entity.force, modules=modules}
entity.last_user = player
end end
else else
entity.surface.create_entity{name='item-request-proxy', target=entity, position=entity.position, force=entity.force, modules=module} entity.surface.create_entity{name='item-request-proxy', target=entity, position=entity.position, force=entity.force, modules=modules}
entity.last_user = player
end end
end end
end end