From 339e95dbc326fe307e8895d985785f10e89558ab Mon Sep 17 00:00:00 2001
From: PHIDIAS <phidias@aperx.org>
Date: Mon, 1 May 2023 01:32:03 +0900
Subject: [PATCH] Update

---
 PHI-EN/config.lua       |  28 ++++++++
 PHI-EN/data.lua         |  28 +-------
 PHI-MB/config.lua       | 142 ++++++++++++++++++++++++++++++++++++++++
 PHI-MB/data-updates.lua |   9 ++-
 PHI-MB/data.lua         | 142 +---------------------------------------
 PHI-MB/info.json        |   4 +-
 6 files changed, 178 insertions(+), 175 deletions(-)
 create mode 100644 PHI-EN/config.lua
 create mode 100644 PHI-MB/config.lua

diff --git a/PHI-EN/config.lua b/PHI-EN/config.lua
new file mode 100644
index 0000000..be0cc09
--- /dev/null
+++ b/PHI-EN/config.lua
@@ -0,0 +1,28 @@
+local items = {
+    ['solar-panel'] = {
+        enabled = true,
+        type = 'solar-panel',
+        name = 'solar-panel',
+        min = 2,
+        max = 8,
+        base = 60
+    },
+    ['accumulator'] = {
+        enabled = true,
+        type = 'accumulator',
+        name = 'accumulator',
+        min = 2,
+        max = 8,
+        base = 5
+    }
+}
+
+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
+
+return items
\ No newline at end of file
diff --git a/PHI-EN/data.lua b/PHI-EN/data.lua
index a8e43f3..18a91de 100644
--- a/PHI-EN/data.lua
+++ b/PHI-EN/data.lua
@@ -1,32 +1,6 @@
 local alpha_order = {'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm'}
 local graphics_location = '__PHI-EN__/graphics/'
-
-local items = {
-    ['solar-panel'] = {
-        enabled = true,
-        type = 'solar-panel',
-        name = 'solar-panel',
-        min = 2,
-        max = 8,
-        base = 60
-    },
-    ['accumulator'] = {
-        enabled = true,
-        type = 'accumulator',
-        name = 'accumulator',
-        min = 2,
-        max = 8,
-        base = 5
-    }
-}
-
-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
+local items = require 'config'
 
 -- entity
 local function EE(source, tier)
