diff --git a/PHI-EN/config.lua b/PHI-EN/config.lua index 6949a9a..eda24b9 100644 --- a/PHI-EN/config.lua +++ b/PHI-EN/config.lua @@ -35,12 +35,14 @@ local items = { } } -if mods['Krastorio2'] then - items['solar-panel'].base = 100 - items['accumulator'].base = 10 -elseif mods['space-exploration'] then - items['solar-panel'].base = 60 - items['accumulator'].base = 5 +if mods ~= nil then + if mods['Krastorio2'] then + items['solar-panel'].base = 100 + items['accumulator'].base = 10 + elseif mods['space-exploration'] then + items['solar-panel'].base = 60 + items['accumulator'].base = 5 + end end return items \ No newline at end of file diff --git a/PHI-EN/migrations/1.1.9.json b/PHI-EN/migrations/PHI-EN_1.1.9.json similarity index 100% rename from PHI-EN/migrations/1.1.9.json rename to PHI-EN/migrations/PHI-EN_1.1.9.json diff --git a/PHI-EN/migrations/migrations.lua b/PHI-EN/migrations/migrations.lua index bc15cfa..82649a0 100644 --- a/PHI-EN/migrations/migrations.lua +++ b/PHI-EN/migrations/migrations.lua @@ -1,4 +1,4 @@ -local items = require '../config' +local items = require '__PHI-EN__/config' for _, force in pairs(game.forces) do local technologies = force.technologies diff --git a/PHI-EQ/config.lua b/PHI-EQ/config.lua new file mode 100644 index 0000000..06c8a59 --- /dev/null +++ b/PHI-EQ/config.lua @@ -0,0 +1,114 @@ +local items = { + ['solar-panel'] = { + enabled = true, + type = 'solar-panel', + name = 'solar-panel', + base_name = 'solar-panel', + tech = 'solar-panel-equipment', + min = 2, + max = 8, + base = 30, + graphics_name = 'solar-panel-equipment' + }, + ['fusion-reactor'] = { + enabled = true, + type = 'fusion-reactor', + name = 'fusion-reactor', + base_name = 'fusion-reactor', + tech = 'fusion-reactor-equipment', + min = 2, + max = 8, + base = 750, + graphics_name = 'fusion-reactor-equipment' + }, + ['battery'] = { + enabled = true, + type = 'battery', + name = 'battery', + base_name = 'battery', + tech = 'battery-mk2-equipment', + min = 3, + max = 8, + base = 100, + graphics_name = 'battery-mk2-equipment' + }, + ['personal-laser-defense'] = { + enabled = true, + type = 'personal-laser-defense', + name = 'personal-laser-defense', + base_name = 'personal-laser-defense', + tech = 'personal-laser-defense-equipment', + min = 2, + max = 8, + base = 3, + graphics_name = 'personal-laser-defense-equipment' + }, + ['energy-shield'] = { + enabled = true, + type = 'energy-shield', + name = 'energy-shield', + base_name = 'energy-shield', + tech = 'energy-shield-mk2-equipment', + min = 3, + max = 8, + base = 150, + graphics_name = 'energy-shield-mk2-equipment' + }, + ['personal-roboport'] = { + enabled = true, + type = 'personal-roboport', + name = 'personal-roboport', + base_name = 'personal-roboport', + tech = 'personal-roboport-mk2-equipment', + min = 3, + max = 8, + base = 0.5, + graphics_name = 'personal-roboport-mk2-equipment' + }, + ['night-vision'] = { + enabled = true, + type = 'night-vision', + name = 'night-vision', + base_name = 'night-vision', + tech = 'night-vision-equipment', + min = 2, + max = 2, + base = 1, + graphics_name = 'night-vision-equipment' + }, + ['exoskeleton'] = { + enabled = true, + type = 'exoskeleton', + name = 'exoskeleton', + base_name = 'exoskeleton', + tech = 'exoskeleton-equipment', + min = 2, + max = 2, + base = 0.6, + graphics_name = 'exoskeleton-equipment' + } +} + +if mods ~= nil then + if mods['space-exploration'] then + items['solar-panel'].base = 30 + + items['fusion-reactor'].tech = 'se-rtg-equipment' + items['fusion-reactor'].base_name = 'se-rtg' + items['fusion-reactor'].base = 400 + + items['battery'].tech = 'battery-equipment' + items['battery'].min = 2 + items['battery'].base = 100 + + items['energy-shield'].tech = 'energy-shield-equipment' + items['energy-shield'].min = 2 + items['energy-shield'].base = 200 + + items['personal-roboport'].tech = 'personal-roboport-equipment' + items['personal-roboport'].min = 2 + items['personal-roboport'].base = 0.5 + end +end + +return items diff --git a/PHI-EQ/data.lua b/PHI-EQ/data.lua index 61307e9..32dfc70 100644 --- a/PHI-EQ/data.lua +++ b/PHI-EQ/data.lua @@ -1,116 +1,6 @@ local alpha_order = {'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm'} local graphics_location = '__PHI-EQ__/graphics/' - -local items = { - ['solar-panel'] = { - enabled = true, - type = 'solar-panel', - name = 'solar-panel', - base_name = 'solar-panel', - tech = 'solar-panel-equipment', - min = 2, - max = 8, - base = 30, - graphics_name = 'solar-panel-equipment' - }, - ['fusion-reactor'] = { - enabled = true, - type = 'fusion-reactor', - name = 'fusion-reactor', - base_name = 'fusion-reactor', - tech = 'fusion-reactor-equipment', - min = 2, - max = 8, - base = 750, - graphics_name = 'fusion-reactor-equipment' - }, - ['battery'] = { - enabled = true, - type = 'battery', - name = 'battery', - base_name = 'battery', - tech = 'battery-mk2-equipment', - min = 3, - max = 8, - base = 100, - graphics_name = 'battery-mk2-equipment' - }, - ['personal-laser-defense'] = { - enabled = true, - type = 'personal-laser-defense', - name = 'personal-laser-defense', - base_name = 'personal-laser-defense', - tech = 'personal-laser-defense-equipment', - min = 2, - max = 8, - base = 3, - graphics_name = 'personal-laser-defense-equipment' - }, - ['energy-shield'] = { - enabled = true, - type = 'energy-shield', - name = 'energy-shield', - base_name = 'energy-shield', - tech = 'energy-shield-mk2-equipment', - min = 3, - max = 8, - base = 150, - graphics_name = 'energy-shield-mk2-equipment' - }, - ['personal-roboport'] = { - enabled = true, - type = 'personal-roboport', - name = 'personal-roboport', - base_name = 'personal-roboport', - tech = 'personal-roboport-mk2-equipment', - min = 3, - max = 8, - base = 0.5, - graphics_name = 'personal-roboport-mk2-equipment' - }, - ['night-vision'] = { - enabled = true, - type = 'night-vision', - name = 'night-vision', - base_name = 'night-vision', - tech = 'night-vision-equipment', - min = 2, - max = 2, - base = 1, - graphics_name = 'night-vision-equipment' - }, - ['exoskeleton'] = { - enabled = true, - type = 'exoskeleton', - name = 'exoskeleton', - base_name = 'exoskeleton', - tech = 'exoskeleton-equipment', - min = 2, - max = 2, - base = 0.6, - graphics_name = 'exoskeleton-equipment' - } -} - -if mods['space-exploration'] then - items['solar-panel'].base = 30 - - items['fusion-reactor'].tech = 'se-rtg-equipment' - items['fusion-reactor'].base_name = 'se-rtg' - items['fusion-reactor'].base = 400 - - items['battery'].tech = 'battery-equipment' - items['battery'].min = 2 - items['battery'].base = 100 - - items['energy-shield'].tech = 'energy-shield-equipment' - items['energy-shield'].min = 2 - items['energy-shield'].base = 200 - - items['personal-roboport'].tech = 'personal-roboport-equipment' - items['personal-roboport'].min = 2 - items['personal-roboport'].base = 0.5 -end +local items = require 'config' -- equipment local function EE(source, tier) diff --git a/PHI-EQ/migrations/migrations.lua b/PHI-EQ/migrations/migrations.lua index 3572e82..f89482a 100644 --- a/PHI-EQ/migrations/migrations.lua +++ b/PHI-EQ/migrations/migrations.lua @@ -1,107 +1,19 @@ -for index, force in pairs(game.forces) do +local items = require '__PHI-EQ__/config' + +for _, force in pairs(game.forces) do local technologies = force.technologies local recipes = force.recipes - - if technologies['power-armor-mk2'].researched then - recipes['power-armor-mk3'].enabled = true - recipes['power-armor-mk3'].reload() - elseif technologies['night-vision-equipment'].researched then - recipes['night-vision-mk2-equipment'].enabled = true - recipes['night-vision-mk2-equipment'].reload() - - elseif technologies['exoskeleton-equipment'].researched then - recipes['exoskeleton-mk2-equipment'].enabled = true - recipes['exoskeleton-mk2-equipment'].reload() - - elseif technologies['solar-panel-equipment'].researched then - recipes['solar-panel-mk2-equipment'].enabled = true - recipes['solar-panel-mk2-equipment'].reload() - recipes['solar-panel-mk3-equipment'].enabled = true - recipes['solar-panel-mk3-equipment'].reload() - recipes['solar-panel-mk4-equipment'].enabled = true - recipes['solar-panel-mk4-equipment'].reload() - recipes['solar-panel-mk5-equipment'].enabled = true - recipes['solar-panel-mk5-equipment'].reload() - recipes['solar-panel-mk6-equipment'].enabled = true - recipes['solar-panel-mk6-equipment'].reload() - recipes['solar-panel-mk7-equipment'].enabled = true - recipes['solar-panel-mk7-equipment'].reload() - recipes['solar-panel-mk8-equipment'].enabled = true - recipes['solar-panel-mk8-equipment'].reload() - - elseif technologies['fusion-reactor-equipment'].researched then - recipes['fusion-reactor-mk2-equipment'].enabled = true - recipes['fusion-reactor-mk2-equipment'].reload() - recipes['fusion-reactor-mk3-equipment'].enabled = true - recipes['fusion-reactor-mk3-equipment'].reload() - recipes['fusion-reactor-mk4-equipment'].enabled = true - recipes['fusion-reactor-mk4-equipment'].reload() - recipes['fusion-reactor-mk5-equipment'].enabled = true - recipes['fusion-reactor-mk5-equipment'].reload() - recipes['fusion-reactor-mk6-equipment'].enabled = true - recipes['fusion-reactor-mk6-equipment'].reload() - recipes['fusion-reactor-mk7-equipment'].enabled = true - recipes['fusion-reactor-mk7-equipment'].reload() - recipes['fusion-reactor-mk8-equipment'].enabled = true - recipes['fusion-reactor-mk8-equipment'].reload() - - elseif technologies['battery-mk2-equipment'].researched then - recipes['battery-mk3-equipment'].enabled = true - recipes['battery-mk3-equipment'].reload() - recipes['battery-mk4-equipment'].enabled = true - recipes['battery-mk4-equipment'].reload() - recipes['battery-mk5-equipment'].enabled = true - recipes['battery-mk5-equipment'].reload() - recipes['battery-mk6-equipment'].enabled = true - recipes['battery-mk6-equipment'].reload() - recipes['battery-mk7-equipment'].enabled = true - recipes['battery-mk7-equipment'].reload() - recipes['battery-mk8-equipment'].enabled = true - recipes['battery-mk8-equipment'].reload() - - elseif technologies['personal-laser-defense-equipment'].researched then - recipes['personal-laser-defense-mk2-equipment'].enabled = true - recipes['personal-laser-defense-mk2-equipment'].reload() - recipes['personal-laser-defense-mk3-equipment'].enabled = true - recipes['personal-laser-defense-mk3-equipment'].reload() - recipes['personal-laser-defense-mk4-equipment'].enabled = true - recipes['personal-laser-defense-mk4-equipment'].reload() - recipes['personal-laser-defense-mk5-equipment'].enabled = true - recipes['personal-laser-defense-mk5-equipment'].reload() - recipes['personal-laser-defense-mk6-equipment'].enabled = true - recipes['personal-laser-defense-mk6-equipment'].reload() - recipes['personal-laser-defense-mk7-equipment'].enabled = true - recipes['personal-laser-defense-mk7-equipment'].reload() - recipes['personal-laser-defense-mk8-equipment'].enabled = true - recipes['personal-laser-defense-mk8-equipment'].reload() - - elseif technologies['energy-shield-mk2-equipment'].researched then - recipes['energy-shield-mk3-equipment'].enabled = true - recipes['energy-shield-mk3-equipment'].reload() - recipes['energy-shield-mk4-equipment'].enabled = true - recipes['energy-shield-mk4-equipment'].reload() - recipes['energy-shield-mk5-equipment'].enabled = true - recipes['energy-shield-mk5-equipment'].reload() - recipes['energy-shield-mk6-equipment'].enabled = true - recipes['energy-shield-mk6-equipment'].reload() - recipes['energy-shield-mk7-equipment'].enabled = true - recipes['energy-shield-mk7-equipment'].reload() - recipes['energy-shield-mk8-equipment'].enabled = true - recipes['energy-shield-mk8-equipment'].reload() - - elseif technologies['personal-roboport-mk2-equipment'].researched then - recipes['personal-roboport-mk3-equipment'].enabled = true - recipes['personal-roboport-mk3-equipment'].reload() - recipes['personal-roboport-mk4-equipment'].enabled = true - recipes['personal-roboport-mk4-equipment'].reload() - recipes['personal-roboport-mk5-equipment'].enabled = true - recipes['personal-roboport-mk5-equipment'].reload() - recipes['personal-roboport-mk6-equipment'].enabled = true - recipes['personal-roboport-mk6-equipment'].reload() - recipes['personal-roboport-mk7-equipment'].enabled = true - recipes['personal-roboport-mk7-equipment'].reload() - recipes['personal-roboport-mk8-equipment'].enabled = true - recipes['personal-roboport-mk8-equipment'].reload() + for _, v in pairs(items) do + if v.enabled then + if technologies[v.tech] ~= nil then + if technologies[v.tech].researched then + for j=v.min, v.max, 1 do + recipes[v.name .. '-' .. j].enabled = true + recipes[v.name .. '-' .. j].reload() + end + end + end + end end end diff --git a/PHI-MB/config.lua b/PHI-MB/config.lua index 970a1e5..ac1867f 100644 --- a/PHI-MB/config.lua +++ b/PHI-MB/config.lua @@ -81,109 +81,111 @@ local items = { } } -if mods['PHI-RS'] then - items['electric-filter-furnace'] = { - enabled = true, - stage = 2, - type = 'assembling-machine', - name = 'electric-filter-furnace', - ref_name = 'electric-filter-furnace', - tech = 'advanced-material-processing-2', - min = 2, - max = 3 - } -end +if mods ~= nil then + if mods['PHI-RS'] then + items['electric-filter-furnace'] = { + enabled = true, + stage = 2, + type = 'assembling-machine', + name = 'electric-filter-furnace', + ref_name = 'electric-filter-furnace', + tech = 'advanced-material-processing-2', + min = 2, + max = 3 + } + end -if mods['aai-industry'] then - items['industrial-furnace'] = { - enabled = true, - stage = 2, - type = 'assembling-machine', - name = 'industrial-furnace', - ref_name = 'industrial-furnace', - tech = 'industrial-furnace', - min = 2, - max = 3 - } + if mods['aai-industry'] then + items['industrial-furnace'] = { + enabled = true, + stage = 2, + type = 'assembling-machine', + name = 'industrial-furnace', + ref_name = 'industrial-furnace', + tech = 'industrial-furnace', + min = 2, + max = 3 + } - items['fuel-processor'] = { - enabled = true, - stage = 2, - type = 'assembling-machine', - name = 'fuel-processor', - ref_name = 'fuel-processor', - tech = 'fuel-processing', - min = 2, - max = 3 - } -end + items['fuel-processor'] = { + enabled = true, + stage = 2, + type = 'assembling-machine', + name = 'fuel-processor', + ref_name = 'fuel-processor', + tech = 'fuel-processing', + min = 2, + max = 3 + } + end -if mods['space-exploration'] then - items['se-space-assembling-machine'] = { - enabled = true, - stage = 2, - type = 'assembling-machine', - name = 'se-space-assembling-machine', - ref_name = 'se-space-assembling-machine', - tech = 'se-space-assembling', - min = 2, - max = 3 - } + if mods['space-exploration'] then + items['se-space-assembling-machine'] = { + enabled = true, + stage = 2, + type = 'assembling-machine', + name = 'se-space-assembling-machine', + ref_name = 'se-space-assembling-machine', + tech = 'se-space-assembling', + min = 2, + max = 3 + } - items['se-space-manufactory'] = { - enabled = true, - stage = 2, - type = 'assembling-machine', - name = 'se-space-manufactory', - ref_name = 'se-space-manufactory', - tech = 'se-space-manufactory', - min = 2, - max = 3 - } + items['se-space-manufactory'] = { + enabled = true, + stage = 2, + type = 'assembling-machine', + name = 'se-space-manufactory', + ref_name = 'se-space-manufactory', + tech = 'se-space-manufactory', + min = 2, + max = 3 + } - items['se-casting-machine'] = { - enabled = true, - stage = 2, - type = 'assembling-machine', - name = 'se-casting-machine', - ref_name = 'se-casting-machine', - tech = 'se-pyroflux-smelting', - min = 2, - max = 3 - } + items['se-casting-machine'] = { + enabled = true, + stage = 2, + type = 'assembling-machine', + name = 'se-casting-machine', + ref_name = 'se-casting-machine', + tech = 'se-pyroflux-smelting', + min = 2, + max = 3 + } - items['se-pulveriser'] = { - enabled = true, - stage = 2, - type = 'assembling-machine', - name = 'se-pulveriser', - ref_name = 'se-pulveriser', - tech = 'se-pulveriser', - min = 2, - max = 3 - } + items['se-pulveriser'] = { + enabled = true, + stage = 2, + type = 'assembling-machine', + name = 'se-pulveriser', + ref_name = 'se-pulveriser', + tech = 'se-pulveriser', + min = 2, + max = 3 + } - items['se-lifesupport-facility'] = { - enabled = true, - stage = 2, - type = 'assembling-machine', - name = 'se-lifesupport-facility', - ref_name = 'se-lifesupport-facility', - tech = 'se-lifesupport-facility', - min = 2, - max = 3 - } + items['se-lifesupport-facility'] = { + enabled = true, + stage = 2, + type = 'assembling-machine', + name = 'se-lifesupport-facility', + ref_name = 'se-lifesupport-facility', + tech = 'se-lifesupport-facility', + min = 2, + max = 3 + } - items['se-fuel-refinery'] = { - enabled = true, - stage = 2, - type = 'assembling-machine', - name = 'se-fuel-refinery', - ref_name = 'se-fuel-refinery', - tech = 'se-fuel-refining', - min = 2, - max = 3 - } + items['se-fuel-refinery'] = { + enabled = true, + stage = 2, + type = 'assembling-machine', + name = 'se-fuel-refinery', + ref_name = 'se-fuel-refinery', + tech = 'se-fuel-refining', + min = 2, + max = 3 + } + end end return items \ No newline at end of file diff --git a/PHI-MB/info.json b/PHI-MB/info.json index 2200e36..5e4f0de 100644 --- a/PHI-MB/info.json +++ b/PHI-MB/info.json @@ -1,8 +1,8 @@ { "name": "PHI-MB", - "version": "1.0.12", + "version": "1.0.13", "factorio_version": "1.1", - "date": "2023-05-08", + "date": "2023-05-09", "title": "Phidias Megabase", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-MB/migrations/migrations.lua b/PHI-MB/migrations/migrations.lua index 7b25d7f..0b8f2fb 100644 --- a/PHI-MB/migrations/migrations.lua +++ b/PHI-MB/migrations/migrations.lua @@ -1,4 +1,4 @@ -local items = require '../config' +local items = require '__PHI-MB__/config' for _, force in pairs(game.forces) do local technologies = force.technologies @@ -17,127 +17,3 @@ for _, force in pairs(game.forces) do end end end - ---[[ -if technologies['automation'].researched then - recipes['lab-2'].enabled = true - recipes['lab-2'].reload() - recipes['lab-3'].enabled = true - recipes['lab-3'].reload() - - recipes['electric-mining-drill-2'].enabled = true - recipes['electric-mining-drill-2'].reload() - recipes['electric-mining-drill-3'].enabled = true - recipes['electric-mining-drill-3'].reload() - - recipes['pumpjack-2'].enabled = true - recipes['pumpjack-2'].reload() - recipes['pumpjack-3'].enabled = true - recipes['pumpjack-3'].reload() -end - -if technologies['automation-3'].researched then - recipes['assembling-machine-4'].enabled = true - recipes['assembling-machine-4'].reload() - recipes['assembling-machine-5'].enabled = true - recipes['assembling-machine-5'].reload() -end - -if technologies['advanced-material-processing-2'].researched then - recipes['electric-furnace-2'].enabled = true - recipes['electric-furnace-2'].reload() - recipes['electric-furnace-3'].enabled = true - recipes['electric-furnace-3'].reload() -end - -if technologies['oil-processing'].researched then - recipes['oil-refinery-2'].enabled = true - recipes['oil-refinery-2'].reload() - recipes['oil-refinery-3'].enabled = true - recipes['oil-refinery-3'].reload() - - recipes['chemical-plant-2'].enabled = true - recipes['chemical-plant-2'].reload() - recipes['chemical-plant-3'].enabled = true - recipes['chemical-plant-3'].reload() -end - -if technologies['uranium-processing'].researched then - recipes['centrifuge-2'].enabled = true - recipes['centrifuge-2'].reload() - recipes['centrifuge-3'].enabled = true - recipes['centrifuge-3'].reload() -end - -if technologies['industrial-furnace'] ~= nil then - if technologies['industrial-furnace'].researched then - recipes['industrial-furnace-2'].enabled = true - recipes['industrial-furnace-2'].reload() - recipes['industrial-furnace-3'].enabled = true - recipes['industrial-furnace-3'].reload() - end -end - -if technologies['fuel-processing'] ~= nil then - if technologies['fuel-processing'].researched then - recipes['fuel-processor-2'].enabled = true - recipes['fuel-processor-2'].reload() - recipes['fuel-processor-3'].enabled = true - recipes['fuel-processor-3'].reload() - end -end - -if technologies['se-space-assembling'] ~= nil then - if technologies['se-space-assembling'].researched then - recipes['se-space-assembling-machine-2'].enabled = true - recipes['se-space-assembling-machine-2'].reload() - recipes['se-space-assembling-machine-3'].enabled = true - recipes['se-space-assembling-machine-3'].reload() - end -end - -if technologies['se-space-manufactory'] ~= nil then - if technologies['se-space-manufactory'].researched then - recipes['se-space-manufactory-2'].enabled = true - recipes['se-space-manufactory-2'].reload() - recipes['se-space-manufactory-3'].enabled = true - recipes['se-space-manufactory-3'].reload() - end -end - -if technologies['se-pyroflux-smelting'] ~= nil then - if technologies['se-pyroflux-smelting'].researched then - recipes['se-casting-machine-2'].enabled = true - recipes['se-casting-machine-2'].reload() - recipes['se-casting-machine-3'].enabled = true - recipes['se-casting-machine-3'].reload() - end -end - -if technologies['se-pulveriser'] ~= nil then - if technologies['se-pulveriser'].researched then - recipes['se-pulveriser-2'].enabled = true - recipes['se-pulveriser-2'].reload() - recipes['se-pulveriser-3'].enabled = true - recipes['se-pulveriser-3'].reload() - end -end - -if technologies['se-lifesupport-facility'] ~= nil then - if technologies['se-lifesupport-facility'].researched then - recipes['se-lifesupport-facility-2'].enabled = true - recipes['se-lifesupport-facility-2'].reload() - recipes['se-lifesupport-facility-3'].enabled = true - recipes['se-lifesupport-facility-3'].reload() - end -end - -if technologies['se-fuel-refining'] ~= nil then - if technologies['se-fuel-refining'].researched then - recipes['se-fuel-refinery-2'].enabled = true - recipes['se-fuel-refinery-2'].reload() - recipes['se-fuel-refinery-3'].enabled = true - recipes['se-fuel-refinery-3'].reload() - end -end -]] \ No newline at end of file diff --git a/PHI-MI/migrations/migrations.lua b/PHI-MI/migrations/migrations.lua index 6de39a9..cca66a5 100644 --- a/PHI-MI/migrations/migrations.lua +++ b/PHI-MI/migrations/migrations.lua @@ -1,7 +1,7 @@ for index, force in pairs(game.forces) do local technologies = force.technologies local recipes = force.recipes - + if technologies['steel-processing'].researched then recipes['ups-steel-chest'].enabled = true recipes['ups-steel-chest'].reload() diff --git a/PHI-PB/info.json b/PHI-PB/info.json index c3d09e8..c02aeae 100644 --- a/PHI-PB/info.json +++ b/PHI-PB/info.json @@ -1,8 +1,8 @@ { "name": "PHI-PB", - "version": "1.0.2", + "version": "1.0.3", "factorio_version": "1.1", - "date": "2023-05-06", + "date": "2023-05-09", "title": "Phidias Player Bonus", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-PB/locale/en/locale.cfg b/PHI-PB/locale/en/locale.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/PHI-PB/locale/ja/locale.cfg b/PHI-PB/locale/ja/locale.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/PHI-PB/locale/zh-CN/locale.cfg b/PHI-PB/locale/zh-CN/locale.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/PHI-PB/locale/zh-TW/locale.cfg b/PHI-PB/locale/zh-TW/locale.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/PHI-WE/config.lua b/PHI-WE/config.lua new file mode 100644 index 0000000..67ebd52 --- /dev/null +++ b/PHI-WE/config.lua @@ -0,0 +1,43 @@ +local items = { + ['laser-turret'] = { + enabled = true, + type = 'electric-turret', + name = 'laser-turret', + ref_name = 'laser-turret', + tech = 'laser-turret', + min = 2, + max = 3, + range = 24 + }, + ['gun-turret'] = { + enabled = true, + type = 'ammo-turret', + name = 'gun-turret', + ref_name = 'gun-turret', + tech = 'gun-turret', + min = 2, + max = 3, + range = 18 + }, + ['flamethrower-turret'] = { + enabled = true, + type = 'fluid-turret', + name = 'flamethrower-turret', + ref_name = 'flamethrower-turret', + tech = 'flamethrower', + min = 2, + max = 3, + range = 30 + }, + ['radar'] = { + enabled = true, + type = 'radar', + name = 'radar', + ref_name = 'radar', + tech = 'automation', + min = 2, + max = 3 + } +} + +return items \ No newline at end of file diff --git a/PHI-WE/data.lua b/PHI-WE/data.lua index 015d9cd..9556cd2 100644 --- a/PHI-WE/data.lua +++ b/PHI-WE/data.lua @@ -1,44 +1,4 @@ -local items = { - ['laser-turret'] = { - enabled = true, - type = 'electric-turret', - name = 'laser-turret', - ref_name = 'laser-turret', - tech = 'laser-turret', - min = 2, - max = 3, - range = 24 - }, - ['gun-turret'] = { - enabled = true, - type = 'ammo-turret', - name = 'gun-turret', - ref_name = 'gun-turret', - tech = 'gun-turret', - min = 2, - max = 3, - range = 18 - }, - ['flamethrower-turret'] = { - enabled = true, - type = 'fluid-turret', - name = 'flamethrower-turret', - ref_name = 'flamethrower-turret', - tech = 'flamethrower', - min = 2, - max = 3, - range = 30 - }, - ['radar'] = { - enabled = true, - type = 'radar', - name = 'radar', - ref_name = 'radar', - tech = 'automation', - min = 2, - max = 3 - } -} +local items = require 'config' -- entity local function EE(source, tier) diff --git a/PHI-WE/info.json b/PHI-WE/info.json index 2bb0e06..8b213c9 100644 --- a/PHI-WE/info.json +++ b/PHI-WE/info.json @@ -1,8 +1,8 @@ { "name": "PHI-WE", - "version": "1.0.2", + "version": "1.0.3", "factorio_version": "1.1", - "date": "2023-05-08", + "date": "2023-05-09", "title": "Phidias Warfare", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-WE/migrations/migrations.lua b/PHI-WE/migrations/migrations.lua new file mode 100644 index 0000000..0b8f2fb --- /dev/null +++ b/PHI-WE/migrations/migrations.lua @@ -0,0 +1,19 @@ +local items = require '__PHI-MB__/config' + +for _, force in pairs(game.forces) do + local technologies = force.technologies + local recipes = force.recipes + + for _, v in pairs(items) do + if v.enabled then + if technologies[v.tech] ~= nil then + if technologies[v.tech].researched then + for j=v.min, v.max, 1 do + recipes[v.name .. '-' .. j].enabled = true + recipes[v.name .. '-' .. j].reload() + end + end + end + end + end +end