diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua index d3b2c23..df3764c 100644 --- a/PHI-CL/config.lua +++ b/PHI-CL/config.lua @@ -340,7 +340,7 @@ local items = { } } -if mods and mods['space-age'] then +if mods['space-age'] then items['item']['fusion-reactor'] = { enabled = settings.startup['PHI-EN'].value, stage = 1, @@ -495,17 +495,6 @@ if mods and mods['space-age'] then max = settings.startup['PHI-MB-MACHINE-TIER'].value } - items['item']['recycler'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 1, - type = 'furnace', - name = 'recycler', - ref_name = 'recycler', - tech = 'recycling', - min = 2, - max = settings.startup['PHI-MB-MACHINE-TIER'].value - } - items['item']['agricultural-tower'] = { enabled = settings.startup['PHI-MB'].value, stage = 2, @@ -544,4 +533,17 @@ if mods and mods['space-age'] then items['equipment']['battery-equipment'].min = 4 end +if mods['quality'] then + items['item']['recycler'] = { + enabled = settings.startup['PHI-MB'].value, + stage = 1, + 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.lua b/PHI-CL/data.lua index f262f17..650e2e5 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -108,7 +108,7 @@ if settings.startup['PHI-EQ'].value and settings.startup['PHI-EQ-ARMOR'].value t table.insert(data.raw.technology['power-armor-mk2'].effects, {type='unlock-recipe', recipe='power-armor-mk3'}) - if mods and mods['space-age'] then + if mods['space-age'] then grid = table.deepcopy(data.raw['equipment-grid']['large-equipment-grid']) grid.name = 'equipment-grid-15x16' grid.width = 15 @@ -181,7 +181,15 @@ if settings.startup['PHI-MI'].value and (settings.startup['PHI-MI-LANDFILL'].val end if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-NUCLEAR'].value then - data.raw['reactor']['nuclear-reactor'].scale_energy_usage = true + for _, v in pairs(data.raw['reactor']) do + v.scale_energy_usage = settings.startup['PHI-MI-NUCLEAR'].value + end + + if mods['space-age'] then + for _, v in pairs(data.raw['fusion-reactor']) do + v.scale_energy_usage = settings.startup['PHI-MI-NUCLEAR'].value + end + end end if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].value then diff --git a/PHI-CL/info.json b/PHI-CL/info.json index 4ca899a..dabe868 100644 --- a/PHI-CL/info.json +++ b/PHI-CL/info.json @@ -1,6 +1,6 @@ { "name": "PHI-CL", - "version": "3.0.7", + "version": "3.0.8", "factorio_version": "2.0", "date": "2024-10-31", "title": "Phidias Collection", diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index 8238b7c..479d464 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -56,7 +56,7 @@ data:extend({ type = 'bool-setting', name = 'PHI-EQ', setting_type = 'startup', - default_value = false, + default_value = true, order = 'D00' }, { type = 'int-setting', @@ -90,7 +90,7 @@ data:extend({ type = 'bool-setting', name = 'PHI-EQ-ARMOR', setting_type = 'startup', - default_value = false, + default_value = true, order = 'D05' }, { type = 'bool-setting', @@ -102,7 +102,7 @@ data:extend({ type = 'bool-setting', name = 'PHI-MI', setting_type = 'startup', - default_value = false, + default_value = true, order = 'E00' }, { type = 'int-setting', @@ -122,7 +122,7 @@ data:extend({ type = 'bool-setting', name = 'PHI-MI-NUCLEAR', setting_type = 'startup', - default_value = false, + default_value = true, order = 'E03' }, { type = 'int-setting',