.

PHI-CL/data-final-fixes.lua

@@ -2,92 +2,6 @@ local items = require 'config'
 local main = require 'main'
 local file_stage = 3
 
-data.raw['utility-constants'].default.zoom_to_world_effect_strength = 0
-data.raw['utility-constants'].default.zoom_to_world_can_use_nightvision = true
-data.raw['utility-constants'].default.train_inactivity_wait_condition_default = 60
-
-data.raw['arithmetic-combinator']['arithmetic-combinator'].energy_source.usage_priority = 'primary-input'
-data.raw['decider-combinator']['decider-combinator'].energy_source.usage_priority = 'primary-input'
-
-data.raw['active-defense-equipment']['discharge-defense-equipment'].automatic = true
-
--- data.raw['utility-constants'].select_group_row_count
-
-for _, t in pairs(data.raw['tree']) do
-	t.collision_box = {{-0.05, -0.05}, {0.05, 0.05}}
-end
-
-for _,name in pairs({'furnace', 'lab', 'beacon'}) do
-	local entities = {}
-
-	for _, entity in pairs(data.raw[name]) do
-		table.insert(entities, entity.name)
-	end
-
-	for _, entity in pairs(data.raw[name]) do
-		entity.additional_pastable_entities = entities
-	end
-end
-
-if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-ARTILLERY'].value then
-	for _, t in pairs({data.raw['artillery-turret'], data.raw['artillery-wagon']}) do
-		for _, v in pairs(t) do
-			v.manual_range_modifier = 1
-		end
-	end
-
-	-- data.raw['artillery-projectile']['artillery-projectile'].reveal_map = false
-end
-
-if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TILE'].value then
-	for _, tile in pairs (data.raw.tile) do
-		tile.autoplace = nil
-	end
-
-	data.raw.tile[settings.startup['PHI-CT-TILE-CHOICE'].value].autoplace = {}
-
-	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
-
-if settings.startup['PHI-RS'].value then
-    data.raw['assembling-machine']['electric-filter-furnace'].crafting_categories = {}
-
-    for i=1, #data.raw['furnace']['electric-furnace'].crafting_categories do
-        table.insert(data.raw['assembling-machine']['electric-filter-furnace'].crafting_categories, data.raw['furnace']['electric-furnace'].crafting_categories[i])
-    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'

PHI-CL/data.lua