diff --git a/PHI-MB/config.lua b/PHI-MB/config.lua
new file mode 100644
index 0000000..b44c938
--- /dev/null
+++ b/PHI-MB/config.lua
@@ -0,0 +1,142 @@
+local items = {
+    ['assembling-machine'] = {
+        enabled = true,
+        type = 'assembling-machine',
+        name = 'assembling-machine',
+        ref_name = 'assembling-machine-3',
+        tech = 'automation-3',
+        min = 4,
+        max = 5
+    },
+    ['electric-furnace'] = {
+        enabled = true,
+        type = 'furnace',
+        name = 'electric-furnace',
+        ref_name = 'electric-furnace',
+        tech = 'advanced-material-processing-2',
+        min = 2,
+        max = 3
+    },
+    ['oil-refinery'] = {
+        enabled = true,
+        type = 'assembling-machine',
+        name = 'oil-refinery',
+        ref_name = 'oil-refinery',
+        tech = 'oil-processing',
+        min = 2,
+        max = 3
+    },
+    ['chemical-plant'] = {
+        enabled = true,
+        type = 'assembling-machine',
+        name = 'chemical-plant',
+        ref_name = 'chemical-plant',
+        tech = 'oil-processing',
+        min = 2,
+        max = 3
+    },
+    ['centrifuge'] = {
+        enabled = true,
+        type = 'assembling-machine',
+        name = 'centrifuge',
+        ref_name = 'centrifuge',
+        tech = 'uranium-processing',
+        min = 2,
+        max = 3
+    },
+    ['lab'] = {
+        enabled = true,
+        type = 'lab',
+        name = 'lab',
+        ref_name = 'lab',
+        tech = 'automation',
+        min = 2,
+        max = 3
+    }
+}
+
+if mods['aai-industry'] then
+    items['industrial-furnace'] = {
+        enabled = true,
+        type = 'assembling-machine',
+        name = 'industrial-furnace',
+        ref_name = 'industrial-furnace',
+        tech = 'automation-3',
+        min = 2,
+        max = 3
+    }
+
+    items['fuel-processor'] = {
+        enabled = true,
+        type = 'assembling-machine',
+        name = 'fuel-processor',
+        ref_name = 'fuel-processor',
+        tech = 'automation',
+        min = 2,
+        max = 3
+    }
+end
+
+if mods['space-exploration'] then
+    items['se-space-assembling-machine'] = {
+        enabled = true,
+        type = 'assembling-machine',
+        name = 'se-space-assembling-machine',
+        ref_name = 'se-space-assembling-machine',
+        tech = 'automation-3',
+        min = 2,
+        max = 3
+    }
+
+    items['se-space-manufactory'] = {
+        enabled = true,
+        type = 'assembling-machine',
+        name = 'se-space-manufactory',
+        ref_name = 'se-space-manufactory',
+        tech = 'automation-3',
+        min = 2,
+        max = 3
+    }
+
+    items['se-casting-machine'] = {
+        enabled = true,
+        type = 'assembling-machine',
+        name = 'se-casting-machine',
+        ref_name = 'se-casting-machine',
+        tech = 'automation-3',
+        min = 2,
+        max = 3
+    }
+
+    items['se-pulveriser'] = {
+        enabled = true,
+        type = 'assembling-machine',
+        name = 'se-pulveriser',
+        ref_name = 'se-pulveriser',
+        tech = 'automation-2',
+        min = 2,
+        max = 3
+    }
+
+    items['se-lifesupport-facility'] = {
+        enabled = true,
+        type = 'assembling-machine',
+        name = 'se-lifesupport-facility',
+        ref_name = 'se-lifesupport-facility',
+        tech = 'automation-2',
+        min = 2,
+        max = 3
+    }
+
+    items['se-fuel-refinery'] = {
+        enabled = true,
+        type = 'assembling-machine',
+        name = 'se-fuel-refinery',
+        ref_name = 'se-fuel-refinery',
+        tech = 'automation',
+        min = 2,
+        max = 3
+    }
+end
+
+return items
\ No newline at end of file
diff --git a/PHI-MB/data-updates.lua b/PHI-MB/data-updates.lua
index 490eef8..bdff310 100644
--- a/PHI-MB/data-updates.lua
+++ b/PHI-MB/data-updates.lua
@@ -7,11 +7,6 @@ data.raw['furnace']['electric-furnace'].fast_replaceable_group = 'electric-furna
 data.raw['furnace']['electric-furnace-2'].fast_replaceable_group = data.raw['furnace']['electric-furnace'].fast_replaceable_group
 data.raw['furnace']['electric-furnace-3'].fast_replaceable_group = data.raw['furnace']['electric-furnace-2'].fast_replaceable_group
 
-if mods['space-exploration'] then
-    data.raw['furnace']['electric-furnace-2'].crafting_categories = data.raw['furnace']['electric-furnace'].crafting_categories
-    data.raw['furnace']['electric-furnace-3'].crafting_categories = data.raw['furnace']['electric-furnace'].crafting_categories
-end
-
 -- chemical plant
 data.raw['assembling-machine']['chemical-plant'].fast_replaceable_group = 'chemical-plant'
 data.raw['assembling-machine']['chemical-plant-2'].fast_replaceable_group = data.raw['assembling-machine']['chemical-plant'].fast_replaceable_group
@@ -47,6 +42,10 @@ end
 
 -- se
 if mods['space-exploration'] then
+    -- electric furnace
+    data.raw['furnace']['electric-furnace-2'].crafting_categories = data.raw['furnace']['electric-furnace'].crafting_categories
+    data.raw['furnace']['electric-furnace-3'].crafting_categories = data.raw['furnace']['electric-furnace'].crafting_categories
+
     -- space assembling machine
     data.raw['assembling-machine']['se-space-assembling-machine'].fast_replaceable_group  = 'space-assembling-machine'
     data.raw['assembling-machine']['se-space-assembling-machine-2'].fast_replaceable_group = data.raw['assembling-machine']['se-space-assembling-machine'].fast_replaceable_group
diff --git a/PHI-MB/data.lua b/PHI-MB/data.lua
index 9a0144f..38ef860 100644
--- a/PHI-MB/data.lua
+++ b/PHI-MB/data.lua
@@ -1,146 +1,6 @@
 local alpha_order = {'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm'}
 local graphics_location = '__PHI-MB__/graphics/'
