.

2025-12-27 11:05:22 +09:00 · 2024-10-29 19:36:30 +09:00
parent 1daf994153
commit c37c031207
9 changed files with 388 additions and 481 deletions
--- a/PHI-CL/changelog.txt
+++ b/PHI-CL/changelog.txt
@@ -1,3 +1,10 @@
+---------------------------------------------------------------------------------------------------
+Version: 3.0.0
+Date: 2024-10-16
+
+Added:
+    - Updated for 2.0
+
 ---------------------------------------------------------------------------------------------------
 Version: 2.0.1
 Date: 2024-06-20
--- a/PHI-CL/data.lua
+++ b/PHI-CL/data.lua
@@ -2,7 +2,11 @@ local items = require 'config'
 local main = require 'main'
 local file_stage = 1

-if settings.startup['PHI-EN'].value and settings.startup['PHI-EN-SOLAR-TIER'].value and settings.startup['PHI-EN-POWER-TIER'].value and settings.startup['PHI-EN-POWER-TIER'].value then
+if settings.startup['PHI-EN'].value then
+    if settings.startup['PHI-EN-POWER-TIER'].value > 1 then
+        data.raw['fluid']['steam'].max_temperature = 5000
+    end
+
    local ml = math.max(settings.startup['PHI-EN-SOLAR-TIER'].value, settings.startup['PHI-EN-POWER-TIER'].value)

    for i=1, 7 do
@@ -44,7 +48,7 @@ if settings.startup['PHI-EN'].value and settings.startup['PHI-EN-SOLAR-TIER'].va
    end
 end

-if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-RADAR'].value then
+if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TOOL'].value then
    local item = table.deepcopy(data.raw['item']['radar'])
    item.name = 'super-radar'
    item.place_result = 'super-radar'
@@ -87,9 +91,127 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-RADAR'].value t
        localised_name = {'name.super-radar'},
        localised_description = {'description.super-radar'}
    }})
+
+    item = table.deepcopy(data.raw['item']['electric-energy-interface'])
+    item.name = 'passive-energy-void'
+    item.place_result = 'passive-energy-void'
+    item.localised_name = {'name.passive-energy-void'}
+    item.localised_description = {'description.passive-energy-void'}
+    data:extend({item})
+
+    entity = table.deepcopy(data.raw['electric-energy-interface']['electric-energy-interface'])
+    entity.name = 'passive-energy-void'
+    entity.minable.result = 'passive-energy-void'
+    entity.energy_source.usage_priority = 'tertiary'
+    entity.energy_source.emissions_per_minute = {pollution = 0}
+    entity.energy_source.input_flow_limit = '1TW'
+    entity.energy_source.output_flow_limit = '0W'
+    entity.energy_production = '0W'
+    entity.energy_usage = '1TW'
+    entity.gui_mode = 'none'
+    entity.localised_name = {'name.passive-energy-void'}
+    entity.localised_description = {'description.passive-energy-void'}
+    data:extend({entity})
+
+    data:extend({{
+        type = 'recipe',
+        name = 'passive-energy-void',
+        energy_required = 2,
+        enabled = false,
+        ingredients = {{type='item', name='accumulator', amount=1}},
+        results = {{type='item', name='passive-energy-void', amount=1}},
+        main_product = 'passive-energy-void',
+        localised_name = {'name.passive-energy-void'},
+        localised_description = {'description.passive-energy-void'}
+    }})
+
+    table.insert(data.raw.technology['electric-energy-accumulators'].effects, {type='unlock-recipe', recipe='passive-energy-void'})
+    data:extend({{type='recipe-category', name='fluid'}})
+
+    item = table.deepcopy(data.raw['item']['offshore-pump'])
+    item.name = 'super-pump'
+    item.place_result = 'super-pump'
+    item.order = 'b[fluids]-a[super-pump]-o'
+
+    item.icons = {
+        {
+            icon = '__base__/graphics/icons/offshore-pump.png',
+            tint = items['tint'][2],
+            icon_size = 64,
+            icon_mipmaps = 4
+        }
+    }
+
+    item.icon = nil
+    item.icon_size = nil
+    item.icon_mipmaps = nil
+    item.localised_name = {'name.super-pump'}
+    item.localised_description = item.localised_description
+    data:extend({item})
+
+    entity = table.deepcopy(data.raw['offshore-pump']['offshore-pump'])
+    entity.name = 'super-pump'
+    entity.minable.result = 'super-pump'
+    entity.type = 'assembling-machine'
+    entity.crafting_categories = {'fluid'}
+    entity.crafting_speed = 1
+    entity.energy_source = {type = 'void'}
+    entity.fluid_box.volume = 4000
+    entity.fluid_boxes = {table.deepcopy(entity.fluid_box)}
+    entity.fluid_box = nil
+    entity.fluid_boxes_off_when_no_fluid_recipe = false
+    entity.effect_receiver = {uses_module_effects=false, uses_beacon_effects=false}
+    entity.allowed_effects = {'consumption'}
+    entity.collision_mask = nil
+    entity.tile_buildability_rules = nil
+    entity.fluid_source_offset = nil
+    entity.localised_name = {'name.super-pump'}
+    entity.localised_description = entity.localised_description
+    data:extend({entity})
+
+    data:extend({{
+        type = 'recipe',
+        name = 'super-pump',
+        energy_required = 2,
+        enabled = true,
+        ingredients = {{type='item', name='electronic-circuit', amount=2}, {type='item', name='pipe', amount=1}, {type='item', name='iron-gear-wheel', amount=1}},
+        results = {{type='item', name='super-pump', amount=1}},
+        main_product = 'super-pump',
+        localised_name = {'name.super-pump'},
+        localised_description = nil
+    }})
+
+    for _, v in pairs(data.raw.fluid) do
+        if v.subgroup == 'fluid' then
+            local temp
+
+            if v.max_temperature then
+                temp = v.max_temperature
+
+            else
+                temp = v.default_temperature
+            end
+
+            data:extend({{
+                type = 'recipe',
+                name = v.name,
+                category = 'fluid',
+                energy_required = 1,
+                enabled = true,
+                ingredients = {},
+                results = {{type='fluid', name=v.name, amount=16000, temperature=temp}},
+                main_product = v.name,
+                hide_from_player_crafting = true,
+                allow_productivity = false,
+                crafting_machine_tint = {primary=v.flow_color},
+                localised_name = v.localised_name,
+                localised_description = nil
+            }})
+        end
+    end
 end