@@ -0,0 +1,599 @@
+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-STEAM-TIER'].value and settings.startup['PHI-EN-NUCLEAR-TIER'].value then
+    local ml = math.max(settings.startup['PHI-EN-SOLAR-TIER'].value, settings.startup['PHI-EN-STEAM-TIER'].value, settings.startup['PHI-EN-NUCLEAR-TIER'].value)
+
+    for i=1, 7 do
+        local tn = 'compound-energy-' .. i
+        local prereq
+        local e = true
+
+        if i > 1 then
+            prereq = {'compound-energy-' .. (i - 1)}
+
+        else
+            prereq = {'solar-energy', 'advanced-circuit', 'electric-energy-accumulators'}
+        end
+
+        if i > ml then
+            e = false
+        end
+
+        data:extend({{
+            type = 'technology',
+            name = tn,
+            enabled = e,
+            prerequisites = prereq,
+            effects = {},
+            unit = {
+                count = math.floor(100 * (i ^ 1.6)),
+                ingredients = {
+                    {'automation-science-pack', 1},
+                    {'logistic-science-pack', 1}
+                },
+                time = 60
+            },
+            icons = {
+                {
+                    icon = '__base__/graphics/technology/solar-energy.png',
+                    icon_size = 256,
+                    tint = items['tint'][i]
+                }
+            },
+            order = 'a-h-' .. i,
+            localised_name = {'phi-cl.combine', {'technology-name.compound-energy'}, tostring(i)},
+            localised_description = {'technology-description.compound-energy'}
+        }})
+    end
+end
+
+if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-RADAR'].value then
+    local item = table.deepcopy(data.raw['item']['radar'])
+    item.name = 'super-radar'
+    item.place_result = 'super-radar'
+    item.order = 'd[radar]-b[radar]'
+
+    item.icons = {
+        {
+            icon = item.icon or '__base__/graphics/icons/radar.png',
+            tint = items['tint'][8],
+            icon_size = item.icon_size or 64,
+            icon_mipmaps = item.icon_mipmaps or 4
+        }
+    }
+
+    item.icon = nil
+    item.icon_size = nil
+    item.icon_mipmaps = nil
+    item.localised_name = {'name.super-radar'}
+    item.localised_description = {'description.super-radar'}
+    data:extend({item})
+
+    local entity = table.deepcopy(data.raw['radar']['radar'])
+    entity.name = 'super-radar'
+    entity.minable.result = 'super-radar'
+    entity.max_distance_of_sector_revealed = 35
+    entity.max_distance_of_nearby_sector_revealed = 35
+    entity.pictures.layers[1].tint = items['tint'][8]
+    entity.localised_name = {'name.super-radar'}
+    entity.localised_description = {'description.super-radar'}
+    data:extend({entity})
+
+    data:extend({{
+        type = 'recipe',
+        name = 'super-radar',
+        energy_required = 2,
+        enabled = true,
+        ingredients = {{type='item', name='electronic-circuit', amount=5}, {type='item', name='iron-gear-wheel', amount=5}, {type='item', name='iron-plate', amount=10}},
+        results = {{type='item', name='super-radar', amount=1}},
+        main_product = 'super-radar',
+        localised_name = {'name.super-radar'},
+        localised_description = {'description.super-radar'}
+    }})
+end
+
+if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRASH'].value then
+    local item = table.deepcopy(data.raw['item']['steel-chest'])
+    item.name = 'trash-chest'
+    item.place_result = 'trash-chest'
+    item.order = 'b[storage]-h[trash-chest]'
+
+    item.icons = {
+        {
+            icon = item.icon or '__base__/graphics/icons/steel-chest.png',
+            tint = items['tint'][8],
+            icon_size = item.icon_size or 64,
+            icon_mipmaps = item.icon_mipmaps or 4
+        }
+    }
+
+    item.icon = nil
+    item.icon_size = nil
+    item.icon_mipmaps = nil
+    item.localised_name = {'name.trash-chest'}
+    item.localised_description = {'description.trash-chest'}
+    data:extend({item})
+
+    local entity = table.deepcopy(data.raw['container']['steel-chest'])
+    entity.name = 'trash-chest'
+    entity.minable.result = 'trash-chest'
+    entity.inventory_type = 'with_filters_and_bar'
+    entity.inventory_size = 1
+    entity.type = 'infinity-container'
+    entity.gui_mode = 'none'
+    entity.erase_contents_when_mined = true
+    entity.logistic_mode = nil
+    entity.next_upgrade = nil
+    entity.picture.layers[1].tint = items['tint'][8]
+    entity.localised_name = {'name.trash-chest'}
+    entity.localised_description = {'description.trash-chest'}
+    data:extend({entity})
+
+    data:extend({{
+        type = 'recipe',
+        name = 'trash-chest',
+        energy_required = 2,
+        enabled = false,
+        ingredients = {{type='item', name='steel-chest', amount=1}},
+        results = {{type='item', name='trash-chest', amount=1}},
+        main_product = 'trash-chest',
+        localised_name = {'name.trash-chest'},
+        localised_description = {'description.trash-chest'}
+    }})
+
+    table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='trash-chest'})
+
+    item = table.deepcopy(data.raw['item']['pipe'])
+    item.name = 'trash-pipe'
+    item.place_result = 'trash-pipe'
+    item.order = 'a[pipe]-c[trash-pipe]'
+
+    item.icons = {
+        {
+            icon = item.icon or '__base__/graphics/icons/pipe.png',
+            tint = items['tint'][8],
+            icon_size = item.icon_size or 64,
+            icon_mipmaps = item.icon_mipmaps or 4
+        }
+    }
+
+    item.icon = nil
+    item.icon_size = nil
+    item.icon_mipmaps = nil
+    item.localised_name = {'name.trash-pipe'}
+    item.localised_description = {'description.trash-pipe'}
+    data:extend({item})
+
+    entity = table.deepcopy(data.raw['pipe']['pipe'])
+    entity.name = 'trash-pipe'
+    entity.minable.result = 'trash-pipe'
+    entity.inventory_size = 1
+    entity.type = 'infinity-pipe'
+    entity.gui_mode = 'none'
+    entity.erase_contents_when_mined = true
+    entity.next_upgrade = nil
+
+    for _, v in pairs(entity.pictures) do
+        v.tint = items['tint'][8]
+
+        if v.hr_version then
+            v.hr_version.tint = items['tint'][8]
+        end
+    end
+
+    entity.se_allow_in_space = true
+    entity.localised_name = {'name.trash-pipe'}
+    entity.localised_description = {'description.trash-pipe'}
+    data:extend({entity})
+
+    data:extend({{
+        type = 'recipe',
+        name = 'trash-pipe',
+        energy_required = 2,
+        enabled = false,
+        ingredients = {{type='item', name='iron-plate', amount=1}},
+        results = {{type='item', name='trash-pipe', amount=1}},
+        main_product = 'trash-pipe',
+        localised_name = {'name.trash-pipe'},
+        localised_description = {'description.trash-pipe'}
+    }})
+
+    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'})
+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-BOILER'].value then
+    local item = table.deepcopy(data.raw['item']['boiler'])
+    item.name = 'electric-boiler'
+    item.place_result = 'electric-boiler'
+    item.order = 'b[steam-power]-a[electric-boiler]'
+    item.localised_name = {'name.electric-boiler'}
+    item.localised_description = {'description.electric-boiler'}
+    data:extend({item})
+
+    local entity = table.deepcopy(data.raw['boiler']['boiler'])
+    entity.name = 'electric-boiler'
+    entity.energy_consumption = '7200kW'
+    entity.buffer_capacity = '14400kJ'
+    entity.target_temperature = 165
+    entity.emissions_per_minute = {pollution = 0}
+
+    entity.minable = {
+        hardness = 0.2,
+        mining_time = 0.5,
+        result = 'electric-boiler'
+    }
+
+    entity.energy_source = {
+        type = 'electric',
+        usage_priority = 'secondary-input',
+        buffer_capacity = '14400kJ',
+        light_flicker = {
+            color = {r=0.5, g=1, b=1, a=0.5},
+            minimum_light_size = 0.1,
+            light_intensity_to_size_coefficient = 1
+        }
+    }
+
+    entity.fire_flicker_enabled = false
+    entity.fire_glow_flicker_enabled = false
+    entity.fire = {}
+    entity.localised_name = {'name.electric-boiler'}
+    entity.localised_description = {'description.electric-boiler'}
+    data:extend({entity})
+
+    data:extend({{
+        type = 'recipe',
+        name = 'electric-boiler',
+        energy_required = 2,
+        enabled = true,
+        ingredients = {{type='item', name='boiler', amount=1}, {type='item', name='electronic-circuit', amount=1}},
+        results = {{type='item', name='electric-boiler', amount=1}},
+        main_product = 'electric-boiler',
+        localised_name = {'name.electric-boiler'},
+        localised_description = {'description.electric-boiler'}
+    }})
+
+    -- 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',
+        'active-provider-chest',
+        'storage-chest',
+        'buffer-chest',
+        'requester-chest'
+    }
+
+    for _, c in pairs(chests) do
+        local item = table.deepcopy(data.raw['item'][c])
+        local entity
+
+        if c == 'steel-chest' then
+            entity = table.deepcopy(data.raw['container'][c])
+
+        else
+            entity = table.deepcopy(data.raw['logistic-container'][c])
+        end
+
+        item.name = 'basic-' .. c
+        item.place_result = 'basic-' .. c
+        item.order = 'b[storage]-h[basic-' .. c .. ']'
+        item.localised_name = {'name.basic-'.. c}
+        item.localised_description = {'description.basic-'.. c}
+        data:extend({item})
+
+        entity.inventory_type = 'with_filters_and_bar'
+        entity.inventory_size = 1
+        entity.max_logistic_slots = 1
+        entity.name = 'basic-' .. c
+        entity.minable.result = 'basic-' .. c
+        entity.localised_name = {'name.basic-'.. c}
+        entity.localised_description = {'description.basic-'.. c}
+        data:extend({entity})
+
+        data:extend({{
+            type = 'recipe',
+            name = 'basic-' .. c,
+            energy_required = 2,
+            enabled = false,
+            ingredients = {{type='item', name=c, amount=1}},
+            results = {{type='item', name='basic-' .. c, amount=1}},
+            main_product = 'basic-' .. c,
+            localised_name = {'name.basic-' .. c},
+            localised_description = {'description.basic-' .. c}
+        }})
+    end
+
+    table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='basic-steel-chest'})
+
+    for _, t in pairs({'construction', 'logistic'}) do
+        for _, r in pairs({'passive-provider', 'storage'}) do
+            table.insert(data.raw.technology[t .. '-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-' .. r})
+        end
+    end
+
+    for _, r in pairs({'active-provider', 'buffer', 'requester'}) do
+        table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-' .. r})
+    end
+end
+if settings.startup['PHI-EN'].value and settings.startup['PHI-EN-NUCLEAR-TIER'].value > 1 then
+    data.raw['fluid']['steam'].max_temperature = 5000
+end
+
+if settings.startup['PHI-MI'].value and (settings.startup['PHI-MI-LANDFILL'].value ~= 50) then
+    data.raw.recipe['landfill'].ingredients = {{type='item', name='stone', amount=settings.startup['PHI-MI-LANDFILL'].value}}
+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-XW-WATER'].value > 0 then
+    local ocfs = 'offshore-pump'
+
+    data.raw[ocfs][ocfs].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20
+    data.raw[ocfs][ocfs].flags = {'placeable-neutral', 'player-creation'}
+    data.raw[ocfs][ocfs].layers = {
+        item = true,
+        object = true,
+        player = true,
+        water_tile = true,
+        elevated_rail = true
+    }
+    data.raw[ocfs][ocfs].adjacent_tile_collision_mask = nil
+    data.raw[ocfs][ocfs].adjacent_tile_collision_test = {'ground-tile'}
+    data.raw[ocfs][ocfs].tile_buildability_rules = nil
+    data.raw[ocfs][ocfs].water_reflection = nil
+end
+
+if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-OIL'].value then
+    local item = table.deepcopy(data.raw['item']['offshore-pump'])
+
+    item.name = 'oil-pump'
+    item.place_result = 'oil-pump'
+    item.order = 'b[fluids]-a[offshore-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.oil-pump'}
+    item.localised_description = {'description.oil-pump'}
+    data:extend({item})
+
+    local entity = table.deepcopy(data.raw['offshore-pump']['offshore-pump'])
+    entity.name = 'oil-pump'
+    entity.minable.result = 'oil-pump'
+    entity.fluid = 'crude-oil'
+    entity.fluid_box.filter = 'crude-oil'
+    entity.localised_name = {'name.oil-pump'}
+    entity.localised_description = {'description.oil-pump'}
+    data:extend({entity})
+
+    data:extend({{
+        type = 'recipe',
+        name = 'oil-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='oil-pump', amount=1}},
+        main_product = 'oil-pump',
+        localised_name = {'name.oil-pump'},
+        localised_description = {'description.oil-pump'}
+    }})
+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'
+
+        for j=v.min, v.max, 1 do
+            main.EEE(v, j)
+            main.EI(v, j)
+            main.ER(v, j)
+            main.ET(v, j)
+        end
+
+        main.EL(v)
+    end
+end
+
+for _, v in pairs(items['equipment']) do
+    if (v.stage == file_stage) and v.enabled and (v.max >= v.min) then
+        v.category = 'equipment'
+
+        for j=v.min, v.max, 1 do
+            main.EEQ(v, j)
+            main.EI(v, j)
+            main.ER(v, j)
+            main.ET(v, j)
+        end
+    end
+end

