diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua index a8995d4..4dec700 100644 --- a/PHI-CL/config.lua +++ b/PHI-CL/config.lua @@ -243,11 +243,91 @@ local items = { min = 2, max = settings.startup['PHI-WE-RADAR-TIER'].value } - } - --[[, + }, ['equipment'] = { + ['solar-panel-equipment'] = { + enabled = settings.startup['PHI-EQ'].value, + stage = 1, + type = 'solar-panel-equipment', + name = 'solar-panel', + ref_name = 'solar-panel-equipment', + tech = 'solar-panel-equipment', + min = 2, + max = settings.startup['PHI-EQ-POWER-TIER'].value, + base = 30, + graphics_name = 'solar-panel-equipment' + }, + ['fusion-reactor-equipment'] = { + enabled = settings.startup['PHI-EQ'].value, + stage = 1, + type = 'generator-equipment', + name = 'fusion-reactor', + ref_name = 'fusion-reactor-equipment', + tech = 'fusion-reactor-equipment', + min = 2, + max = settings.startup['PHI-EQ-POWER-TIER'].value + }, + ['battery-equipment'] = { + enabled = settings.startup['PHI-EQ'].value, + stage = 1, + type = 'battery-equipment', + name = 'battery', + ref_name = 'battery-mk3-equipment', + tech = 'battery-mk3-equipment', + min = 4, + max = settings.startup['PHI-EQ-POWER-TIER'].value + }, + ['personal-laser-defense-equipment'] = { + enabled = settings.startup['PHI-EQ'].value, + stage = 1, + type = 'active-defense-equipment', + name = 'personal-laser-defense', + ref_name = 'personal-laser-defense-equipment', + tech = 'personal-laser-defense-equipment', + min = 2, + max = settings.startup['PHI-EQ-DEFENSE-TIER'].value + }, + ['energy-shield-equipment'] = { + enabled = settings.startup['PHI-EQ'].value, + stage = 1, + type = 'energy-shield-equipment', + name = 'energy-shield', + ref_name = 'energy-shield-mk2-equipment', + tech = 'energy-shield-mk2-equipment', + min = 3, + max = settings.startup['PHI-EQ-DEFENSE-TIER'].value + }, + ['personal-roboport-equipment'] = { + enabled = settings.startup['PHI-EQ'].value, + stage = 1, + type = 'roboport-equipment', + name = 'personal-roboport', + ref_name = 'personal-roboport-mk2-equipment', + tech = 'personal-roboport-mk2-equipment', + min = 3, + max = settings.startup['PHI-EQ-TOOL-TIER'].value + }, + ['night-vision-equipment'] = { + enabled = settings.startup['PHI-EQ'].value, + stage = 1, + type = 'night-vision-equipment', + name = 'night-vision', + ref_name = 'night-vision-equipment', + tech = 'night-vision-equipment', + min = 2, + max = settings.startup['PHI-EQ-UTILITY-TIER'].value + }, + ['exoskeleton-equipment'] = { + enabled = settings.startup['PHI-EQ'].value, + stage = 1, + type = 'movement-bonus-equipment', + name = 'exoskeleton', + ref_name = 'exoskeleton-equipment', + tech = 'exoskeleton-equipment', + min = 2, + max = settings.startup['PHI-EQ-UTILITY-TIER'].value + } } - ]] } if mods and mods['space-age'] then diff --git a/PHI-CL/data-final-fixes.lua b/PHI-CL/data-final-fixes.lua index 0e32ea5..577f76f 100644 --- a/PHI-CL/data-final-fixes.lua +++ b/PHI-CL/data-final-fixes.lua @@ -11,65 +11,6 @@ if settings.startup['PHI-CT'].value then data.raw[t][t].energy_source.usage_priority = 'primary-input' end end - - if settings.startup['PHI-CT-TILE'].value then - for _, v in pairs(data.raw) do - for _, e in pairs(v) do - if e.surface_conditions then - e.surface_conditions = nil - end - end - end - - for _, t in pairs (data.raw.tile) do - if t.type and t.type == 'tile' and t.subgroup == 'nauvis-tiles' and t.autoplace and t.autoplace.probability_expression then - t.autoplace.probability_expression = '0' - end - end - - if data.raw.tile[settings.startup['PHI-CT-TILE-CHOICE'].value] and data.raw.tile[settings.startup['PHI-CT-TILE-CHOICE'].value].autoplace and data.raw.tile[settings.startup['PHI-CT-TILE-CHOICE'].value].autoplace.probability_expression then - data.raw.tile[settings.startup['PHI-CT-TILE-CHOICE'].value].autoplace.probability_expression = '1' - end - - for _, t in pairs({data.raw['simple-entity'], data.raw['optimized-decorative'], data.raw['fish']}) do - for _, e in pairs(t) do - e.autoplace = nil - end - end - - local autoplace_controls = {} - - for k, _ in pairs (data.raw['autoplace-control']) do - autoplace_controls[k] = { - size = 'none' - } - end - - data.raw['map-gen-presets']['default']['empty-world'] = { - order = 'zz', - basic_settings = { - autoplace_controls = autoplace_controls, - water = 'none', - cliff_settings = { - name = 'none', - cliff_elevation_interval = 100, - cliff_elevation_0 = 100, - richness = 0 - } - }, - advanced_settings = { - pollution = { - enabled = false - }, - enemy_evolution = { - enabled = false - }, - enemy_expansion = { - enabled = false - } - } - } - end end for _, v in pairs(items['item']) do diff --git a/PHI-CL/note.lua b/PHI-CL/note.lua index a8a22dc..4abd5aa 100644 --- a/PHI-CL/note.lua +++ b/PHI-CL/note.lua @@ -1,88 +1,5 @@ --[[ -** CONFIG -['solar-panel-equipment'] = { - enabled = settings.startup['PHI-EQ'].value, - stage = 1, - type = 'solar-panel-equipment', - name = 'solar-panel', - ref_name = 'solar-panel-equipment', - tech = 'solar-panel-equipment', - min = 2, - max = settings.startup['PHI-EQ-POWER-TIER'].value, - base = 30, - graphics_name = 'solar-panel-equipment' - }, - ['fusion-reactor-equipment'] = { - enabled = settings.startup['PHI-EQ'].value, - stage = 1, - type = 'generator-equipment', - name = 'fusion-reactor', - ref_name = 'fusion-reactor-equipment', - tech = 'fusion-reactor-equipment', - min = 2, - max = settings.startup['PHI-EQ-POWER-TIER'].value - }, - ['battery-equipment'] = { - enabled = settings.startup['PHI-EQ'].value, - stage = 1, - type = 'battery-equipment', - name = 'battery', - ref_name = 'battery-mk3-equipment', - tech = 'battery-mk3-equipment', - min = 4, - max = settings.startup['PHI-EQ-POWER-TIER'].value - }, - ['personal-laser-defense-equipment'] = { - enabled = settings.startup['PHI-EQ'].value, - stage = 1, - type = 'active-defense-equipment', - name = 'personal-laser-defense', - ref_name = 'personal-laser-defense-equipment', - tech = 'personal-laser-defense-equipment', - min = 2, - max = settings.startup['PHI-EQ-DEFENSE-TIER'].value - }, - ['energy-shield-equipment'] = { - enabled = settings.startup['PHI-EQ'].value, - stage = 1, - type = 'energy-shield-equipment', - name = 'energy-shield', - ref_name = 'energy-shield-mk2-equipment', - tech = 'energy-shield-mk2-equipment', - min = 3, - max = settings.startup['PHI-EQ-DEFENSE-TIER'].value - }, - ['personal-roboport-equipment'] = { - enabled = settings.startup['PHI-EQ'].value, - stage = 1, - type = 'roboport-equipment', - name = 'personal-roboport', - ref_name = 'personal-roboport-mk2-equipment', - tech = 'personal-roboport-mk2-equipment', - min = 3, - max = settings.startup['PHI-EQ-TOOL-TIER'].value - }, - ['night-vision-equipment'] = { - enabled = settings.startup['PHI-EQ'].value, - stage = 1, - type = 'night-vision-equipment', - name = 'night-vision', - ref_name = 'night-vision-equipment', - tech = 'night-vision-equipment', - min = 2, - max = settings.startup['PHI-EQ-UTILITY-TIER'].value - }, - ['exoskeleton-equipment'] = { - enabled = settings.startup['PHI-EQ'].value, - stage = 1, - type = 'movement-bonus-equipment', - name = 'exoskeleton', - ref_name = 'exoskeleton-equipment', - tech = 'exoskeleton-equipment', - min = 2, - max = settings.startup['PHI-EQ-UTILITY-TIER'].value - } - +** CONFIG items['item']['agricultural-tower'] = { enabled = settings.startup['PHI-MB'].value, stage = 2, @@ -1025,6 +942,65 @@ for _, t in pairs(data.raw['tree']) do t.collision_box = {{-0.05, -0.05}, {0.05, 0.05}} end + if settings.startup['PHI-CT-TILE'].value then + for _, v in pairs(data.raw) do + for _, e in pairs(v) do + if e.surface_conditions then + e.surface_conditions = nil + end + end + end + + for _, t in pairs (data.raw.tile) do + if t.type and t.type == 'tile' and t.subgroup == 'nauvis-tiles' and t.autoplace and t.autoplace.probability_expression then + t.autoplace.probability_expression = '0' + end + end + + if data.raw.tile[settings.startup['PHI-CT-TILE-CHOICE'].value] and data.raw.tile[settings.startup['PHI-CT-TILE-CHOICE'].value].autoplace and data.raw.tile[settings.startup['PHI-CT-TILE-CHOICE'].value].autoplace.probability_expression then + data.raw.tile[settings.startup['PHI-CT-TILE-CHOICE'].value].autoplace.probability_expression = '1' + end + + for _, t in pairs({data.raw['simple-entity'], data.raw['optimized-decorative'], data.raw['fish']}) do + for _, e in pairs(t) do + e.autoplace = nil + end + end + + local autoplace_controls = {} + + for k, _ in pairs (data.raw['autoplace-control']) do + autoplace_controls[k] = { + size = 'none' + } + end + + data.raw['map-gen-presets']['default']['empty-world'] = { + order = 'zz', + basic_settings = { + autoplace_controls = autoplace_controls, + water = 'none', + cliff_settings = { + name = 'none', + cliff_elevation_interval = 100, + cliff_elevation_0 = 100, + richness = 0 + } + }, + advanced_settings = { + pollution = { + enabled = false + }, + enemy_evolution = { + enabled = false + }, + enemy_expansion = { + enabled = false + } + } + } + end + ** MIGRATION if script.active_mods['space-exploration'] then if technologies['se-core-miner'].researched then @@ -1036,42 +1012,6 @@ end end ** SETTING -{ - type = 'bool-setting', - name = 'PHI-EQ', - setting_type = 'startup', - default_value = false, - order = 'D00' - }, -{ - type = 'int-setting', - name = 'PHI-EQ-POWER-TIER', - setting_type = 'startup', - default_value = 8, - allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'D01' - }, { - type = 'int-setting', - name = 'PHI-EQ-DEFENSE-TIER', - setting_type = 'startup', - default_value = 8, - allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'D02' - }, { - type = 'int-setting', - name = 'PHI-EQ-TOOL-TIER', - setting_type = 'startup', - default_value = 8, - allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'D03' - }, { - type = 'int-setting', - name = 'PHI-EQ-UTILITY-TIER', - setting_type = 'startup', - default_value = 2, - allowed_values = {1, 2}, - order = 'D04' - }, { type = 'int-setting', name = 'PHI-MI-REPAIR', @@ -1100,7 +1040,20 @@ end default_value = 1, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, order = 'E09' - }, + }, { + type = 'bool-setting', + name = 'PHI-CT-TILE', + setting_type = 'startup', + default_value = true, + order = 'F06' + }, { + type = 'string-setting', + name = 'PHI-CT-TILE-CHOICE', + setting_type = 'startup', + default_value = 'grass-1', + allowed_values = {'concrete', 'deepwater', 'deepwater-green', 'dirt-1', 'dirt-2', 'dirt-3', 'dirt-4', 'dirt-5', 'dirt-6', 'dirt-7', 'dry-dirt', 'grass-1', 'grass-2', 'grass-3', 'grass-4', 'hazard-concrete-left', 'hazard-concrete-right', 'lab-dark-1', 'lab-dark-2', 'lab-white', 'landfill', 'out-of-map', 'red-desert-0', 'red-desert-1', 'red-desert-2', 'red-desert-3', 'refined-concrete', 'refined-hazard-concrete-left', 'refined-hazard-concrete-right', 'sand-1', 'sand-2', 'sand-3', 'stone-path', 'tutorial-grid', 'water', 'water-green', 'water-mud', 'water-shallow'}, + order = 'F07' + } "? aai-industry >= 0.5.0", "? Krastorio2 >= 1.3.0", diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index c6ad415..3484c6c 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -52,6 +52,40 @@ data:extend({ default_value = 3, allowed_values = {1, 2, 3}, order = 'C02' + }, { + type = 'bool-setting', + name = 'PHI-EQ', + setting_type = 'startup', + default_value = false, + order = 'D00' + }, { + type = 'int-setting', + name = 'PHI-EQ-POWER-TIER', + setting_type = 'startup', + default_value = 8, + allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, + order = 'D01' + }, { + type = 'int-setting', + name = 'PHI-EQ-DEFENSE-TIER', + setting_type = 'startup', + default_value = 8, + allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, + order = 'D02' + }, { + type = 'int-setting', + name = 'PHI-EQ-TOOL-TIER', + setting_type = 'startup', + default_value = 8, + allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, + order = 'D03' + }, { + type = 'int-setting', + name = 'PHI-EQ-UTILITY-TIER', + setting_type = 'startup', + default_value = 2, + allowed_values = {1, 2}, + order = 'D04' }, { type = 'bool-setting', name = 'PHI-MI', @@ -118,18 +152,5 @@ data:extend({ minimum_value = 1, maximum_value = 1000, order = 'F05' - }, { - type = 'bool-setting', - name = 'PHI-CT-TILE', - setting_type = 'startup', - default_value = true, - order = 'F06' - }, { - type = 'string-setting', - name = 'PHI-CT-TILE-CHOICE', - setting_type = 'startup', - default_value = 'grass-1', - allowed_values = {'concrete', 'deepwater', 'deepwater-green', 'dirt-1', 'dirt-2', 'dirt-3', 'dirt-4', 'dirt-5', 'dirt-6', 'dirt-7', 'dry-dirt', 'grass-1', 'grass-2', 'grass-3', 'grass-4', 'hazard-concrete-left', 'hazard-concrete-right', 'lab-dark-1', 'lab-dark-2', 'lab-white', 'landfill', 'out-of-map', 'red-desert-0', 'red-desert-1', 'red-desert-2', 'red-desert-3', 'refined-concrete', 'refined-hazard-concrete-left', 'refined-hazard-concrete-right', 'sand-1', 'sand-2', 'sand-3', 'stone-path', 'tutorial-grid', 'water', 'water-green', 'water-mud', 'water-shallow'}, - order = 'F07' - }, + } })