-if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRASH'].value then
+if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-UTILITY'].value then
    local item = table.deepcopy(data.raw['item']['steel-chest'])
    item.name = 'trash-chest'
    item.place_result = 'trash-chest'
@@ -196,97 +318,8 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRASH'].value t
    }})

    table.insert(data.raw.technology['automation'].effects, {type='unlock-recipe', recipe='trash-pipe'})
-end

-if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-LINKED'].value then
-    local item = table.deepcopy(data.raw['item']['linked-chest'])
-    item.supgroup = 'storage'
-    item.order = 'a[items]-d[linked-chest]'
-    data:extend({item})
-
-    local entity = table.deepcopy(data.raw['linked-container']['linked-chest'])
-    entity.circuit_wire_connection_point = data.raw['container']['steel-chest'].circuit_wire_connection_point
-    entity.circuit_connector_sprites = data.raw['container']['steel-chest'].circuit_connector_sprites
-    entity.circuit_wire_max_distance = data.raw['container']['steel-chest'].circuit_wire_max_distance
-    entity.inventory_type = 'with_filters_and_bar'
-    entity.inventory_size = 48
-    entity.gui_mode = 'all'
-    entity.se_allow_in_space = true
-    data:extend({entity})
-
-    data:extend({{
-        type = 'recipe',
-        name = 'linked-chest',
-        energy_required = 2,
-        enabled = false,
-        ingredients = {{type='item', name='steel-chest', amount=1}},
-        results = {{type='item', name='linked-chest', amount=1}},
-        main_product = 'linked-chest'
-    }})
-
-    table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='linked-chest'})
-end
-
-if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-LOADER'].value then
-    data.raw.recipe['loader'].hidden = false
-    data.raw.recipe['fast-loader'].hidden = false
-    data.raw.recipe['express-loader'].hidden = false
-
-    table.insert(data.raw.technology['logistics'].effects, {type='unlock-recipe', recipe='loader'})
-    table.insert(data.raw.technology['logistics-2'].effects, {type='unlock-recipe', recipe='fast-loader'})
-    table.insert(data.raw.technology['logistics-3'].effects, {type='unlock-recipe', recipe='express-loader'})
-
-    if mods['space-age'] then
-        data.raw.recipe['turbo-loader'].hidden = false
-        table.insert(data.raw.technology['turbo-transport-belt'].effects, {type='unlock-recipe', recipe='turbo-loader'})
-    end
-end
-
-if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-ENERGY'].value then
-    local item = table.deepcopy(data.raw['item']['electric-energy-interface'])
-    item.name = 'passive-energy-void'
-    item.place_result = 'passive-energy-void'
-    item.localised_name = {'name.passive-energy-void'}
-    item.localised_description = {'description.passive-energy-void'}
-    data:extend({item})
-
-    local entity = table.deepcopy(data.raw['electric-energy-interface']['electric-energy-interface'])
-    entity.name = 'passive-energy-void'
-    entity.minable.result = 'passive-energy-void'
-    entity.energy_source.usage_priority = 'tertiary'
-    entity.energy_source.emissions_per_minute = {pollution = 0}
-    entity.energy_source.input_flow_limit = '1TW'
-    entity.energy_source.output_flow_limit = '0W'
-    entity.energy_production = '0W'
-    entity.energy_usage = '1TW'
-    entity.gui_mode = 'none'
-    entity.localised_name = {'name.passive-energy-void'}
-    entity.localised_description = {'description.passive-energy-void'}
-    data:extend({entity})
-
-    data:extend({{
-        type = 'recipe',
-        name = 'passive-energy-void',
-        energy_required = 2,
-        enabled = false,
-        ingredients = {{type='item', name='accumulator', amount=1}},
-        results = {{type='item', name='passive-energy-void', amount=1}},
-        main_product = 'passive-energy-void',
-        localised_name = {'name.passive-energy-void'},
-        localised_description = {'description.passive-energy-void'}
-    }})
-
-    table.insert(data.raw.technology['electric-energy-accumulators'].effects, {type='unlock-recipe', recipe='passive-energy-void'})
-end
-
-if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-EFFCY'].value then
-    data.raw['module']['efficiency-module'].effect = {consumption=-0.4, pollution=-0.4}
-    data.raw['module']['efficiency-module-2'].effect = {consumption=-0.8, pollution=-0.8}
-    data.raw['module']['efficiency-module-3'].effect = {consumption=-1.2, pollution=-1.2}
-end
-
-if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-BOILER'].value then
-    local item = table.deepcopy(data.raw['item']['boiler'])
+    item = table.deepcopy(data.raw['item']['boiler'])
    item.name = 'electric-boiler'
    item.place_result = 'electric-boiler'
    item.order = 'b[steam-power]-a[electric-boiler]'