PHI-CL/info.json

@@ -1,20 +1,17 @@
 {
     "name": "PHI-CL",
-    "version": "2.0.52",
+    "version": "3.0.0",
-    "factorio_version": "1.1",
+    "factorio_version": "2.0",
-    "date": "2024-10-09",
+    "date": "2024-10-16",
     "title": "Phidias Collection",
     "author": "PHIDIAS0303",
     "contributers": "",
     "homepage": "",
     "description": "Additional compound entities and items to reduce the space needed\nSuch as better solar panel, accumulator\nAnd other feature such as water pump placement anywhere, large range radar, trash chest and pipe, passive power void, linked chest, empty world generation",
     "dependencies": [
-        "base >= 1.1.0",
+        "base >= 2.0.0",
-        "? aai-industry >= 0.5.0",
+        "? space-age",
-        "? Krastorio2 >= 1.3.0",
+        "? quality >= 2.0.0",
-        "? space-exploration >= 0.6.0",
+        "? elevated-rails > 2.0.0"
-        "(?) big-mining-drill >= 0.1.0",
-        "(?) angelsrefining >= 0.12.0",
-        "(?) exotic-industries >= 0.6.0"
     ]
 }

PHI-CL/locale/en/locale.cfg

@@ -40,7 +40,6 @@ large-area-electric-mining-drill=Large area electric mining drill
 passive-energy-void=Passive energy void
 empty-train-battery=Empty train battery
 charged-train-battery=Charged train battery
-satellite=Satellite
 
 solar-panel-equipment=Portable solar panel
 battery-mk2-equipment=Personal battery
@@ -52,17 +51,6 @@ night-vision-equipment=Nightvision equipment
 exoskeleton-equipment=Exoskeleton
 power-armor-mk2=Power armor
 
-basic-oil-processing=Basic oil processing
-advanced-oil-processing=Advanced oil processing
-light-oil-cracking=Light oil cracking to petroleum gas
-heavy-oil-cracking=Heavy oil cracking to light oil
-uranium-processing=Uranium processing
-kovarex-enrichment-process=Kovarex enrichment process
-nuclear-fuel-reprocessing=Nuclear fuel reprocessing
-coal-liquefaction=Coal liquefaction
-wood-production=Wood production
-fish-production=Fish production
-
 industrial-furnace=Industrial furnace
 fuel-processor=Fuel processor
 area-mining-drill=Big mining drill
@@ -153,11 +141,9 @@ oil-pump=
 super-radar=Scans the nearby sectors, and actively reveals an area around it.
 trash-chest=
 trash-pipe=
-large-area-electric-mining-drill=
 passive-energy-void=
 empty-train-battery=
 charged-train-battery=
-satellite=The satellite should be put into the rocket.
 
 solar-panel-equipment=Provides power for equipment modules.
 battery-mk2-equipment=Stores electric energy for equipment modules.
@@ -169,17 +155,6 @@ night-vision-equipment=Allows you to see more clearly in darkness.
 exoskeleton-equipment=Inserted into armor to increase movement speed. You can equip multiple exoskeletons at once.
 power-armor-mk2=Armor with a huge equipment grid and inventory size bonus.
 
-basic-oil-processing=
-advanced-oil-processing=
-light-oil-cracking=
-heavy-oil-cracking=
-uranium-processing=
-kovarex-enrichment-process=
-nuclear-fuel-reprocessing=
-coal-liquefaction=
-wood-production=
-fish-production=
-
 industrial-furnace=Can use advanced smelting and metallurgy recipes but not kiln recipes.
 fuel-processor=Process any chemical fuels into processed fuel.
 area-mining-drill=A larger electric mining drill with increased range, speed and an extra module slots.
