diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua index c9d8297..8e1472a 100644 --- a/PHI-CL/config.lua +++ b/PHI-CL/config.lua @@ -30,10 +30,6 @@ local items = { [6] = {r=253, g=0, b=97}, [7] = {r=0, g=209, b=102}, [8] = {r=233, g=63, b=233} - }, - ['item'] = {}, - ['equipment'] = { - }, ['space-age'] = { ['PHI-VP'] = { @@ -369,18 +365,4 @@ local items = { } } -if mods and mods['quality'] then - items['item']['recycler'] = { - enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, - stage = 1, - mod = 'quality', - type = 'furnace', - name = 'recycler', - ref_name = 'recycler', - tech = 'recycling', - min = 2, - max = settings.startup['PHI-MB-MACHINE-TIER'].value - } -end - return items diff --git a/PHI-CL/data-updates.lua b/PHI-CL/data-updates.lua index b590968..a7c420a 100644 --- a/PHI-CL/data-updates.lua +++ b/PHI-CL/data-updates.lua @@ -139,31 +139,3 @@ if settings.startup['PHI-MB-EQUIPMENT'].value and settings.startup['PHI-MB-EQUIP end end end - -for _, v in pairs(items['item']) do - if (v.stage == file_stage) and v.enabled and (v.max >= v.min) then - v.category = 'item' - - for j=v.min, v.max, 1 do - main.EEE(v, j) - main.EI(v, j) - main.ER(v, j) - main.ET(v, j) - end - - main.EL(v) - end -end - -for _, v in pairs(items['equipment']) do - if (v.stage == file_stage) and v.enabled and (v.max >= v.min) then - v.category = 'equipment' - - for j=v.min, v.max, 1 do - main.EEQ(v, j) - main.EI(v, j) - main.ER(v, j) - main.ET(v, j) - end - end -end diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index df16a82..4b5ad5c 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -1832,31 +1832,3 @@ for _, v in pairs(items['item']) do end end end - -for _, v in pairs(items['item']) do - if (v.stage == file_stage) and v.enabled and (v.max >= v.min) then - v.category = 'item' - - for j=v.min, v.max, 1 do - main.EEE(v, j) - main.EI(v, j) - main.ER(v, j) - main.ET(v, j) - end - - main.EL(v) - end -end - -for _, v in pairs(items['equipment']) do - if (v.stage == file_stage) and v.enabled and (v.max >= v.min) then - v.category = 'equipment' - - for j=v.min, v.max, 1 do - main.EEQ(v, j) - main.EI(v, j) - main.ER(v, j) - main.ET(v, j) - end - end -end diff --git a/PHI-CL/data/b/mbm-c.lua b/PHI-CL/data/b/mbm-c.lua index 46ebdeb..e600717 100644 --- a/PHI-CL/data/b/mbm-c.lua +++ b/PHI-CL/data/b/mbm-c.lua @@ -181,4 +181,12 @@ return { tech = 'agriculture', max = settings.startup['PHI-MB-MACHINE-TIER'].value }, + -- MBE A 2 QUALITY ENTITY,RECIPE,RESEARCH_EFFECT + ['recycler'] = { + mod = 'quality', + type = 'furnace', + name = 'recycler', + tech = 'agriculture', + max = settings.startup['PHI-MB-MACHINE-TIER'].value + }, } diff --git a/PHI-CL/data/b/mbm.lua b/PHI-CL/data/b/mbm.lua index d8f9266..ea4bad5 100644 --- a/PHI-CL/data/b/mbm.lua +++ b/PHI-CL/data/b/mbm.lua @@ -3,6 +3,7 @@ local items = require 'mbm-c' -- MBE A 24 BASE ENTITY,RECIPE,RESEARCH_EFFECT -- MBE A 24 SPACE_AGE ENTITY,RECIPE,RESEARCH_EFFECT +-- MBE A 2 QUALITY ENTITY,RECIPE,RESEARCH_EFFECT for _, v in pairs(items) do v.mod = v.mod or 'base' v.min = v.min or 2 diff --git a/PHI-CL/data/u/mbq-c.lua b/PHI-CL/data/u/mbq-c.lua index 97aeadd..a564707 100644 --- a/PHI-CL/data/u/mbq-c.lua +++ b/PHI-CL/data/u/mbq-c.lua @@ -1,2 +1 @@ -return { -} +return {}