-
-local items = {
-    ['assembling-machine'] = {
-        enabled = true,
-        type = 'assembling-machine',
-        name = 'assembling-machine',
-        ref_name = 'assembling-machine-3',
-        tech = 'automation-3',
-        min = 4,
-        max = 5
-    },
-    ['electric-furnace'] = {
-        enabled = true,
-        type = 'furnace',
-        name = 'electric-furnace',
-        ref_name = 'electric-furnace',
-        tech = 'advanced-material-processing-2',
-        min = 2,
-        max = 3
-    },
-    ['oil-refinery'] = {
-        enabled = true,
-        type = 'assembling-machine',
-        name = 'oil-refinery',
-        ref_name = 'oil-refinery',
-        tech = 'oil-processing',
-        min = 2,
-        max = 3
-    },
-    ['chemical-plant'] = {
-        enabled = true,
-        type = 'assembling-machine',
-        name = 'chemical-plant',
-        ref_name = 'chemical-plant',
-        tech = 'oil-processing',
-        min = 2,
-        max = 3
-    },
-    ['centrifuge'] = {
-        enabled = true,
-        type = 'assembling-machine',
-        name = 'centrifuge',
-        ref_name = 'centrifuge',
-        tech = 'uranium-processing',
-        min = 2,
-        max = 3
-    },
-    ['lab'] = {
-        enabled = true,
-        type = 'lab',
-        name = 'lab',
-        ref_name = 'lab',
-        tech = 'automation',
-        min = 2,
-        max = 3
-    }
-}
-
-if mods['aai-industry'] then
-    items['industrial-furnace'] = {
-        enabled = true,
-        type = 'assembling-machine',
-        name = 'industrial-furnace',
-        ref_name = 'industrial-furnace',
-        tech = 'automation-3',
-        min = 2,
-        max = 3
-    }
-
-    items['fuel-processor'] = {
-        enabled = true,
-        type = 'assembling-machine',
-        name = 'fuel-processor',
-        ref_name = 'fuel-processor',
-        tech = 'automation',
-        min = 2,
-        max = 3
-    }
-end
-
-if mods['space-exploration'] then
-    items['se-space-assembling-machine'] = {
-        enabled = true,
-        type = 'assembling-machine',
-        name = 'se-space-assembling-machine',
-        ref_name = 'se-space-assembling-machine',
-        tech = 'automation-3',
-        min = 2,
-        max = 3
-    }
-
-    items['se-space-manufactory'] = {
-        enabled = true,
-        type = 'assembling-machine',
-        name = 'se-space-manufactory',
-        ref_name = 'se-space-manufactory',
-        tech = 'automation-3',
-        min = 2,
-        max = 3
-    }
-
-    items['se-casting-machine'] = {
-        enabled = true,
-        type = 'assembling-machine',
-        name = 'se-casting-machine',
-        ref_name = 'se-casting-machine',
-        tech = 'automation-3',
-        min = 2,
-        max = 3
-    }
-
-    items['se-pulveriser'] = {
-        enabled = true,
-        type = 'assembling-machine',
-        name = 'se-pulveriser',
-        ref_name = 'se-pulveriser',
-        tech = 'automation-2',
-        min = 2,
-        max = 3
-    }
-
-    items['se-lifesupport-facility'] = {
-        enabled = true,
-        type = 'assembling-machine',
-        name = 'se-lifesupport-facility',
-        ref_name = 'se-lifesupport-facility',
-        tech = 'automation-2',
-        min = 2,
-        max = 3
-    }
-
-    items['se-fuel-refinery'] = {
-        enabled = true,
-        type = 'assembling-machine',
-        name = 'se-fuel-refinery',
-        ref_name = 'se-fuel-refinery',
-        tech = 'automation',
-        min = 2,
-        max = 3
-    }
-end
+local items = require 'config'
 
 -- entity
 local function EE(source, tier)
diff --git a/PHI-MB/info.json b/PHI-MB/info.json
index 29f1c30..0723a3d 100644
--- a/PHI-MB/info.json
+++ b/PHI-MB/info.json
@@ -1,8 +1,8 @@
 {
     "name": "PHI-MB",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "factorio_version": "1.1",
-    "date": "2023-04-27",
+    "date": "2023-05-01",
     "title": "Phidias Megabase",
     "author": "PHIDIAS0303",
     "contributers": "",