@@ -297,14 +272,6 @@ PHI-MI-ROBOT=MI8 Robot efficiency
 PHI-MI-TRAIN=MI9 Train efficiency
 PHI-MI-ARTILLERY=MI10 Artillery range
 
-PHI-RS=RS Recipe scaling
-PHI-RS-RECIPE-1=RS1 Recipe scale 1
-PHI-RS-RECIPE-2=RS2 Recipe scale 2
-PHI-RS-RECIPE-DROF=RS3 Dynamic Recipe Overload Factor
-PHI-RS-RECIPE-MINROM=RS4 Minimum Recipe Overload Multiplier
-PHI-RS-RECIPE-MAXROM=RS5 Maximum Recipe Overload Multiplier
-PHI-RS-MODULE=RS6 Module
-
 PHI-XW-WATER=XW Water anywhere
 
 PHI-XC=XC Clock GUI
@@ -374,12 +341,6 @@ PHI-MI-PIPE=Default 1
 PHI-MI-ROBOT=Default 1
 PHI-MI-TRAIN=Default 1
 
-PHI-RS-RECIPE-1=Default 4 ; Disable 1
-PHI-RS-RECIPE-2=Default 8 ; Disable 1
-PHI-RS-RECIPE-DROF=Default 1
-PHI-RS-RECIPE-MINROM=Default 2
-PHI-RS-RECIPE-MAXROM=Default 100
-
 PHI-PB-CMMS=Default 2
 PHI-PB-CRS=Default 1.5
 PHI-PB-CCS=Default 5

PHI-CL/locale/ja/locale.cfg

@@ -36,11 +36,9 @@ oil-pump=オイルポンプ
 super-radar=スーパーレーダー
 trash-chest=ごみチェスト
 trash-pipe=ごみパイプ
-large-area-electric-mining-drill=大型電動掘削機
 passive-energy-void=パッシブエネルギーボイド
 empty-train-battery=空の列車バッテリー
 charged-train-battery=充電済み列車用バッテリー
-satellite=衛星
 
 solar-panel-equipment=携帯ソーラーパネルモジュール
 battery-mk2-equipment=個人用バッテリー
@@ -52,17 +50,6 @@ night-vision-equipment=暗視モジュール
 exoskeleton-equipment=強化外骨格モジュール
 power-armor-mk2=パワーアーマー
 
-basic-oil-processing=基本的な石油加工
-advanced-oil-processing=発展的な石油加工
-light-oil-cracking=軽油を石油ガスに分解
-heavy-oil-cracking=重油を軽油に分解
-uranium-processing=ウラン濃縮処理
-kovarex-enrichment-process=Kovarex濃縮プロセス
-nuclear-fuel-reprocessing=核燃料再処理
-coal-liquefaction=石炭液化
-wood-production=木材生産
-fish-production=魚の生産
-
 industrial-furnace=工業炉
 fuel-processor=燃料加工所
 area-mining-drill=大型掘削機
@@ -153,11 +140,9 @@ oil-pump=
 super-radar=近隣の領域をスキャンし、その周囲のエリアを探索します。
 trash-chest=
 trash-pipe=
-large-area-electric-mining-drill=
 passive-energy-void=
 empty-train-battery=
 charged-train-battery=
-satellite=衛星はロケットに積んでください。
 
 solar-panel-equipment=装備用モジュールに電力を供給します。
 battery-mk2-equipment=装備用モジュール向けに電力を貯蓄します。
@@ -169,17 +154,6 @@ night-vision-equipment=アーマーに挿入して使い、夜間の視界を改
 exoskeleton-equipment=プレイヤーの移動速度を上昇させます。
 power-armor-mk2=巨大な装備グリッドとインベントリサイズボーナス付きアーマー。
 
-basic-oil-processing=
-advanced-oil-processing=
-light-oil-cracking=
-heavy-oil-cracking=
-uranium-processing=
-kovarex-enrichment-process=
-nuclear-fuel-reprocessing=
-coal-liquefaction=
-wood-production=
-fish-production=
-
 industrial-furnace=高度な製錬と冶金のレシピを使用できますが、れんがなどを焼けません。
 fuel-processor=通常の燃料を加工燃料へと処理します。
 area-mining-drill=掘削範囲が広く高速でモジュールスロットを追加した、より大型の電動掘削機です。
@@ -297,14 +271,6 @@ PHI-MI-ROBOT=MI8 ロボット効率
 PHI-MI-TRAIN=MI9 列車効率
 PHI-MI-ARTILLERY=MI10 長距離砲射程
 
-PHI-RS=RS レシピ スケーリング
-PHI-RS-RECIPE-1=RS1 レシピ規模 1
-PHI-RS-RECIPE-2=RS1 レシピ規模 2
-PHI-RS-RECIPE-DROF=RS3 動的レシピ過負荷係数
-PHI-RS-RECIPE-MINROM=RS4 最小レシピ過負荷乗数
-PHI-RS-RECIPE-MAXROM=RS5 最大レシピ過負荷乗数
-PHI-RS-MODULE=RS6 モジュール
-
 PHI-XW-WATER=XW どこでも水
 
 PHI-XC=XC 時計 GUI
@@ -374,12 +340,6 @@ PHI-MI-PIPE=デフォルト 1
 PHI-MI-ROBOT=デフォルト 1
 PHI-MI-TRAIN=デフォルト 1
 
-PHI-RS-RECIPE-1=デフォルト 4 ; 止める 1
-PHI-RS-RECIPE-2=デフォルト 8 ; 止める 1
-PHI-RS-RECIPE-DROF=デフォルト 1
-PHI-RS-RECIPE-MINROM=デフォルト 2
-PHI-RS-RECIPE-MAXROM=デフォルト 100
-
 PHI-PB-CMMS=デフォルト 2
 PHI-PB-CRS=デフォルト 1.5
 PHI-PB-CCS=デフォルト 5

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

@@ -36,11 +36,9 @@ oil-pump=抽油泵
 super-radar=超級雷達
 trash-chest=垃圾箱
 trash-pipe=垃圾管
-large-area-electric-mining-drill=大型電能採礦機
 passive-energy-void=被動能量消除器
 empty-train-battery=空火車電池
 charged-train-battery=已充電火車電池
-satellite=衛星
 
 solar-panel-equipment=攜帶式太陽能板
 battery-mk2-equipment=電池設備
@@ -52,17 +50,6 @@ night-vision-equipment=夜視鏡
 exoskeleton-equipment=動力外骨骼
 power-armor-mk2=動力護甲
 