@@ -294,7 +327,7 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-BOILER'].value
    item.localised_description = {'description.electric-boiler'}
    data:extend({item})

-    local entity = table.deepcopy(data.raw['boiler']['boiler'])
+    entity = table.deepcopy(data.raw['boiler']['boiler'])
    entity.name = 'electric-boiler'
    entity.energy_consumption = '7200kW'
    entity.buffer_capacity = '14400kJ'
@@ -340,9 +373,7 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-BOILER'].value
    -- electric boiler
    data.raw['boiler']['boiler'].fast_replaceable_group = 'boiler'
    data.raw['boiler']['electric-boiler'].fast_replaceable_group = data.raw['boiler']['electric-boiler'].fast_replaceable_group
-end

-if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-CHEST'].value then
    local chests = {
        'steel-chest',
        'passive-provider-chest',
@@ -353,8 +384,7 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-CHEST'].value t
    }

    for _, c in pairs(chests) do
-        local item = table.deepcopy(data.raw['item'][c])
-        local entity
+        item = table.deepcopy(data.raw['item'][c])

        if c == 'steel-chest' then
            entity = table.deepcopy(data.raw['container'][c])
@@ -404,8 +434,53 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-CHEST'].value t
        table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-' .. r .. '-chest'})
    end
 end
-if settings.startup['PHI-EN'].value and settings.startup['PHI-EN-POWER-TIER'].value > 1 then
-    data.raw['fluid']['steam'].max_temperature = 5000
+
+if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-HIDDEN'].value then
+    local item = table.deepcopy(data.raw['item']['linked-chest'])
+    item.supgroup = 'storage'
+    item.order = 'a[items]-d[linked-chest]'
+    data:extend({item})
+
+    local entity = table.deepcopy(data.raw['linked-container']['linked-chest'])
+    entity.circuit_wire_connection_point = data.raw['container']['steel-chest'].circuit_wire_connection_point
+    entity.circuit_connector_sprites = data.raw['container']['steel-chest'].circuit_connector_sprites
+    entity.circuit_wire_max_distance = data.raw['container']['steel-chest'].circuit_wire_max_distance
+    entity.inventory_type = 'with_filters_and_bar'
+    entity.inventory_size = 48
+    entity.gui_mode = 'all'
+    entity.se_allow_in_space = true
+    data:extend({entity})
+
+    data:extend({{
+        type = 'recipe',
+        name = 'linked-chest',
+        energy_required = 2,
+        enabled = false,
+        ingredients = {{type='item', name='steel-chest', amount=1}},
+        results = {{type='item', name='linked-chest', amount=1}},
+        main_product = 'linked-chest'
+    }})
+
+    table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='linked-chest'})
+
+    data.raw.recipe['loader'].hidden = false
+    data.raw.recipe['fast-loader'].hidden = false
+    data.raw.recipe['express-loader'].hidden = false
+
+    table.insert(data.raw.technology['logistics'].effects, {type='unlock-recipe', recipe='loader'})
+    table.insert(data.raw.technology['logistics-2'].effects, {type='unlock-recipe', recipe='fast-loader'})
+    table.insert(data.raw.technology['logistics-3'].effects, {type='unlock-recipe', recipe='express-loader'})
+
+    if mods['space-age'] then
+        data.raw.recipe['turbo-loader'].hidden = false
+        table.insert(data.raw.technology['turbo-transport-belt'].effects, {type='unlock-recipe', recipe='turbo-loader'})
+    end
+end
+
+if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-EFFCY'].value then
+    data.raw['module']['efficiency-module'].effect = {consumption=-0.4, pollution=-0.4}
+    data.raw['module']['efficiency-module-2'].effect = {consumption=-0.8, pollution=-0.8}
+    data.raw['module']['efficiency-module-3'].effect = {consumption=-1.2, pollution=-1.2}
 end

 if settings.startup['PHI-MI'].value and (settings.startup['PHI-MI-LANDFILL'].value ~= 50) then
@@ -416,195 +491,6 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-NUCLEAR'].value
    data.raw['reactor']['nuclear-reactor'].scale_energy_usage = true
 end

