.

PHI-CC/.editorconfig

@@ -1,8 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-charset = utf-8
-trim_trailing_whitespace = false
-insert_final_newline = false

PHI-CC/changelog.txt

@@ -1,6 +0,0 @@
----------------------------------------------------------------------------------------------------
-Version: 1.1.0
-Date: 2022-12-01
-
-Added:
-    - Compound Solar Panel and Accumulator

PHI-CC/control.lua

@@ -1,24 +0,0 @@
-script.on_init(function()
-    if global.phi == nil then
-        global.phi = {}
-    end
-
-    global.phi.cc = {}
-    global.phi.gui = {}
-end)
-
-script.on_event(defines.events.on_player_created, function(event)
-    global.phi.cc.gui[event.player.index] = {controls_active = true}
-
-    local player = game.get_player(event.player_index)
-
-    local screen_element = player.gui.screen
-    local main_frame = screen_element.add{type='frame', name='ugg_main_frame', caption={'ugg.hello_world'}}
-    main_frame.style.size = {385, 165}
-    main_frame.auto_center = true
-
-    local content_frame = main_frame.add{type='frame', name='content_frame', direction='vertical', style='ugg_content_frame'}
-    local controls_flow = content_frame.add{type='flow', name='controls_flow', direction='horizontal', style='ugg_controls_flow'}
-
-    controls_flow.add{type='button', name='ugg_controls_toggle', caption={'ugg.deactivate'}}
-end)

PHI-CC/info.json

@@ -1,14 +0,0 @@
-{
-    "name": "PHI-CC",
-    "version": "1.0.0",
-    "factorio_version": "1.1",
-    "date": "2023-04-25",
-    "title": "Phidias Circuit Combinator",
-    "author": "PHIDIAS0303",
-    "contributers": "",
-    "homepage": "",
-    "description": "",
-    "dependencies": [
-        "base >= 1.1.0"
-    ]
-}

PHI-EN/config.lua