-basic-oil-processing=基礎石油加工
-advanced-oil-processing=高等石油加工
-light-oil-cracking=輕油裂解為石油氣
-heavy-oil-cracking=重油裂解為輕油
-uranium-processing=鈾濃縮加工
-kovarex-enrichment-process=鈾增殖加工
-nuclear-fuel-reprocessing=核燃料後加工
-coal-liquefaction=液化煤
-wood-production=木材生產
-fish-production=魚類生產
-
 industrial-furnace=工業熔爐
 fuel-processor=燃料加工機
 area-mining-drill=大型採礦機
@@ -153,11 +140,9 @@ oil-pump=
 super-radar=掃描並顯示附近的未知區域。
 trash-chest=
 trash-pipe=
-large-area-electric-mining-drill=
 passive-energy-void=
 empty-train-battery=
 charged-train-battery=
-satellite=此衛星應放入火箭內。
 
 solar-panel-equipment=替裝備的模組供電。
 battery-mk2-equipment=為設備模組儲存電力。
@@ -169,17 +154,6 @@ night-vision-equipment=放入模組化裝甲可使玩家獲得夜視能力。
 exoskeleton-equipment=用於插入模組化裝甲，可提高玩家的移動速度。你可以同時裝備多個外骨骼模組。
 power-armor-mk2=具有巨大模組化插槽和背包容量加成的裝甲。
 
-basic-oil-processing=
-advanced-oil-processing=
-light-oil-cracking=
-heavy-oil-cracking=
-uranium-processing=
-kovarex-enrichment-process=
-nuclear-fuel-reprocessing=
-coal-liquefaction=
-wood-production=
-fish-production=
-
 industrial-furnace=與電爐相比，更大、速度快且具有更多插件插槽。需要選擇配方，但可以處理具有多種輸入和流體的高級的配方。
 fuel-processor=將任何化學燃料製成成加工燃料。
 area-mining-drill=具有更大作業範圍和額外插件插槽的礦機。
@@ -297,14 +271,6 @@ PHI-MI-ROBOT=MI8 無人機效率
 PHI-MI-TRAIN=MI9 火車效率
 PHI-MI-ARTILLERY=MI10 火炮炮彈射程
 
-PHI-RS=RS 配方規模
-PHI-RS-RECIPE-1=RS1 配方規模 1
-PHI-RS-RECIPE-2=RS2 配方規模 2
-PHI-RS-RECIPE-DROF=RS3 動態配方規模超載倍數
-PHI-RS-RECIPE-MINROM=RS4 配方規模超載下限倍數
-PHI-RS-RECIPE-MAXROM=RS5 配方規模超載上限倍數
-PHI-RS-MODULE=RS6 模組
-
 PHI-XW-WATER=XW 隨處水源
 
 PHI-XC=XC 時鐘介面
@@ -374,12 +340,6 @@ PHI-MI-PIPE=預設 1
 PHI-MI-ROBOT=預設 1
 PHI-MI-TRAIN=預設 1
 
-PHI-RS-RECIPE-1=預設 4 ; 停用 1
-PHI-RS-RECIPE-2=預設 8 ; 停用 1
-PHI-RS-RECIPE-DROF=預設 1
-PHI-RS-RECIPE-MINROM=預設 2
-PHI-RS-RECIPE-MAXROM=預設 100
-
 PHI-PB-CMMS=預設 2
 PHI-PB-CRS=預設 1.5
 PHI-PB-CCS=預設 5

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

@@ -36,11 +36,9 @@ oil-pump=抽油泵
 super-radar=超級雷達
 trash-chest=垃圾箱
 trash-pipe=垃圾管
-large-area-electric-mining-drill=大型電能採礦機
 passive-energy-void=被動能量消除器
 empty-train-battery=空火車電池
 charged-train-battery=已充電火車電池
-satellite=衛星
 
 solar-panel-equipment=攜帶式太陽能板
 battery-mk2-equipment=電池設備
@@ -52,17 +50,6 @@ night-vision-equipment=夜視鏡
 exoskeleton-equipment=動力外骨骼
 power-armor-mk2=動力護甲
 
-basic-oil-processing=基礎石油加工
-advanced-oil-processing=高等石油加工
-light-oil-cracking=輕油裂解為石油氣
-heavy-oil-cracking=重油裂解為輕油
-uranium-processing=鈾濃縮加工
-kovarex-enrichment-process=鈾增殖加工
-nuclear-fuel-reprocessing=核燃料後加工
-coal-liquefaction=液化煤
-wood-production=木材生產
-fish-production=魚類生產
-
 industrial-furnace=工業熔爐
 fuel-processor=燃料加工機
 area-mining-drill=大型採礦機
@@ -153,11 +140,9 @@ oil-pump=
 super-radar=掃描並顯示附近的未知區域。
 trash-chest=
 trash-pipe=
-large-area-electric-mining-drill=
 passive-energy-void=
 empty-train-battery=
 charged-train-battery=
-satellite=此衛星應放入火箭內。
 
 solar-panel-equipment=替裝備的模組供電。
 battery-mk2-equipment=為設備模組儲存電力。
@@ -169,17 +154,6 @@ night-vision-equipment=放入模組化裝甲可使玩家獲得夜視能力。
 exoskeleton-equipment=用於插入模組化裝甲，可提高玩家的移動速度。你可以同時裝備多個外骨骼模組。
 power-armor-mk2=具有巨大模組化插槽和背包容量加成的裝甲。
 
-basic-oil-processing=
-advanced-oil-processing=
-light-oil-cracking=
-heavy-oil-cracking=
-uranium-processing=
-kovarex-enrichment-process=
-nuclear-fuel-reprocessing=
-coal-liquefaction=
-wood-production=
-fish-production=
-
 industrial-furnace=與電爐相比，更大、速度快且具有更多插件插槽。需要選擇配方，但可以處理具有多種輸入和流體的高級的配方。
 fuel-processor=將任何化學燃料製成成加工燃料。
 area-mining-drill=具有更大作業範圍和額外插件插槽的礦機。
@@ -297,14 +271,6 @@ PHI-MI-ROBOT=MI8 無人機效率
 PHI-MI-TRAIN=MI9 火車效率
 PHI-MI-ARTILLERY=MI10 火炮炮彈射程
 
-PHI-RS=RS 配方規模
-PHI-RS-RECIPE-1=RS1 配方規模 1
-PHI-RS-RECIPE-2=RS2 配方規模 2
-PHI-RS-RECIPE-DROF=RS3 動態配方規模超載倍數
-PHI-RS-RECIPE-MINROM=RS4 配方規模超載下限倍數
-PHI-RS-RECIPE-MAXROM=RS5 配方規模超載上限倍數
-PHI-RS-MODULE=RS6 模組
-
 PHI-XW-WATER=XW 隨處水源
 
 PHI-XC=XC 時鐘介面