--[[
-if settings.startup['PHI-EQ'].value and settings.startup['PHI-EQ-ARMOR'].value then
-    data:extend({
-        {
-            type = 'equipment-grid',
-            name = 'equipment-grid-14x14',
-            width = 14,
-            height = 14,
-            equipment_categories = {'armor'}
-        },
-        {
-            type = 'armor',
-            name = 'power-armor-mk3',
-            icons = {
-                {
-                    icon = '__base__/graphics/icons/power-armor-mk2.png',
-                    tint = items['tint'][2],
-                    icon_size = 64,
-                    icon_mipmaps = 4
-                }
-            },
-            resistances = {
-                {
-                    type = 'physical',
-                    decrease = 20,
-                    percent = 50
-                },
-                {
-                    type = 'acid',
-                    decrease = 20,
-                    percent = 80
-                },
-                {
-                    type = 'explosion',
-                    decrease = 70,
-                    percent = 60
-                },
-                {
-                    type = 'fire',
-                    decrease = 20,
-                    percent = 80
-                },
-                {
-                    type = 'laser',
-                    decrease = 20,
-                    percent = 50
-                },
-                {
-                    type = 'electric',
-                    decrease = 20,
-                    percent = 50
-                },
-                {
-                    type = 'impact',
-                    decrease = 20,
-                    percent = 50
-                },
-                {
-                    type = 'poison',
-                    decrease = 20,
-                    percent = 50
-                }
-            },
-            subgroup = 'armor',
-            order = 'eb[power-armor-mk3]',
-            stack_size = 1,
-            infinite = true,
-            equipment_grid = 'equipment-grid-14x14',
-            inventory_size_bonus = 40,
-            open_sound = {filename =  '__base__/sound/armor-open.ogg', volume = 1},
-            close_sound = {filename = '__base__/sound/armor-close.ogg', volume = 1},
-            localised_name = {'phi-cl.combine-gen', {'name.power-armor-mk2'}, '3'},
-            localised_description = {'description.power-armor-mk2'}
-        }
-    })
-
-    data:extend({{
-        type = 'recipe',
-        name = 'power-armor-mk3',
-        energy_required = 2,
-        enabled = false,
-        ingredients = {{type='item', name='power-armor-mk2', amount=2}},
-        results = {{type='item', name='power-armor-mk3', amount=1}},
-        main_product = 'power-armor-mk3',
-        localised_name = {'phi-cl.combine-gen', {'name.power-armor-mk2'}, '3'},
-        localised_description = {'description.power-armor-mk2'}
-    }})
-
-    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
-                    animation.armors[#animation.armors + 1] = 'power-armor-mk3'
-                    break
-                end
-            end
-        end
-    end
-
-    table.insert(data.raw.technology['power-armor-mk2'].effects, {type='unlock-recipe', recipe='power-armor-mk3'})
-end
-]]
-
-if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-FLUID'].value then
-    data:extend({{type='recipe-category', name='fluid'}})
-
-    local item = table.deepcopy(data.raw['item']['offshore-pump'])
-    item.name = 'super-pump'
-    item.place_result = 'super-pump'
-    item.order = 'b[fluids]-a[super-pump]-o'
-
-    item.icons = {
-        {
-            icon = '__base__/graphics/icons/offshore-pump.png',
-            tint = items['tint'][2],
-            icon_size = 64,
-            icon_mipmaps = 4
-        }
-    }
-
-    item.icon = nil
-    item.icon_size = nil
-    item.icon_mipmaps = nil
-    item.localised_name = {'name.super-pump'}
-    item.localised_description = item.localised_description
-    data:extend({item})
-
-    local entity = table.deepcopy(data.raw['offshore-pump']['offshore-pump'])
-    entity.name = 'super-pump'
-    entity.minable.result = 'super-pump'
-    entity.type = 'assembling-machine'
-    entity.crafting_categories = {'fluid'}
-    entity.crafting_speed = 1
-    entity.energy_source = {type = 'void'}
-    entity.fluid_box.volume = 4000
-    entity.fluid_boxes = {table.deepcopy(entity.fluid_box)}
-    entity.fluid_box = nil
-    entity.fluid_boxes_off_when_no_fluid_recipe = false
-    entity.effect_receiver = {uses_module_effects=false, uses_beacon_effects=false}
-    entity.allowed_effects = {'consumption'}
-    entity.collision_mask = nil
-    entity.tile_buildability_rules = nil
-    entity.fluid_source_offset = nil
-    entity.localised_name = {'name.super-pump'}
-    entity.localised_description = entity.localised_description
-    data:extend({entity})
-
-    data:extend({{
-        type = 'recipe',
-        name = 'super-pump',
-        energy_required = 2,
-        enabled = true,
-        ingredients = {{type='item', name='electronic-circuit', amount=2}, {type='item', name='pipe', amount=1}, {type='item', name='iron-gear-wheel', amount=1}},
-        results = {{type='item', name='super-pump', amount=1}},
-        main_product = 'super-pump',
-        localised_name = {'name.super-pump'},
-        localised_description = nil
-    }})
-
-    for _, v in pairs(data.raw.fluid) do
-        if v.subgroup == 'fluid' then
-            local temp
-
-            if v.max_temperature then
-                temp = v.max_temperature
-
-            else
-                temp = v.default_temperature
-            end
-
-            data:extend({{
-                type = 'recipe',
-                name = v.name,
-                category = 'fluid',
-                energy_required = 1,
-                enabled = true,
-                ingredients = {},
-                results = {{type='fluid', name=v.name, amount=16000, temperature=temp}},
-                main_product = v.name,
-                hide_from_player_crafting = true,
-                allow_productivity = false,
-                crafting_machine_tint = {primary=v.flow_color},
-                localised_name = v.localised_name,
-                localised_description = nil
-            }})
-        end
-    end
-end
-
 for _, v in pairs(items['item']) do
    if (v.stage == file_stage) and v.enabled and (v.max >= v.min) then
        v.category = 'item'
--- a/PHI-CL/locale/en/locale.cfg
+++ b/PHI-CL/locale/en/locale.cfg
@@ -113,23 +113,17 @@ PHI-MI-LANDFILL=MI1 Landfill requirement
 PHI-MI-EFFCY=MI2 Efficiency module efficiency
 PHI-MI-NUCLEAR=MI3 Nuclear adjustable output
 PHI-MI-BOILER=MI4 Electric boiler
-PHI-MI-CHEST=MI5 Basic chest
-PHI-MI-REPAIR=MI6 Repair efficiency
-PHI-MI-PIPE=MI7 Pipe efficiency
-PHI-MI-ROBOT=MI8 Robot efficiency
-PHI-MI-TRAIN=MI9 Train efficiency
-PHI-MI-ARTILLERY=MI10 Artillery range
+PHI-MI-PIPE=MI5 Pipe efficiency
+PHI-MI-ROBOT=MI6 Robot efficiency
+PHI-MI-TRAIN=MI7 Train efficiency
+PHI-MI-ARTILLERY=MI8 Artillery range

 PHI-CT=CT Creative testing tools
-PHI-CT-FLUID=CT1 Fluid
-PHI-CT-RADAR=CT2 Radar
-PHI-CT-TILE=CT3 World tile
-PHI-CT-TILE-CHOICE=CT4 Tile choice
-PHI-CT-TRASH=CT5 Trash chest
-PHI-CT-LINKED=CT6 Linked chest
-PHI-CT-LOADER=CT7 Loader enable
-PHI-CT-ENERGY=CT8 Energy
-PHI-CT-TRAIN=CT9 Electric train
+PHI-CT-TOOL=CT1 Tool
+PHI-CT-UTILITY=CT2 Utility
+PHI-CT-HIDDEN=CT3 Hidden
+PHI-CT-TILE=CT4 World tile
+PHI-CT-TILE-CHOICE=CT5 Tile choice

 [mod-setting-description]
 PHI-EN-SOLAR-TIER=Default 8 ; Disable 1
@@ -145,7 +139,7 @@ PHI-EQ-DEFENSE-TIER=Default 8 ; Disable 1
 PHI-EQ-TOOL-TIER=Default 8 ; Disable 1
 PHI-EQ-UTILITY-TIER=Default 2 ; Disable 1

-PHI-MI-LANDFILL=Default 20
+PHI-MI-LANDFILL=Default 50
 PHI-MI-REPAIR=Default 1
 PHI-MI-PIPE=Default 1
 PHI-MI-ROBOT=Default 1
--- a/PHI-CL/locale/ja/locale.cfg
+++ b/PHI-CL/locale/ja/locale.cfg
@@ -111,24 +111,18 @@ PHI-MI=MI その他の変更
 PHI-MI-LANDFILL=MI1 埋立地要件
 PHI-MI-EFFCY=MI2 エネルギー効率モジュール効率
 PHI-MI-NUCLEAR=MI3 原子炉出力の調整可能
-PHI-MI-BOILER=MI4 電気ボイラー
-PHI-MI-CHEST=MI5 基本的な貯蔵チェスト
-PHI-MI-REPAIR=MI6 リペア効率
-PHI-MI-PIPE=MI7 パイプ効率
-PHI-MI-ROBOT=MI8 ロボット効率
-PHI-MI-TRAIN=MI9 列車効率
-PHI-MI-ARTILLERY=MI10 長距離砲射程
+PHI-MI-REPAIR=MI4 リペア効率
+PHI-MI-PIPE=MI5 パイプ効率
+PHI-MI-ROBOT=MI6 ロボット効率
+PHI-MI-TRAIN=MI7 列車効率
+PHI-MI-ARTILLERY=MI8 長距離砲射程

 PHI-CT=CT クリエイティブテストツール
-PHI-CT-FLUID=CT1 流体
-PHI-CT-RADAR=CT2 レーダー
-PHI-CT-TILE=CT3 ワールドタイル
-PHI-CT-TILE-CHOICE=CT4 ドタイル選択
-PHI-CT-TRASH=CT5 ごみチェスト
-PHI-CT-LINKED=CT6 リンクされたチェスト
-PHI-CT-LOADER=CT7 ローダーを有効にする
-PHI-CT-ENERGY=CT8 エネルギー
-PHI-CT-TRAIN=CT9 電車
+PHI-CT-TOOL=CT1 ツール
+PHI-CT-UTILITY=CT2 ユーティリティ
+PHI-CT-HIDDEN=CT3 非表示
+PHI-CT-TILE=CT4 ワールドタイル
+PHI-CT-TILE-CHOICE=CT5 ドタイル選択

 [mod-setting-description]
 PHI-EN-SOLAR-TIER=デフォルト 8 ; 止める 1
@@ -144,7 +138,7 @@ PHI-EQ-DEFENSE-TIER=デフォルト 8 ; 止める 1
 PHI-EQ-TOOL-TIER=デフォルト 8 ; 止める 1
 PHI-EQ-UTILITY-TIER=デフォルト 2 ; 止める 1

-PHI-MI-LANDFILL=デフォルト 20
+PHI-MI-LANDFILL=デフォルト 50
 PHI-MI-REPAIR=デフォルト 1
 PHI-MI-PIPE=デフォルト 1
 PHI-MI-ROBOT=デフォルト 1
--- a/PHI-CL/locale/zh-CN/locale.cfg
+++ b/PHI-CL/locale/zh-CN/locale.cfg
@@ -111,24 +111,18 @@ PHI-MI=MI 雜項小變化
 PHI-MI-LANDFILL=MI1 人造陸地需求
 PHI-MI-EFFCY=MI2 節能組件效率
 PHI-MI-NUCLEAR=MI3 核能反應爐可調輸出
-PHI-MI-BOILER=MI4 電鍋爐
-PHI-MI-CHEST=MI5 基本的儲藏箱
-PHI-MI-REPAIR=MI6 維修效率
-PHI-MI-PIPE=MI7 水管效率
-PHI-MI-ROBOT=MI8 無人機效率
-PHI-MI-TRAIN=MI9 火車效率
-PHI-MI-ARTILLERY=MI10 火炮炮彈射程
+PHI-MI-REPAIR=MI4 維修效率
+PHI-MI-PIPE=MI5 水管效率
+PHI-MI-ROBOT=MI6 無人機效率
+PHI-MI-TRAIN=MI7 火車效率
+PHI-MI-ARTILLERY=MI8 火炮炮彈射程

 PHI-CT=CT 創意測試工具
-PHI-CT-FLUID=CT1 液體
-PHI-CT-RADAR=CT2 雷達
-PHI-CT-TILE=CT3 世界地磚
-PHI-CT-TILE-CHOICE=CT4 地磚選擇
-PHI-CT-TRASH=CT5 垃圾箱
-PHI-CT-LINKED=CT6 連結箱
-PHI-CT-LOADER=CT7 裝卸機啟用
-PHI-CT-ENERGY=CT8 能量
-PHI-CT-TRAIN=CT9 電動火車
+PHI-CT-TOOL=CT1 工具
+PHI-CT-UTILITY=CT2 雜項
+PHI-CT-HIDDEN=CT3 隱藏
+PHI-CT-TILE=CT4 世界地磚
+PHI-CT-TILE-CHOICE=CT5 地磚選擇

 [mod-setting-description]
 PHI-EN-SOLAR-TIER=預設 8 ; 停用 1
@@ -144,7 +138,7 @@ PHI-EQ-DEFENSE-TIER=預設 8 ; 停用 1
 PHI-EQ-TOOL-TIER=預設 8 ; 停用 1
 PHI-EQ-UTILITY-TIER=預設 2 ; 停用 1

-PHI-MI-LANDFILL=預設 20
+PHI-MI-LANDFILL=預設 50
 PHI-MI-REPAIR=預設 1
 PHI-MI-PIPE=預設 1
 PHI-MI-ROBOT=預設 1
--- a/PHI-CL/locale/zh-TW/locale.cfg
+++ b/PHI-CL/locale/zh-TW/locale.cfg
@@ -111,24 +111,18 @@ PHI-MI=MI 雜項小變化
 PHI-MI-LANDFILL=MI1 人造陸地需求
 PHI-MI-EFFCY=MI2 節能組件效率
 PHI-MI-NUCLEAR=MI3 核能反應爐可調輸出
-PHI-MI-BOILER=MI4 電鍋爐
-PHI-MI-CHEST=MI5 基本的儲藏箱
-PHI-MI-REPAIR=MI6 維修效率
-PHI-MI-PIPE=MI7 水管效率
-PHI-MI-ROBOT=MI8 無人機效率
-PHI-MI-TRAIN=MI9 火車效率
-PHI-MI-ARTILLERY=MI10 火炮炮彈射程
+PHI-MI-REPAIR=MI4 維修效率
+PHI-MI-PIPE=MI5 水管效率
+PHI-MI-ROBOT=MI6 無人機效率
+PHI-MI-TRAIN=MI7 火車效率
+PHI-MI-ARTILLERY=MI8 火炮炮彈射程

 PHI-CT=CT 創意測試工具
-PHI-CT-FLUID=CT1 液體
-PHI-CT-RADAR=CT2 雷達
-PHI-CT-TILE=CT3 世界地磚
-PHI-CT-TILE-CHOICE=CT4 地磚選擇
-PHI-CT-TRASH=CT5 垃圾箱
-PHI-CT-LINKED=CT6 連結箱
-PHI-CT-LOADER=CT7 裝卸機啟用
-PHI-CT-ENERGY=CT8 能量
-PHI-CT-TRAIN=CT9 電動火車
+PHI-CT-TOOL=CT1 工具
+PHI-CT-UTILITY=CT2 雜項
+PHI-CT-HIDDEN=CT3 隱藏
+PHI-CT-TILE=CT4 世界地磚
+PHI-CT-TILE-CHOICE=CT5 地磚選擇

 [mod-setting-description]
 PHI-EN-SOLAR-TIER=預設 8 ; 停用 1
@@ -144,7 +138,7 @@ PHI-EQ-DEFENSE-TIER=預設 8 ; 停用 1
 PHI-EQ-TOOL-TIER=預設 8 ; 停用 1
 PHI-EQ-UTILITY-TIER=預設 2 ; 停用 1

-PHI-MI-LANDFILL=預設 20
+PHI-MI-LANDFILL=預設 50
 PHI-MI-REPAIR=預設 1
 PHI-MI-PIPE=預設 1
 PHI-MI-ROBOT=預設 1
--- a/PHI-CL/migrations/migrations.lua
+++ b/PHI-CL/migrations/migrations.lua
@@ -43,40 +43,28 @@ for _, force in pairs(game.forces) do
        end
    end

-    if technologies['power-armor-mk2'].researched then
+    if technologies['power-armor-mk2'] and technologies['power-armor-mk2'].researched then
        if settings.startup['PHI-EQ'].value and settings.startup['PHI-EQ-ARMOR'].value then
            recipes['power-armor-mk3'].enabled = true
            recipes['power-armor-mk3'].reload()
        end
    end

-    if technologies['steel-processing'].researched then
-        if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-CHEST'].value then
+    if settings.startup['PHI-CT'].value then
+        if settings.startup['PHI-CT-UTILITY'].value then
+            if technologies['steel-processing'] and technologies['steel-processing'].researched then
                recipes['basic-steel-chest'].enabled = true
                recipes['basic-steel-chest'].reload()
            end
-    end

-    if technologies['construction-robotics'].researched then
-        if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-CHEST'].value then
+            if (technologies['construction-robotics'] and technologies['construction-robotics'].researched) or (technologies['logistic-robotics'] and technologies['logistic-robotics'].researched) then
                recipes['basic-logistic-chest-passive-provider'].enabled = true
                recipes['basic-logistic-chest-passive-provider'].reload()
                recipes['basic-logistic-chest-storage'].enabled = true
                recipes['basic-logistic-chest-storage'].reload()
            end
-    end

-    if technologies['logistic-robotics'].researched then
-        if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-CHEST'].value then
-            recipes['basic-logistic-chest-passive-provider'].enabled = true
-            recipes['basic-logistic-chest-passive-provider'].reload()
-            recipes['basic-logistic-chest-storage'].enabled = true
-            recipes['basic-logistic-chest-storage'].reload()
-        end
-    end
-
-    if technologies['logistic-system'].researched then
-        if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-CHEST'].value then
+            if technologies['logistic-system'] and technologies['logistic-system'].researched then
                recipes['basic-logistic-chest-active-provider'].enabled = true
                recipes['basic-logistic-chest-active-provider'].reload()
                recipes['basic-logistic-chest-buffer'].enabled = true
@@ -86,78 +74,45 @@ for _, force in pairs(game.forces) do
            end
        end

-    if settings.startup['PHI-CT'].value then
-        if settings.startup['PHI-CT-RECIPE'].value then
-            recipes['wood-production'].enabled = true
-            recipes['wood-production'].reload()
-            recipes['fish-production'].enabled = true
-            recipes['fish-production'].reload()
-        end
+        if settings.startup['PHI-CT-TOOL'].value then
+            recipes['super-pump'].enabled = true
+            recipes['super-pump'].reload()

-        if settings.startup['PHI-CT-OIL'].value then
-            recipes['oil-pump'].enabled = true
-            recipes['oil-pump'].reload()
-        end
-
-        if settings.startup['PHI-CT-RADAR'].value then
            recipes['super-radar'].enabled = true
            recipes['super-radar'].reload()
+
+            if technologies['electric-energy-accumulators'] and technologies['electric-energy-accumulators'].researched then
+                recipes['passive-energy-void'].enabled = true
+                recipes['passive-energy-void'].reload()
+            end
        end

-        if settings.startup['PHI-CT-TRASH'].value then
+        if settings.startup['PHI-CT-UTILITY'].value then
            recipes['trash-chest'].enabled = true
            recipes['trash-chest'].reload()
            recipes['trash-pipe'].enabled = true
            recipes['trash-pipe'].reload()
        end

-        if settings.startup['PHI-CT-MINER'].value then
-            recipes['large-area-electric-mining-drill'].enabled = true
-            recipes['large-area-electric-mining-drill'].reload()
-        end
-
-        if settings.startup['PHI-CT-LOADER'].value then
-            if technologies['logistics'].researched then
+        if settings.startup['PHI-CT-HIDDEN'].value then
+            if technologies['logistics'] and technologies['logistics'].researched then
                recipes['loader'].enabled = true
                recipes['loader'].reload()
            end

-            if technologies['logistics-2'].researched then
+            if technologies['logistics-2'] and technologies['logistics-2'].researched then
                recipes['fast-loader'].enabled = true
                recipes['fast-loader'].reload()
            end

-            if technologies['logistics-3'].researched then
+            if technologies['logistics-3'] and technologies['logistics-3'].researched then
                recipes['express-loader'].enabled = true
                recipes['express-loader'].reload()
            end
-        end

-        if settings.startup['PHI-CT-ENERGY'].value then
-            if technologies['electric-energy-accumulators'].researched then
-                recipes['passive-energy-void'].enabled = true
-                recipes['passive-energy-void'].reload()
-            end
-        end
-    end
-
-    if settings.startup['PHI-RS'].value then
-        recipes['electric-filter-furnace'].enabled = true
-        recipes['electric-filter-furnace'].reload()
-    end
-
-    if settings.startup['PHI-MB'].value then
-        recipes['satellite-2'].enabled = true
-        recipes['satellite-2'].reload()
-        recipes['satellite-3'].enabled = true
-        recipes['satellite-3'].reload()
-
-        if script.active_mods['space-exploration'] then
-            if technologies['se-core-miner'].researched then
-                for i=2, settings.startup['PHI-MB-MINING-TIER'].value do
-                    recipes['se-core-miner-' .. i].enabled = true
-                    recipes['se-core-miner-' .. i].reload()
-                end
+            if technologies['turbo-transport-belt'] and technologies['turbo-transport-belt'].researched then
+                recipes['turbo-loader'].enabled = true
+                recipes['turbo-loader'].reload()
            end
        end
    end
--- a/PHI-CL/note.lua
+++ b/PHI-CL/note.lua
@@ -659,6 +659,107 @@
        end

 ** DATA
+if settings.startup['PHI-EQ'].value and settings.startup['PHI-EQ-ARMOR'].value then
+    data:extend({
+        {
+            type = 'equipment-grid',
+            name = 'equipment-grid-14x14',
+            width = 14,
+            height = 14,
+            equipment_categories = {'armor'}
+        },
+        {
+            type = 'armor',
+            name = 'power-armor-mk3',
+            icons = {
+                {
+                    icon = '__base__/graphics/icons/power-armor-mk2.png',
+                    tint = items['tint'][2],
+                    icon_size = 64,
+                    icon_mipmaps = 4
+                }
+            },
+            resistances = {
+                {
+                    type = 'physical',
+                    decrease = 20,
+                    percent = 50
+                },
+                {
+                    type = 'acid',
+                    decrease = 20,
+                    percent = 80
+                },
+                {
+                    type = 'explosion',
+                    decrease = 70,
+                    percent = 60
+                },
+                {
+                    type = 'fire',
+                    decrease = 20,
+                    percent = 80
+                },
+                {
+                    type = 'laser',
+                    decrease = 20,
+                    percent = 50
+                },
+                {
+                    type = 'electric',
+                    decrease = 20,
+                    percent = 50
+                },
+                {
+                    type = 'impact',
+                    decrease = 20,
+                    percent = 50
+                },
+                {
+                    type = 'poison',
+                    decrease = 20,
+                    percent = 50
+                }
+            },
+            subgroup = 'armor',
+            order = 'eb[power-armor-mk3]',
+            stack_size = 1,
+            infinite = true,
+            equipment_grid = 'equipment-grid-14x14',
+            inventory_size_bonus = 40,
+            open_sound = {filename =  '__base__/sound/armor-open.ogg', volume = 1},
+            close_sound = {filename = '__base__/sound/armor-close.ogg', volume = 1},
+            localised_name = {'phi-cl.combine-gen', {'name.power-armor-mk2'}, '3'},
+            localised_description = {'description.power-armor-mk2'}
+        }
+    })
+
+    data:extend({{
+        type = 'recipe',
+        name = 'power-armor-mk3',
+        energy_required = 2,
+        enabled = false,
+        ingredients = {{type='item', name='power-armor-mk2', amount=2}},
+        results = {{type='item', name='power-armor-mk3', amount=1}},
+        main_product = 'power-armor-mk3',
+        localised_name = {'phi-cl.combine-gen', {'name.power-armor-mk2'}, '3'},
+        localised_description = {'description.power-armor-mk2'}
+    }})
+
+    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
+                    animation.armors[#animation.armors + 1] = 'power-armor-mk3'
+                    break
+                end
+            end
+        end
+    end
+
+    table.insert(data.raw.technology['power-armor-mk2'].effects, {type='unlock-recipe', recipe='power-armor-mk3'})
+end
+
 if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRAIN'].value then
    local item = table.deepcopy(data.raw['item']['used-up-uranium-fuel-cell'])
    item.name = 'empty-train-battery'
@@ -930,6 +1031,24 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TILE'].value th
 	}
 end

+for _, c in pairs(data.raw) do
+    for _, t in pairs(c) do
+        if t.surface_conditions then
+            t.surface_conditions = nil
+        end
+    end
+end
+
+** MIGRATION
+        if script.active_mods['space-exploration'] then
+            if technologies['se-core-miner'].researched then
+                for i=2, settings.startup['PHI-MB-MINING-TIER'].value do
+                    recipes['se-core-miner-' .. i].enabled = true
+                    recipes['se-core-miner-' .. i].reload()
+                end
+            end
+        end
+
 ** SETTING
   {
    type = 'int-setting',
@@ -970,14 +1089,14 @@ end
    name = 'PHI-CT-TILE',
    setting_type = 'startup',
    default_value = true,
-    order = 'J03'
+    order = 'J04'
  }, {
    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 = 'J04'
+    order = 'J05'
  }, 
  
        "? aai-industry >= 0.5.0",
--- a/PHI-CL/settings.lua
+++ b/PHI-CL/settings.lua
@@ -112,18 +112,6 @@ data:extend({
    setting_type = 'startup',
    default_value = false,
    order = 'E03'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-MI-BOILER',
-    setting_type = 'startup',
-    default_value = false,
-    order = 'E04'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-MI-CHEST',
-    setting_type = 'startup',
-    default_value = false,
-    order = 'E05'
  }, {
    type = 'bool-setting',
    name = 'PHI-CT',
@@ -132,45 +120,21 @@ data:extend({
    order = 'J00'
  },  {
    type = 'bool-setting',
-    name = 'PHI-CT-FLUID',
+    name = 'PHI-CT-TOOL',
    setting_type = 'startup',
    default_value = true,
    order = 'J01'
  }, {
    type = 'bool-setting',
-    name = 'PHI-CT-RADAR',
+    name = 'PHI-CT-UTILITY',
    setting_type = 'startup',
    default_value = true,
    order = 'J02'
  }, {
    type = 'bool-setting',
-    name = 'PHI-CT-TRASH',
+    name = 'PHI-CT-HIDDEN',
    setting_type = 'startup',
    default_value = true,
-    order = 'J05'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-CT-LINKED',
-    setting_type = 'startup',
-    default_value = true,
-    order = 'J06'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-CT-LOADER',
-    setting_type = 'startup',
-    default_value = true,
-    order = 'J07'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-CT-ENERGY',
-    setting_type = 'startup',
-    default_value = true,
-    order = 'J08'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-CT-TRAIN',
-    setting_type = 'startup',
-    default_value = true,
-    order = 'J09'
+    order = 'J03'
  }
 })