@@ -1,17 +1,5 @@
 local items = {
     ['setting'] = {
-        ['PHI-EN-SOLAR'] = {
-            type = 'enabled',
-            effect = {'solar-panel', 'accumulator'}
-        },
-        ['PHI-EN-STEAM'] = {
-            type = 'enabled',
-            effect = {'boiler', 'steam-engine'}
-        },
-        ['PHI-EN-NUCLEAR'] = {
-            type = 'enabled',
-            effect = {'nuclear-reactor', 'heat-pipe', 'heat-exchanger', 'steam-turbine'}
-        },
         ['PHI-EN-SOLAR-TIER'] = {
             type = 'max',
             effect = {'solar-panel', 'accumulator'}

PHI-EN/data-updates.lua

@@ -2,6 +2,10 @@ local items = require 'config'
 
 for k, v in pairs(items['setting']) do
     for k2=1, #v.effect do
+        if settings.startup[k].value < items[v.effect[k2]].min then
+            items[v.effect[k2]].enabled = false
+        end
+
         items[v.effect[k2]][v.type] = settings.startup[k].value
     end
 end

PHI-EN/data.lua

@@ -168,6 +168,10 @@ end
 
 for k, v in pairs(items['setting']) do
     for k2=1, #v.effect do
+        if settings.startup[k].value < items[v.effect[k2]].min then
+            items[v.effect[k2]].enabled = false
+        end
+
         items[v.effect[k2]][v.type] = settings.startup[k].value
     end
 end

PHI-EN/info.json

@@ -1,8 +1,8 @@
 {
     "name": "PHI-EN",
-    "version": "1.3.3",
+    "version": "1.3.4",
     "factorio_version": "1.1",
-    "date": "2023-09-18",
+    "date": "2023-09-19",
     "title": "Phidias Energy",
     "author": "PHIDIAS0303",
     "contributers": "",

PHI-EN/locale/en/locale.cfg

@@ -155,9 +155,6 @@ compound-energy-6=Source of free electric energy, but useless at night.
 compound-energy-7=Source of free electric energy, but useless at night.
 
 [mod-setting-name]
-PHI-EN-SOLAR=Solar Panel
-PHI-EN-STEAM=Steam engine
-PHI-EN-NUCLEAR=Nuclear reactor
 PHI-EN-SOLAR-TIER=Solar Panel
 PHI-EN-STEAM-TIER=Steam engine
 PHI-EN-NUCLEAR-TIER=Nuclear reactor

PHI-EN/locale/ja/locale.cfg

@@ -155,9 +155,6 @@ compound-energy-6=クリーンで燃料が尽きることのない発電設備
 compound-energy-7=クリーンで燃料が尽きることのない発電設備。夜間は発電しません。
 
 [mod-setting-name]
-PHI-EN-SOLAR=ソーラーパネル
-PHI-EN-STEAM=蒸気機関
-PHI-EN-NUCLEAR=原子炉
 PHI-EN-SOLAR-TIER=ソーラーパネル
 PHI-EN-STEAM-TIER=蒸気機関
 PHI-EN-NUCLEAR-TIER=原子炉

PHI-EN/locale/zh-CN/locale.cfg

@@ -155,9 +155,6 @@ compound-energy-6=取之不盡的電力來源，但在夜晚派不上用場。
 compound-energy-7=取之不盡的電力來源，但在夜晚派不上用場。
 
 [mod-setting-name]
-PHI-EN-SOLAR=太陽能板
-PHI-EN-STEAM=蒸汽發電機
-PHI-EN-NUCLEAR=核能反應爐
 PHI-EN-SOLAR-TIER=太陽能板
 PHI-EN-STEAM-TIER=蒸汽發電機
 PHI-EN-NUCLEAR-TIER=核能反應爐

PHI-EN/locale/zh-TW/locale.cfg

@@ -155,9 +155,6 @@ compound-energy-6=取之不盡的電力來源，但在夜晚派不上用場。
 compound-energy-7=取之不盡的電力來源，但在夜晚派不上用場。
 
 [mod-setting-name]
-PHI-EN-SOLAR=太陽能板
-PHI-EN-STEAM=蒸汽發電機
-PHI-EN-NUCLEAR=核能反應爐
 PHI-EN-SOLAR-TIER=太陽能板
 PHI-EN-STEAM-TIER=蒸汽發電機
 PHI-EN-NUCLEAR-TIER=核能反應爐

PHI-EN/settings.lua

@@ -1,40 +1,22 @@
 data:extend({{
-    type = 'bool-setting',
-    name = 'PHI-EN-SOLAR',
-    setting_type = 'startup',
-    default_value = true,
-    order = 'A1'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-EN-STEAM',
-    setting_type = 'startup',
-    default_value = true,
-    order = 'A2'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-EN-NUCLEAR',
-    setting_type = 'startup',
-    default_value = true,
-    order = 'A3'
-  }, {
     type = 'int-setting',
     name = 'PHI-EN-SOLAR-TIER',
     setting_type = 'startup',
     default_value = 8,
-    allowed_values = {2, 3, 4, 5, 6, 7, 8},
+    allowed_values = {1, 2, 3, 4, 5, 6, 7, 8},
-    order = 'B1'
+    order = 'A1'
   }, {
     type = 'int-setting',
     name = 'PHI-EN-STEAM-TIER',
     setting_type = 'startup',
     default_value = 5,
-    allowed_values = {2, 3, 4, 5},
+    allowed_values = {1, 2, 3, 4, 5},
-    order = 'B2'
+    order = 'A2'
   }, {
     type = 'int-setting',
     name = 'PHI-EN-NUCLEAR-TIER',
     setting_type = 'startup',
     default_value = 5,
-    allowed_values = {2, 3, 4, 5},
+    allowed_values = {1, 2, 3, 4, 5},
-    order = 'B3'
+    order = 'A3'
   }})

PHI-EQ/config.lua

@@ -1,4 +1,38 @@
 local items = {
+    ['setting'] = {
+        ['PHI-EQ-SOLAR-TIER'] = {
+            type = 'max',
+            effect = {'solar-panel'}
+        },
+        ['PHI-EQ-BATTERY-TIER'] = {
+            type = 'max',
+            effect = {'battery'}
+        },
+        ['PHI-EQ-REACTOR-TIER'] = {
+            type = 'max',
+            effect = {'fusion-reactor'}
+        },
+        ['PHI-EQ-LASER-TIER'] = {
+            type = 'max',
+            effect = {'personal-laser-defense'}
+        },
+        ['PHI-EQ-ROBOPORT-TIER'] = {
+            type = 'max',
+            effect = {'personal-roboport'}
+        },
+        ['PHI-EQ-SHIELD-TIER'] = {
+            type = 'max',
+            effect = {'energy-shield'}
+        },
+        ['PHI-EQ-NIGHT-TIER'] = {
+            type = 'max',
+            effect = {'night-vision'}
+        },
+        ['PHI-EQ-EXO-TIER'] = {
+            type = 'max',
+            effect = {'exoskeleton'}
+        }
+    },
     ['solar-panel'] = {
         enabled = true,
         type = 'solar-panel',

PHI-EQ/data.lua

@@ -124,7 +124,8 @@ local function ET(source, tier)
     table.insert(data.raw.technology[source.tech].effects, {type='unlock-recipe', recipe=source.name .. '-mk' .. tier .. '-equipment'})
 end
 
-data:extend({
+if settings.startup['PHI-EQ-ARMOR'].value then
+    data:extend({
         {
             type = 'equipment-grid',
             name = 'equipment-grid-14x14',
@@ -150,18 +151,18 @@ data:extend({
             open_sound = {filename =  '__base__/sound/armor-open.ogg', volume = 1},
             close_sound = {filename = '__base__/sound/armor-close.ogg', volume = 1}
         }
-})
+    })
 
-data:extend({{
+    data:extend({{
         type = 'recipe',
         name = 'power-armor-mk3',
         energy_required = 5,
         enabled = 'false',
         ingredients = {{'power-armor-mk2', 2}},
         result = 'power-armor-mk3'
-}})
+    }})
 
-for _, animation in ipairs(data.raw['character']['character']['animations']) do
+    for _, animation in ipairs(data.raw['character']['character']['animations']) do
         if animation.armors then
             for _, armor in ipairs(animation.armors) do
                 if armor == 'power-armor-mk2' then
@@ -170,11 +171,23 @@ for _, animation in ipairs(data.raw['character']['character']['animations']) do
                 end
             end
         end
+    end
+
+    table.insert(data.raw.technology['power-armor-mk2'].effects, {type='unlock-recipe', recipe='power-armor-mk3'})
 end
 
-table.insert(data.raw.technology['power-armor-mk2'].effects, {type='unlock-recipe', recipe='power-armor-mk3'})
+for k, v in pairs(items['setting']) do
+    for k2=1, #v.effect do
+        if settings.startup[k].value < items[v.effect[k2]].min then
+            items[v.effect[k2]].enabled = false
+        end
 
-for _, v in pairs(items) do
+        items[v.effect[k2]][v.type] = settings.startup[k].value
+    end
+end
+
+for k, v in pairs(items) do
+    if k ~= 'setting' then
         if v.enabled then
             for j=v.min, v.max, 1 do
                 EE(v, j)
@@ -183,4 +196,5 @@ for _, v in pairs(items) do
                 ET(v, j)
             end
         end
+    end
 end

PHI-EQ/info.json

@@ -1,8 +1,8 @@
 {
     "name": "PHI-EQ",
-    "version": "1.1.16",
+    "version": "1.2.0",
     "factorio_version": "1.1",
-    "date": "2023-05-10",
+    "date": "2023-09-19",
     "title": "Phidias Equipment",
     "author": "PHIDIAS0303",
     "contributers": "",

PHI-EQ/locale/en/locale.cfg

@@ -146,3 +146,14 @@ personal-roboport-mk8-equipment=Personal Roboport MK8
 
 night-vision-mk2-equipment=Nightvision Equipment MK2
 exoskeleton-mk2-equipment=Exoskeleton MK2
+
+[mod-setting-name]
+PHI-EQ-SOLAR-TIER=Portable Solar Panel
+PHI-EQ-BATTERY-TIER=Personal Battery
+PHI-EQ-REACTOR-TIER=Portable Fusion Reactor
+PHI-EQ-LASER-TIER=Personal Laser Defense
+PHI-EQ-ROBOPORT-TIER=Personal Roboport
+PHI-EQ-SHIELD-TIER=Energy Shield
+PHI-EQ-NIGHT-TIER=Nightvision Equipment
+PHI-EQ-EXO-TIER=Exoskeleton
+PHI-EQ-ARMOR=Power armor

PHI-EQ/locale/ja/locale.cfg

@@ -146,3 +146,14 @@ personal-roboport-mk8-equipment=携帯ロボットステーション8代
 
 night-vision-mk2-equipment=暗視モジュール2代
 exoskeleton-mk2-equipment=強化外骨格モジュール2代
+
+[mod-setting-name]
+PHI-EQ-SOLAR-TIER=携帯ソーラーパネルモジュール
+PHI-EQ-BATTERY-TIER=個人用バッテリー
+PHI-EQ-REACTOR-TIER=携帯核融合炉モジュール
+PHI-EQ-LASER-TIER=携帯レーザー防御モジュール
+PHI-EQ-ROBOPORT-TIER=携帯ロボットステーション
+PHI-EQ-SHIELD-TIER=エネルギーシールドモジュール
+PHI-EQ-NIGHT-TIER=暗視モジュール
+PHI-EQ-EXO-TIER=強化外骨格モジュール
+PHI-EQ-ARMOR=パワーアーマー

PHI-EQ/locale/zh-CN/locale.cfg

@@ -146,3 +146,14 @@ personal-roboport-mk8-equipment=機動無人機調度站8代
 
 night-vision-mk2-equipment=夜視鏡2代
 exoskeleton-mk2-equipment=動力外骨骼2代
+
+[mod-setting-name]
+PHI-EQ-SOLAR-TIER=攜帶式太陽能板
+PHI-EQ-BATTERY-TIER=電池設備
+PHI-EQ-REACTOR-TIER=攜帶式核融合反應器
+PHI-EQ-LASER-TIER=個人雷射防禦
+PHI-EQ-ROBOPORT-TIER=機動無人機調度站
+PHI-EQ-SHIELD-TIER=能量護盾
+PHI-EQ-NIGHT-TIER=夜視鏡
+PHI-EQ-EXO-TIER=動力外骨骼
+PHI-EQ-ARMOR=動力護甲

PHI-EQ/locale/zh-TW/locale.cfg

@@ -146,3 +146,14 @@ personal-roboport-mk8-equipment=機動無人機調度站8代
 
 night-vision-mk2-equipment=夜視鏡2代
 exoskeleton-mk2-equipment=動力外骨骼2代
+
+[mod-setting-name]
+PHI-EQ-SOLAR-TIER=攜帶式太陽能板
+PHI-EQ-BATTERY-TIER=電池設備
+PHI-EQ-REACTOR-TIER=攜帶式核融合反應器
+PHI-EQ-LASER-TIER=個人雷射防禦
+PHI-EQ-ROBOPORT-TIER=機動無人機調度站
+PHI-EQ-SHIELD-TIER=能量護盾
+PHI-EQ-NIGHT-TIER=夜視鏡
+PHI-EQ-EXO-TIER=動力外骨骼
+PHI-EQ-ARMOR=動力護甲

PHI-EQ/settings.lua

@@ -0,0 +1,63 @@
+data:extend({{
+    type = 'int-setting',
+    name = 'PHI-EQ-SOLAR-TIER',
+    setting_type = 'startup',
+    default_value = 8,
+    allowed_values = {1, 2, 3, 4, 5, 6, 7, 8},
+    order = 'A1'
+  }, {
+    type = 'int-setting',
+    name = 'PHI-EQ-BATTERY-TIER',
+    setting_type = 'startup',
+    default_value = 8,
+    allowed_values = {2, 3, 4, 5, 6, 7, 8},
+    order = 'A2'
+  }, {
+    type = 'int-setting',
+    name = 'PHI-EN-REACTOR-TIER',
+    setting_type = 'startup',
+    default_value = 8,
+    allowed_values = {1, 2, 3, 4, 5, 6, 7, 8},
+    order = 'A3'
+  }, {
+    type = 'int-setting',
+    name = 'PHI-EN-LASER-TIER',
+    setting_type = 'startup',
+    default_value = 8,
+    allowed_values = {1, 2, 3, 4, 5, 6, 7, 8},
+    order = 'A4'
+  }, {
+    type = 'int-setting',
+    name = 'PHI-EN-ROBOPORT-TIER',
+    setting_type = 'startup',
+    default_value = 8,
+    allowed_values = {2, 3, 4, 5, 6, 7, 8},
+    order = 'A5'
+  }, {
+    type = 'int-setting',
+    name = 'PHI-EN-SHIELD-TIER',
+    setting_type = 'startup',
+    default_value = 8,
+    allowed_values = {2, 3, 4, 5, 6, 7, 8},
+    order = 'A6'
+  }, {
+    type = 'int-setting',
+    name = 'PHI-EN-NIGHT-TIER',
+    setting_type = 'startup',
+    default_value = 2,
+    allowed_values = {1, 2},
+    order = 'A7'
+  }, {
+    type = 'int-setting',
+    name = 'PHI-EN-EXO-TIER',
+    setting_type = 'startup',
+    default_value = 2,
+    allowed_values = {1, 2},
+    order = 'A8'
+  }, {
+    type = 'bool-setting',
+    name = 'PHI-EQ-ARMOR',
+    setting_type = 'startup',
+    default_value = true,
+    order = 'A9'
+  }})