@@ -374,12 +340,6 @@ PHI-MI-PIPE=預設 1
 PHI-MI-ROBOT=預設 1
 PHI-MI-TRAIN=預設 1
 
-PHI-RS-RECIPE-1=預設 4 ; 停用 1
-PHI-RS-RECIPE-2=預設 8 ; 停用 1
-PHI-RS-RECIPE-DROF=預設 1
-PHI-RS-RECIPE-MINROM=預設 2
-PHI-RS-RECIPE-MAXROM=預設 100
-
 PHI-PB-CMMS=預設 2
 PHI-PB-CRS=預設 1.5
 PHI-PB-CCS=預設 5

PHI-CL/main.lua

@@ -57,9 +57,7 @@ function main.EEE(source, tier)
     end
 
     if item.energy_usage then
-        local eu = tonumber(string.match(item.energy_usage, '[%d%.]+'))
+        item.energy_usage = tonumber(string.match(item.energy_usage, '[%d%.]+')) * (2 ^ (tier - source.min + 1)) .. string.match(item.energy_usage, '%a+')
-        local euu = string.match(item.energy_usage, '%a+')
-        item.energy_usage = eu * (2 ^ (tier - source.min + 1)) .. euu
     end
 
     if (source.type == 'electric-turret') or (source.type == 'ammo-turret') or (source.type == 'fluid-turret') then
@@ -86,35 +84,21 @@ function main.EEE(source, tier)
             item.energy_source.input_flow_limit = tostring(tonumber(string.match(item.energy_source.input_flow_limit, '[%d%.]+')) * (4 ^ (tier - source.min + 1))) .. string.match(item.energy_source.input_flow_limit, '%a+')
             item.energy_source.output_flow_limit = tostring(tonumber(string.match(item.energy_source.output_flow_limit, '[%d%.]+')) * (4 ^ (tier - source.min + 1))) .. string.match(item.energy_source.output_flow_limit, '%a+')
 
-            for _, v in pairs({'charge_animation', 'discharge_animation'}) do
+            if item['chargable_graphics'] then
-                if item[v] and item[v].layers then
+                if item['chargable_graphics']['picture'].layers and item['chargable_graphics']['picture'].layers[1] then
-                    if item[v].layers[1] and item[v].layers[1].layers and item[v].layers[1].layers[1] then
+                    item['chargable_graphics']['picture'].layers[1].tint = items['tint'][tier]
-                        item[v].layers[1].layers[1].tint = items['tint'][tier]
-
-                        if item[v].layers[1].layers[1].hr_version then
-                            item[v].layers[1].layers[1].hr_version.tint = items['tint'][tier]
-                        end
                 end
 
-                    if item[v].layers[2] then
+                for _, v in pairs({item['chargable_graphics']['charge_animation'], item['chargable_graphics']['discharge_animation']}) do
-                        item[v].layers[2].tint = items['tint'][tier]
+                    if v.layers and v.layers[1] and v.layers[1].layers and v.layers[1].layers[1] then
-
+                        v.layers[1].layers[1].tint = items['tint'][tier]
-                        if item[v].layers[2].hr_version then
-                            item[v].layers[2].hr_version.tint = items['tint'][tier]
-                        end
                     end
                 end
             end
 
         elseif (source.type == 'solar-panel') then
-            if (source.ref_name == 'solar-panel') then
             item.production = tostring(tonumber(string.match(item.production, '[%d%.]+')) * (4 ^ (tier - source.min + 1))) .. string.match(item.production, '%a+')
 
-
-            elseif (source.ref_name == 'se-space-solar-panel') then
-                item.production = tostring(tonumber(string.match(item.production, '[%d%.]+')) * (4 ^ (tier - source.min + 2))) .. string.match(item.production, '%a+')
-            end
-
         elseif (source.type == 'boiler') then
             item.energy_consumption = tostring(tonumber(string.match(item.energy_consumption, '[%d%.]+')) * tier) .. string.match(item.energy_consumption, '%a+')
             item.target_temperature = 15 + ((item.target_temperature - 15) * tier)
@@ -130,10 +114,7 @@ function main.EEE(source, tier)
                 item.max_power_output = (tonumber(string.match(item.max_power_output, '[%d%.]+')) * (tier - source.min + 2)) .. string.match(item.max_power_output, '%a+')
             end
 
-            if source.name == 'kr-gas-power-station' then
+            if item.maximum_temperature then
-                item.fluid_usage_per_tick = item.fluid_usage_per_tick * (tier - source.min + 2)
-
-            else
                 item.maximum_temperature = 15 + ((item.maximum_temperature - 15) * tier)
             end
 
@@ -195,40 +176,29 @@ function main.EEE(source, tier)
         item.max_distance_of_sector_revealed = item.max_distance_of_sector_revealed + (2 * tier)
         item.max_distance_of_nearby_sector_revealed = item.max_distance_of_nearby_sector_revealed + (2 * tier)
 
-    elseif (source.type == 'rocket-silo') then
-        local eu = tonumber(string.match(item.active_energy_usage, '[%d%.]+'))
-        local euu = string.match(item.active_energy_usage, '%a+')
-        item.active_energy_usage = eu * (2 ^ (tier - source.min + 1)) .. euu
-        item.rocket_parts_required = item.rocket_parts_required * (tier - source.min + 2)
-        item.rocket_result_inventory_size = math.ceil(data.raw['item']['satellite'].rocket_launch_product[2] * 3 * (tier - source.min + 1) / data.raw['tool']['space-science-pack'].stack_size)
-
-        tint_handle(item, tier, {'arm_01_back_animation', 'arm_02_right_animation', 'arm_03_front_animation', 'base_day_sprite', 'base_front_sprite', 'door_back_sprite', 'door_front_sprite', 'hole_sprite', 'rocket_glow_overlay_sprite', 'rocket_shadow_overlay_sprite', 'satellite_animation'})
     end
 
     if item.crafting_speed then
         item.crafting_speed = item.crafting_speed * (2 ^ (tier - source.min + 1))
     end
+
     if item.energy_source then
         if item.energy_source.emissions_per_minute then
             if source.tech == 'compound-energy' then
                 if (source.type == 'boiler') or (source.name == 'kr-gas-power-station') then
-                    item.energy_source.emissions_per_minute = item.energy_source.emissions_per_minute * (tier - source.min + 2)
+                    item.energy_source.emissions_per_minute.pollution = item.energy_source.emissions_per_minute.pollution * (tier - source.min + 2)
 
                 else
-                    item.energy_source.emissions_per_minute = item.energy_source.emissions_per_minute * (2 ^ (tier - source.min + 1))
+                    item.energy_source.emissions_per_minute.pollution = item.energy_source.emissions_per_minute.pollution * (2 ^ (tier - source.min + 1))
                 end
 
             else
-                item.energy_source.emissions_per_minute = item.energy_source.emissions_per_minute * (2 ^ (tier - source.min + 1))
+                item.energy_source.emissions_per_minute.pollution = item.energy_source.emissions_per_minute.pollution * (2 ^ (tier - source.min + 1))
             end
         end
     end
 
-    if source.name == 'electric-filter-furnace' then
+    tint_handle(item, tier, {'picture', 'pictures', 'structure', 'frames', 'working_visualisations', 'animation', 'horizontal_animation', 'vertical_animation', 'structure', 'integration_patch'})
-        item.type = 'assembling-machine'
-    end
-
-    tint_handle(item, tier, {'picture', 'pictures', 'animation', 'horizontal_animation', 'vertical_animation', 'structure', 'integration_patch'})
 
     if item.idle_animation and item.idle_animation.layers then
         local i = 1
@@ -259,7 +229,7 @@ function main.EEE(source, tier)
     end
 
     if tier > 1 then
-        item.localised_name = {'phi-cl.combine', {'name.' .. source.ref_name}, tier}
+        item.localised_name = {'phi-cl.combine', {'name.' .. source.ref_name}, tostring(tier)}
 
     else
         item.localised_name = {'name.' .. source.ref_name}
@@ -351,7 +321,7 @@ function main.EEQ(source, tier)
         end
     end
 
-    item.localised_name = {'phi-cl.combine-gen', {'name.' .. source.ref_name}, tier}
+    item.localised_name = {'phi-cl.combine-gen', {'name.' .. source.ref_name}, tostring(tier)}
     item.localised_description = {'description.' .. source.ref_name}
 
     data:extend({item})
@@ -393,17 +363,12 @@ function main.EI(source, tier)
             item.icons[1].icon_size = item.icon_size
             item.icon_size = nil
         end
-
-        if item.icon_mipmaps then
-            item.icons[1].icon_mipmaps = item.icon_mipmaps
-            item.icon_mipmaps = nil
-        end
     end
 
     item.order = item.order .. tier
 
     if tier > 1 then
-        item.localised_name = {'phi-cl.combine', {'name.' .. source.ref_name}, tier}
+        item.localised_name = {'phi-cl.combine', {'name.' .. source.ref_name}, tostring(tier)}
 
     else
         item.localised_name = {'name.' .. source.ref_name}
@@ -421,6 +386,12 @@ function main.ER(source, tier)
     local result_name = source.name
     local localised_name
     local localised_description = {'description.' .. source.ref_name}
+    local icons = {
+        {
+            icon = data.raw.item[source.ref_name].icon,
+            tint = items['tint'][tier]
+        }
+    }
 
     if source.category == 'equipment' then
         if (tier == 2) then
@@ -433,7 +404,7 @@ function main.ER(source, tier)
         new_name = new_name .. '-mk' .. tier .. '-equipment'
         result_name = result_name .. '-mk' .. tier .. '-equipment'
 
-        localised_name = {'phi-cl.combine-gen', {'name.' .. source.ref_name}, tier}
+        localised_name = {'phi-cl.combine-gen', {'name.' .. source.ref_name}, tostring(tier)}
 
     else
         if tier > 2 then
@@ -444,7 +415,7 @@ function main.ER(source, tier)
         result_name = result_name .. '-' .. tier
 
         if tier > 1 then
-            localised_name = {'phi-cl.combine', {'name.' .. source.ref_name}, tier}
+            localised_name = {'phi-cl.combine', {'name.' .. source.ref_name}, tostring(tier)}
 
         else
             localised_name = {'name.' .. source.ref_name}
@@ -455,11 +426,13 @@ function main.ER(source, tier)
         if (source.type == 'solar-panel') or (source.type == 'accumulator') then
             data:extend({{
                 type = 'recipe',
-                name = new_name ,
+                name = new_name,
+                icons = icons,
                 energy_required = 2,
                 enabled = false,
-                ingredients = {{name=ingredient_name, amount=4}},
+                ingredients = {{type='item', name=ingredient_name, amount=4}},
-                result = result_name,
+                results = {{type='item', name=result_name, amount=1}},
+                main_product = result_name,
                 localised_name = localised_name,
                 localised_description = localised_description
             }})
@@ -468,11 +441,13 @@ function main.ER(source, tier)
             if tier > 2 then
                 data:extend({{
                     type = 'recipe',
-                    name = new_name ,
+                    name = new_name,
+                    icons = icons,
                     energy_required = 2,
                     enabled = false,
-                    ingredients = {{name=ingredient_name, amount=1}, {name=source.name, amount=1}},
+                    ingredients = {{type='item', name=ingredient_name, amount=1}, {type='item', name=source.name, amount=1}},
-                    result = result_name,
+                    results = {{type='item', name=result_name, amount=1}},
+                    main_product = result_name,
                     localised_name = localised_name,
                     localised_description = localised_description
                 }})
@@ -480,11 +455,13 @@ function main.ER(source, tier)
             else
                 data:extend({{
                     type = 'recipe',
-                    name = new_name ,
+                    name = new_name,
+                    icons = icons,
                     energy_required = 2,
                     enabled = false,
-                    ingredients = {{name=ingredient_name, amount=2}},
+                    ingredients = {{type='item', name=ingredient_name, amount=2}},
-                    result = result_name,
+                    results = {{type='item', name=result_name, amount=1}},
+                    main_product = result_name,
                     localised_name = localised_name,
                     localised_description = localised_description
                 }})
@@ -495,10 +472,12 @@ function main.ER(source, tier)
         data:extend({{
             type = 'recipe',
             name = new_name,
+            icons = icons,
             energy_required = 2,
             enabled = false,
-            ingredients = {{name=ingredient_name, amount=2}},
+            ingredients = {{type='item', name=ingredient_name, amount=2}},
-            result = result_name,
+            results = {{type='item', name=result_name, amount=1}},
+            main_product = result_name,
             localised_name = localised_name,
             localised_description = localised_description
         }})

PHI-CL/settings.lua

@@ -186,22 +186,10 @@ data:extend({
     type = 'int-setting',
     name = 'PHI-MI-LANDFILL',
     setting_type = 'startup',
-    default_value = 20,
+    default_value = 50,
     minimum_value = 1,
-    maximum_value = 40,
+    maximum_value = 100,
     order = 'E01'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-MI-EFFCY',
-    setting_type = 'startup',
-    default_value = false,
-    order = 'E02'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-MI-NUCLEAR',
-    setting_type = 'startup',
-    default_value = false,
-    order = 'E03'
   }, {
     type = 'bool-setting',
     name = 'PHI-MI-BOILER',
@@ -214,90 +202,6 @@ data:extend({
     setting_type = 'startup',
     default_value = false,
     order = 'E05'
-  }, {
-    type = 'int-setting',
-    name = 'PHI-MI-REPAIR',
-    setting_type = 'startup',
-    default_value = 1,
-    allowed_values = {1, 2, 3, 4, 5, 6, 7, 8},
-    order = 'E06'
-  }, {
-    type = 'int-setting',
-    name = 'PHI-MI-PIPE',
-    setting_type = 'startup',
-    default_value = 1,
-    allowed_values = {1, 2, 3, 4, 5, 6, 7, 8},
-    order = 'E07'
-  }, {
-    type = 'int-setting',
-    name = 'PHI-MI-ROBOT',
-    setting_type = 'startup',
-    default_value = 1,
-    allowed_values = {1, 2, 3, 4, 5, 6, 7, 8},
-    order = 'E08'
-  }, {
-    type = 'int-setting',
-    name = 'PHI-MI-TRAIN',
-    setting_type = 'startup',
-    default_value = 1,
-    allowed_values = {1, 2, 3, 4, 5, 6, 7, 8},
-    order = 'E09'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-MI-ARTILLERY',
-    setting_type = 'startup',
-    default_value = true,
-    order = 'E10'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-RS',
-    setting_type = 'startup',
-    default_value = false,
-    order = 'F00'
-  }, {
-    type = 'int-setting',
-    name = 'PHI-RS-RECIPE-1',
-    setting_type = 'startup',
-    default_value = 4,
-    allowed_values = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
-    order = 'F01'
-  }, {
-    type = 'int-setting',
-    name = 'PHI-RS-RECIPE-2',
-    setting_type = 'startup',
-    default_value = 8,
-    allowed_values = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
-    order = 'F02'
-  }, {
-    type = 'int-setting',
-    name = 'PHI-RS-RECIPE-DROF',
-    setting_type = 'startup',
-    default_value = 1,
-    minimum_value = 1,
-    maximum_value = 100,
-    order = 'F03'
-  }, {
-    type = 'int-setting',
-    name = 'PHI-RS-RECIPE-MINROM',
-    setting_type = 'startup',
-    default_value = 2,
-    minimum_value = 1,
-    maximum_value = 100,
-    order = 'F04'
-  }, {
-    type = 'int-setting',
-    name = 'PHI-RS-RECIPE-MAXROM',
-    setting_type = 'startup',
-    default_value = 100,
-    minimum_value = 1,
-    maximum_value = 100,
-    order = 'F05'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-RS-MODULE',
-    setting_type = 'startup',
-    default_value = true,
-    order = 'F06'
   }, {
     type = 'int-setting',
     name = 'PHI-XW-WATER',
@@ -365,82 +269,7 @@ data:extend({
     minimum_value = 0,
     maximum_value = 20,
     order = 'IA06'
-  },
-  --[[ {
-    type = 'int-setting',
-    name = 'PHI-PB-FMMS',
-    setting_type = 'startup',
-    default_value = 2,
-    minimum_value = 0,
-    maximum_value = 10,
-    order = 'IB01'
   }, {
-    type = 'double-setting',
-    name = 'PHI-PB-FRS',
-    setting_type = 'startup',
-    default_value = 1.5,
-    minimum_value = 0,
-    maximum_value = 10,
-    order = 'IB02'
-  }, {
-    type = 'int-setting',
-    name = 'PHI-PB-FCS',
-    setting_type = 'startup',
-    default_value = 5,
-    minimum_value = 0,
-    maximum_value = 20,
-    order = 'IB03'
-  }, {
-    type = 'int-setting',
-    name = 'PHI-PB-FISB',
-    setting_type = 'startup',
-    default_value = 100,
-    minimum_value = 0,
-    maximum_value = 200,
-    order = 'IB04'
-  }, {
-    type = 'int-setting',
-    name = 'PHI-PB-FHB',
-    setting_type = 'startup',
-    default_value = 200,
-    minimum_value = 0,
-    maximum_value = 1000,
-    order = 'IB05'
-  }, {
-    type = 'double-setting',
-    name = 'PHI-PB-FWRSM',
-    setting_type = 'startup',
-    default_value = 1.3,
-    minimum_value = 0,
-    maximum_value = 20,
-    order = 'IB06'
-  }, {
-    type = 'double-setting',
-    name = 'PHI-PB-FWRBM',
-    setting_type = 'startup',
-    default_value = 1,
-    minimum_value = 0,
-    maximum_value = 20,
-    order = 'IB07'
-  }, {
-    type = 'int-setting',
-    name = 'PHI-PB-FWRSB',
-    setting_type = 'startup',
-    default_value = 1,
-    minimum_value = 0,
-    maximum_value = 40,
-    order = 'IB08'
-  }, {
-    type = 'int-setting',
-    name = 'PHI-PB-FFRLM',
-    setting_type = 'startup',
-    default_value = 1,
-    minimum_value = 0,
-    maximum_value = 20,
-    order = 'IB09'
-  },
-  ]]
-  {
     type = 'bool-setting',
     name = 'PHI-CT',
     setting_type = 'startup',
@@ -477,12 +306,6 @@ data:extend({
     setting_type = 'startup',
     default_value = true,
     order = 'J05'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-CT-MINER',
-    setting_type = 'startup',
-    default_value = true,
-    order = 'J06'
   }, {
     type = 'bool-setting',
     name = 'PHI-CT-LINKED',
@@ -495,24 +318,12 @@ data:extend({
     setting_type = 'startup',
     default_value = true,
     order = 'J08'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-CT-RECIPE',
-    setting_type = 'startup',
-    default_value = true,
-    order = 'J09'
   }, {
     type = 'bool-setting',
     name = 'PHI-CT-ENERGY',
     setting_type = 'startup',
     default_value = true,
     order = 'J10'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-CT-LAMP',
-    setting_type = 'startup',
-    default_value = true,
-    order = 'J11'
   }, {
     type = 'bool-setting',
     name = 'PHI-CT-TRAIN',