diff --git a/PHI-CL/control.lua b/PHI-CL/control.lua index 330c49e..fa71c98 100644 --- a/PHI-CL/control.lua +++ b/PHI-CL/control.lua @@ -1,51 +1,19 @@ local items = require 'config' -local function clock_display(sec) - local s = math.floor(sec) % 60 - local m = math.floor(sec / 60) % 60 - - if sec > 3599 then - local h = math.floor(sec / 3600) - return string.format('%d:%02d:%02d', h, m, s) - else - return string.format('%d:%02d', m, s) - end -end - -local function trash_creation(event) - local entity = event.created_entity or event.entity - - if not entity then - return - end - - if not entity.valid then - return - end - - if entity.name == 'trash-chest' then - entity.infinity_container_filters = {} - entity.remove_unfiltered_items = true - - elseif entity.name == 'trash-pipe' then - entity.set_infinity_pipe_filter(nil) - end -end - -local function trash_check() - for _, surface in pairs(game.surfaces) do - for _, e in pairs(surface.find_entities_filtered{name='trash-chest'}) do - e.infinity_container_filters = {} - e.remove_unfiltered_items = true - end - - for _, e in pairs(surface.find_entities_filtered{name='trash-pipe'}) do - e.set_infinity_pipe_filter(nil) - end - end -end - if settings.startup['PHI-XC'].value then + local function clock_display(sec) + local s = math.floor(sec) % 60 + local m = math.floor(sec / 60) % 60 + + if sec > 3599 then + local h = math.floor(sec / 3600) + return string.format('%d:%02d:%02d', h, m, s) + + else + return string.format('%d:%02d', m, s) + end + end + script.on_nth_tick(60, function(event) for _, player in pairs(game.connected_players) do if player.gui.top.phi_clock == nil then @@ -59,18 +27,18 @@ end if settings.startup['PHI-PB'].value then commands.add_command('phi-pb-bonus', nil, function(command) - local player - - if command.player_index then - player = game.get_player(command.player_index) - - else - game.print('Command Error') + if not command.player_index then + game.print('Command Error - PHI-PB-BONUS') return end + local player = game.get_player(command.player_index) local bonus = tonumber(command.parameter) + if not player then + return + end + if type(bonus) ~= 'number' then player.print('Parameter need to be number') return @@ -97,12 +65,43 @@ if settings.startup['PHI-PB'].value then end) end -if settings.startup['PHI-CT'].value then - if settings.startup['PHI-CT-TRASH'].value then - script.on_init(trash_check) - script.on_event(defines.events.on_built_entity, trash_creation, {{filter='name', name='trash-chest', mode='or'}, {filter='name', name='trash-pipe', mode='or'}}) - script.on_event(defines.events.on_robot_built_entity, trash_creation, {{filter='name', name='trash-chest', mode='or'}, {filter='name', name='trash-pipe', mode='or'}}) - script.on_event(defines.events.script_raised_built, trash_creation) - script.on_event(defines.events.script_raised_revive, trash_creation) +if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRASH'].value then + local function trash_creation(event) + local entity = event.created_entity or event.entity + + if not entity then + return + end + + if not entity.valid then + return + end + + if entity.name == 'trash-chest' then + entity.infinity_container_filters = {} + entity.remove_unfiltered_items = true + + elseif entity.name == 'trash-pipe' then + entity.set_infinity_pipe_filter(nil) + end end + + local function trash_check() + for _, surface in pairs(game.surfaces) do + for _, e in pairs(surface.find_entities_filtered{name='trash-chest'}) do + e.infinity_container_filters = {} + e.remove_unfiltered_items = true + end + + for _, e in pairs(surface.find_entities_filtered{name='trash-pipe'}) do + e.set_infinity_pipe_filter(nil) + end + end + end + + script.on_init(trash_check) + script.on_event(defines.events.on_built_entity, trash_creation, {{filter='name', name='trash-chest', mode='or'}, {filter='name', name='trash-pipe', mode='or'}}) + script.on_event(defines.events.on_robot_built_entity, trash_creation, {{filter='name', name='trash-chest', mode='or'}, {filter='name', name='trash-pipe', mode='or'}}) + script.on_event(defines.events.script_raised_built, trash_creation) + script.on_event(defines.events.script_raised_revive, trash_creation) end diff --git a/PHI-CL/data-final-fixes.lua b/PHI-CL/data-final-fixes.lua index 4802202..da6f96d 100644 --- a/PHI-CL/data-final-fixes.lua +++ b/PHI-CL/data-final-fixes.lua @@ -1,10 +1,13 @@ -local items = require 'config' -local main = require 'main' -local file_stage = 3 +-- 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['arithmetic-combinator']['arithmetic-combinator'].energy_source.usage_priority = 'primary-input' +data.raw['decider-combinator']['decider-combinator'].energy_source.usage_priority = 'primary-input' + for _,name in pairs({'furnace', 'lab', 'beacon'}) do local entities = {} @@ -17,7 +20,7 @@ for _,name in pairs({'furnace', 'lab', 'beacon'}) do end end -if settings.startup['PHI-CT-TILE'].value then +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 diff --git a/PHI-CL/data-updates.lua b/PHI-CL/data-updates.lua index da75ed1..74da4e6 100644 --- a/PHI-CL/data-updates.lua +++ b/PHI-CL/data-updates.lua @@ -30,7 +30,7 @@ if settings.startup['PHI-XW-WATER'].value > 0 then end end -if settings.startup['PHI-EQ-ARMOR'].value then +if settings.startup['PHI-EQ'].value and settings.startup['PHI-EQ-ARMOR'].value then data:extend({ { type = 'equipment-grid', @@ -321,7 +321,7 @@ if settings.startup['PHI-RS'].value then end end -if settings.startup['PHI-MI-PIPE'].value then +if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].value then for k, _ in pairs(data.raw) do if data.raw[k] then if data.raw[k].fluid_box then @@ -361,50 +361,66 @@ if settings.startup['PHI-MI-PIPE'].value then end end -if settings.startup['PHI-MB'].value and mods['space-exploration'] then - if settings.startup['PHI-MB-MINING-TIER'].value > 1 then - data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group = 'se-core-miner-drill' +if settings.startup['PHI-MB'].value and mods['space-exploration'] and settings.startup['PHI-MB-MINING-TIER'].value > 1 then + data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group = 'se-core-miner-drill' - local se = { - type = 'mining-drill', - name = 'se-core-miner-drill', - ref_name = 'se-core-miner-drill', - min = 2, - max = 3 + local se = { + type = 'mining-drill', + name = 'se-core-miner-drill', + ref_name = 'se-core-miner-drill', + min = 2, + max = 3 + } + + for i=2, settings.startup['PHI-MB-MINING-TIER'].value do + local miner_name = 'se-core-miner-' .. i + local drill_name = 'se-core-miner-drill-' .. i + + main.EEE(se, i) + data.raw['mining-drill'][drill_name].minable.result = miner_name + data.raw['mining-drill'][drill_name].placeable_by.item = miner_name + + local item = table.deepcopy(data.raw['item']['se-core-miner']) + item.name = 'se-core-miner-' .. i + item.place_result = drill_name + item.order = 'zzzz-core-miner-' .. i + + item.icons = { + { + icon = '__space-exploration-graphics__/graphics/icons/core-miner.png', + tint = items['tint'][i], + icon_size = 64, + } } - for i=2, settings.startup['PHI-MB-MINING-TIER'].value do - local miner_name = 'se-core-miner-' .. i - local drill_name = 'se-core-miner-drill-' .. i + item.icon = nil + item.icon_size = nil - main.EEE(se, i) - data.raw['mining-drill'][drill_name].minable.result = miner_name - data.raw['mining-drill'][drill_name].placeable_by.item = miner_name - - local item = table.deepcopy(data.raw['item']['se-core-miner']) - item.name = 'se-core-miner-' .. i - item.place_result = drill_name - item.order = 'zzzz-core-miner-' .. i - data:extend({item}) - - local ing_n = 'se-core-miner' - - if i > 2 then - ing_n = ing_n .. '-' .. i - end + data:extend({item}) + if i > 2 then data:extend({{ type = 'recipe', name = miner_name, energy_required = 2, enabled = false, - ingredients = {{ing_n, 2}}, + ingredients = {{name='se-core-miner-' .. (i - 1), amount=1}, {name='se-core-miner', amount=1}}, result = miner_name }}) - data.raw['mining-drill'][drill_name].fast_replaceable_group = data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group - table.insert(data.raw.technology['se-core-miner'].effects, {type='unlock-recipe', recipe=miner_name}) + else + data:extend({{ + type = 'recipe', + name = miner_name, + energy_required = 2, + enabled = false, + ingredients = {{name='se-core-miner', amount=2}}, + result = miner_name + }}) end + + data.raw['mining-drill'][drill_name].fast_replaceable_group = data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group + table.insert(data.raw.technology['se-core-miner'].effects, {type='unlock-recipe', recipe=miner_name}) end end diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 2633dda..8042aed 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -13,582 +13,578 @@ if settings.startup['PHI-XW-WATER'].value > 0 then data.raw['offshore-pump']['offshore-pump'].placeable_position_visualization = nil data.raw['offshore-pump']['offshore-pump'].se_allow_in_space = true end -if settings.startup['PHI-CT'].value then - if settings.startup['PHI-CT-RECIPE'].value then - data:extend({{ - type = 'recipe', - name = 'wood-production', - energy_required = 10, - enabled = true, - icon = '__base__/graphics/icons/wood.png', - icon_size = 64, - icon_mipmaps = 4, - subgroup = 'intermediate-product', - order = 'za', - ingredients = {{'wood', 10}}, - results = { - { - name = 'wood', - probability = 0.5, - amount = 10 - }, - { - name = 'wood', - probability = 0.5, - amount = 10 - }, - { - name = 'wood', - probability = 0.5, - amount = 10 - }, - { - name = 'wood', - probability = 0.5, - amount = 10 - } - } - }}) - data:extend({{ - type = 'recipe', - name = 'fish-production', - energy_required = 10, - enabled = true, - icon = '__base__/graphics/icons/fish.png', - icon_size = 64, - icon_mipmaps = 4, - subgroup = 'intermediate-product', - order = 'zb', - ingredients = {{'raw-fish', 10}}, - results = { - { - name = 'raw-fish', - probability = 0.5, - amount = 10 - }, - { - name = 'raw-fish', - probability = 0.5, - amount = 10 - }, - { - name = 'raw-fish', - probability = 0.5, - amount = 10 - }, - { - name = 'raw-fish', - probability = 0.5, - amount = 10 - } - } - }}) +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' - for k, v in pairs(data.raw.module) do - if v.limitation and string.find(v.name, 'productivity', 1, true) then - table.insert(v.limitation, 'wood-production') - table.insert(v.limitation, 'fish-production') - end + 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 + + 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.se_allow_in_space = true + data:extend({entity}) + + data:extend({{ + type = 'recipe', + name = 'oil-pump', + energy_required = 2, + enabled = true, + ingredients = {{'electronic-circuit', 2}, {'pipe', 1}, {'iron-gear-wheel', 1}}, + result = 'oil-pump' + }}) +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 = '__base__/graphics/icons/radar.png', + tint = items['tint'][8], + icon_size = 64, + icon_mipmaps = 4 + } + } + + item.icon = nil + item.icon_size = nil + item.icon_mipmaps = nil + 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 = 30 + entity.max_distance_of_nearby_sector_revealed = 30 + entity.pictures.layers[1].tint = items['tint'][8] + entity.pictures.layers[1].hr_version.tint = items['tint'][8] + entity.se_allow_in_space = true + data:extend({entity}) + + data:extend({{ + type = 'recipe', + name = 'super-radar', + energy_required = 2, + enabled = true, + ingredients = {{'electronic-circuit', 5}, {'iron-gear-wheel', 5}, {'iron-plate', 10}}, + result = '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]-e[trash-chest]' + + item.icons = { + { + icon = '__base__/graphics/icons/steel-chest.png', + tint = items['tint'][8], + icon_size = 64, + icon_mipmaps = 4 + } + } + + item.icon = nil + item.icon_size = nil + item.icon_mipmaps = nil + 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.fast_replaceable_group = nil + entity.picture.layers[1].tint = items['tint'][8] + entity.picture.layers[1].hr_version.tint = items['tint'][8] + entity.se_allow_in_space = true + data:extend({entity}) + + data:extend({{ + type = 'recipe', + name = 'trash-chest', + energy_required = 2, + enabled = true, + ingredients = {{'steel-chest', 1}}, + result = '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 = '__base__/graphics/icons/pipe.png', + tint = items['tint'][8], + icon_size = 64, + icon_mipmaps = 4 + } + } + + item.icon = nil + item.icon_size = nil + item.icon_mipmaps = nil + 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 + entity.fast_replaceable_group = 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 - if settings.startup['PHI-CT-LAMP'].value then - data.raw['lamp']['small-lamp'].darkness_for_all_lamps_on = 0 - data.raw['lamp']['small-lamp'].darkness_for_all_lamps_off = 0 - data.raw['lamp']['small-lamp'].always_on = true - table.insert(data.raw['lamp']['small-lamp'].signal_to_color_mapping, {type='virtual', name='signal-grey', color={r=128, g=128, b=128}}) - table.insert(data.raw['lamp']['small-lamp'].signal_to_color_mapping, {type='virtual', name='signal-black', color={r=0, g=0, b=0}}) - end + entity.se_allow_in_space = true + data:extend({entity}) - if 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' + data:extend({{ + type = 'recipe', + name = 'trash-pipe', + energy_required = 2, + enabled = true, + ingredients = {{'iron-plate', 1}}, + result = 'trash-pipe' + }}) - item.icons = { + 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-MINER'].value then + local item = table.deepcopy(data.raw['item']['electric-mining-drill']) + item.name = 'large-area-electric-mining-drill' + item.place_result = 'large-area-electric-mining-drill' + item.order = 'zc' + data:extend({item}) + + local entity = table.deepcopy(data.raw['mining-drill']['electric-mining-drill']) + entity.name = 'large-area-electric-mining-drill' + entity.minable.result = 'large-area-electric-mining-drill' + entity.max_health = entity.max_health * 16 + entity.energy_usage = (tonumber(string.match(entity.energy_usage, '%d+')) * 16) .. 'kW' + entity.resource_searching_radius = 9.99 + entity.mining_speed = entity.mining_speed * 16 + entity.energy_source.emissions_per_minute = entity.energy_source.emissions_per_minute * 16 + entity.module_specification.module_slots = 8 + entity.se_allow_in_space = true + data:extend({entity}) + + data:extend({{ + type = 'recipe', + name = 'large-area-electric-mining-drill', + energy_required = 2, + enabled = true, + ingredients = {{'electric-mining-drill', 16}}, + result = 'large-area-electric-mining-drill' + }}) +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 = {{'steel-chest', 1}}, + result = '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 + + data.raw.recipe['loader'].ingredients = { + {'iron-plate', 5}, + {'electronic-circuit', 5}, + {'transport-belt', 2}, + {'inserter', 2} + } + data.raw.recipe['fast-loader'].ingredients = { + {'iron-gear-wheel', 10}, + {'electronic-circuit', 10}, + {'advanced-circuit', 1}, + {'loader', 1} + } + + data.raw.recipe['express-loader'].ingredients = { + {'iron-gear-wheel', 10}, + {'advanced-circuit', 10}, + {'fast-loader', 1} + } + + 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-RECIPE'].value then + data:extend({{ + type = 'recipe', + name = 'wood-production', + energy_required = 10, + enabled = true, + icon = '__base__/graphics/icons/wood.png', + icon_size = 64, + icon_mipmaps = 4, + subgroup = 'intermediate-product', + order = 'za', + ingredients = {{'wood', 10}}, + results = { { - icon = '__base__/graphics/icons/offshore-pump.png', - tint = items['tint'][2], - icon_size = 64, - icon_mipmaps = 4 + name = 'wood', + probability = 0.5, + amount = 10 + }, + { + name = 'wood', + probability = 0.5, + amount = 10 + }, + { + name = 'wood', + probability = 0.5, + amount = 10 + }, + { + name = 'wood', + probability = 0.5, + amount = 10 } } + }}) - item.icon = nil - item.icon_size = nil - item.icon_mipmaps = nil - - 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.se_allow_in_space = true - data:extend({entity}) - - data:extend({{ - type = 'recipe', - name = 'oil-pump', - energy_required = 2, - enabled = true, - ingredients = {{'electronic-circuit', 2}, {'pipe', 1}, {'iron-gear-wheel', 1}}, - result = 'oil-pump' - }}) - end - - if 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 = { + data:extend({{ + type = 'recipe', + name = 'fish-production', + energy_required = 10, + enabled = true, + icon = '__base__/graphics/icons/fish.png', + icon_size = 64, + icon_mipmaps = 4, + subgroup = 'intermediate-product', + order = 'zb', + ingredients = {{'raw-fish', 10}}, + results = { { - icon = '__base__/graphics/icons/radar.png', - tint = items['tint'][8], - icon_size = 64, - icon_mipmaps = 4 + name = 'raw-fish', + probability = 0.5, + amount = 10 + }, + { + name = 'raw-fish', + probability = 0.5, + amount = 10 + }, + { + name = 'raw-fish', + probability = 0.5, + amount = 10 + }, + { + name = 'raw-fish', + probability = 0.5, + amount = 10 } } + }}) - item.icon = nil - item.icon_size = nil - item.icon_mipmaps = nil - 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 = 30 - entity.max_distance_of_nearby_sector_revealed = 30 - entity.pictures.layers[1].tint = items['tint'][8] - entity.pictures.layers[1].hr_version.tint = items['tint'][8] - entity.se_allow_in_space = true - data:extend({entity}) - - data:extend({{ - type = 'recipe', - name = 'super-radar', - energy_required = 2, - enabled = true, - ingredients = {{'electronic-circuit', 5}, {'iron-gear-wheel', 5}, {'iron-plate', 10}}, - result = 'super-radar' - }}) - end - - if 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]-e[trash-chest]' - - item.icons = { - { - icon = '__base__/graphics/icons/steel-chest.png', - tint = items['tint'][8], - icon_size = 64, - icon_mipmaps = 4 - } - } - - item.icon = nil - item.icon_size = nil - item.icon_mipmaps = nil - 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.fast_replaceable_group = nil - entity.picture.layers[1].tint = items['tint'][8] - entity.picture.layers[1].hr_version.tint = items['tint'][8] - entity.se_allow_in_space = true - data:extend({entity}) - - data:extend({{ - type = 'recipe', - name = 'trash-chest', - energy_required = 2, - enabled = true, - ingredients = {{'steel-chest', 1}}, - result = '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 = '__base__/graphics/icons/pipe.png', - tint = items['tint'][8], - icon_size = 64, - icon_mipmaps = 4 - } - } - - item.icon = nil - item.icon_size = nil - item.icon_mipmaps = nil - 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 - entity.fast_replaceable_group = 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 + for k, v in pairs(data.raw.module) do + if v.limitation and string.find(v.name, 'productivity', 1, true) then + table.insert(v.limitation, 'wood-production') + table.insert(v.limitation, 'fish-production') end - - entity.se_allow_in_space = true - data:extend({entity}) - - data:extend({{ - type = 'recipe', - name = 'trash-pipe', - energy_required = 2, - enabled = true, - ingredients = {{'iron-plate', 1}}, - result = 'trash-pipe' - }}) - - table.insert(data.raw.technology['automation'].effects, {type='unlock-recipe', recipe='trash-pipe'}) - end - - if settings.startup['PHI-CT-MINER'].value then - local item = table.deepcopy(data.raw['item']['electric-mining-drill']) - item.name = 'large-area-electric-mining-drill' - item.place_result = 'large-area-electric-mining-drill' - item.order = 'zc' - data:extend({item}) - - local entity = table.deepcopy(data.raw['mining-drill']['electric-mining-drill']) - entity.name = 'large-area-electric-mining-drill' - entity.minable.result = 'large-area-electric-mining-drill' - entity.max_health = entity.max_health * 16 - entity.energy_usage = (tonumber(string.match(entity.energy_usage, '%d+')) * 16) .. 'kW' - entity.resource_searching_radius = 9.99 - entity.mining_speed = entity.mining_speed * 16 - entity.energy_source.emissions_per_minute = entity.energy_source.emissions_per_minute * 16 - entity.module_specification.module_slots = 8 - entity.se_allow_in_space = true - data:extend({entity}) - - data:extend({{ - type = 'recipe', - name = 'large-area-electric-mining-drill', - energy_required = 2, - enabled = true, - ingredients = {{'electric-mining-drill', 16}}, - result = 'large-area-electric-mining-drill' - }}) - end - - if 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 = {{'steel-chest', 1}}, - result = 'linked-chest' - }}) - - table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='linked-chest'}) - end - - if 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 - - data.raw.recipe['loader'].ingredients = { - {'iron-plate', 5}, - {'electronic-circuit', 5}, - {'transport-belt', 2}, - {'inserter', 2} - } - data.raw.recipe['fast-loader'].ingredients = { - {'iron-gear-wheel', 10}, - {'electronic-circuit', 10}, - {'advanced-circuit', 1}, - {'loader', 1} - } - - data.raw.recipe['express-loader'].ingredients = { - {'iron-gear-wheel', 10}, - {'advanced-circuit', 10}, - {'fast-loader', 1} - } - - 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-ENERGY'].value then - local item = table.deepcopy(data.raw['item']['electric-energy-interface']) - item.name = 'passive-energy-void' - item.place_result = '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 = 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.se_allow_in_space = true - data:extend({entity}) - - data:extend({{ - type = 'recipe', - name = 'passive-energy-void', - energy_required = 2, - enabled = false, - ingredients = {{'accumulator', 1}}, - result = 'passive-energy-void' - }}) - - table.insert(data.raw.technology['electric-energy-accumulators'].effects, {type='unlock-recipe', recipe='passive-energy-void'}) end end -if settings.startup['PHI-MI'].value then - data.raw['arithmetic-combinator']['arithmetic-combinator'].energy_source.usage_priority = 'primary-input' - data.raw['decider-combinator']['decider-combinator'].energy_source.usage_priority = 'primary-input' +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' + data:extend({item}) - if settings.startup['PHI-MI-REPAIR'].value then - data.raw['repair-tool']['repair-pack'].speed = 2 * settings.startup['PHI-MI-REPAIR'].value - data.raw['repair-tool']['repair-pack'].durability = 300 * settings.startup['PHI-MI-REPAIR'].value - end + 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 = 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.se_allow_in_space = true + data:extend({entity}) + data:extend({{ + type = 'recipe', + name = 'passive-energy-void', + energy_required = 2, + enabled = false, + ingredients = {{'accumulator', 1}}, + result = 'passive-energy-void' + }}) + + table.insert(data.raw.technology['electric-energy-accumulators'].effects, {type='unlock-recipe', recipe='passive-energy-void'}) +end + +if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-LAMP'].value then + data.raw['lamp']['small-lamp'].darkness_for_all_lamps_on = 0 + data.raw['lamp']['small-lamp'].darkness_for_all_lamps_off = 0 + data.raw['lamp']['small-lamp'].always_on = true + table.insert(data.raw['lamp']['small-lamp'].signal_to_color_mapping, {type='virtual', name='signal-grey', color={r=128, g=128, b=128}}) + table.insert(data.raw['lamp']['small-lamp'].signal_to_color_mapping, {type='virtual', name='signal-black', color={r=0, g=0, b=0}}) +end + +if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-REPAIR'].value then + data.raw['repair-tool']['repair-pack'].speed = 2 * settings.startup['PHI-MI-REPAIR'].value + data.raw['repair-tool']['repair-pack'].durability = 300 * settings.startup['PHI-MI-REPAIR'].value +end + +if settings.startup['PHI-MI'].value and (tonumber(settings.startup['PHI-MI-LANDFILL'].value) ~= 20) then data.raw.recipe['landfill'].ingredients = {{'stone', tonumber(settings.startup['PHI-MI-LANDFILL'].value)}} +end - if settings.startup['PHI-MI-EFFCY'].value then - data.raw['module']['effectivity-module'].effect = {consumption = {bonus = -0.5}, pollution = {bonus = -0.1}} - data.raw['module']['effectivity-module-2'].effect = {consumption = {bonus = -1.0}, pollution = {bonus = -0.15}} - data.raw['module']['effectivity-module-3'].effect = {consumption = {bonus = -1.5}, pollution = {bonus = -0.2}} - end +if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-EFFCY'].value then + data.raw['module']['effectivity-module'].effect = {consumption = {bonus = -0.5}, pollution = {bonus = -0.1}} + data.raw['module']['effectivity-module-2'].effect = {consumption = {bonus = -1.0}, pollution = {bonus = -0.15}} + data.raw['module']['effectivity-module-3'].effect = {consumption = {bonus = -1.5}, pollution = {bonus = -0.2}} +end - if settings.startup['PHI-MI-NUCLEAR'].value then - data.raw['reactor']['nuclear-reactor'].scale_energy_usage = true - end +if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-NUCLEAR'].value then + data.raw['reactor']['nuclear-reactor'].scale_energy_usage = true +end + +if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].value then + data.raw['pipe']['pipe'].fluid_box.height = settings.startup['PHI-MI-PIPE'].value + data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.height = settings.startup['PHI-MI-PIPE'].value + data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.pipe_connections = {{position = {0, -1}}, {position = {0, 1}, max_underground_distance = 10}} + data.raw['pump']['pump'].fluid_box.height = 4 * settings.startup['PHI-MI-PIPE'].value + data.raw['pump']['pump'].pumping_speed = 200 * settings.startup['PHI-MI-PIPE'].value + data.raw['storage-tank']['storage-tank'].fluid_box.height = settings.startup['PHI-MI-PIPE'].value +end + +if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-ROBOT'].value then + data.raw['construction-robot']['construction-robot'].speed = 0.06 * settings.startup['PHI-MI-ROBOT'].value + data.raw['construction-robot']['construction-robot'].max_health = 100 * settings.startup['PHI-MI-ROBOT'].value + data.raw['construction-robot']['construction-robot'].max_payload_size = settings.startup['PHI-MI-ROBOT'].value + data.raw['construction-robot']['construction-robot'].max_energy = (1.5 * settings.startup['PHI-MI-ROBOT'].value) .. 'MJ' + + data.raw['logistic-robot']['logistic-robot'].speed = 0.06 * settings.startup['PHI-MI-ROBOT'].value + data.raw['logistic-robot']['logistic-robot'].max_health = 100 * settings.startup['PHI-MI-ROBOT'].value + data.raw['logistic-robot']['logistic-robot'].max_payload_size = settings.startup['PHI-MI-ROBOT'].value + data.raw['logistic-robot']['logistic-robot'].max_energy = (1.5 * settings.startup['PHI-MI-ROBOT'].value) .. 'MJ' + + data.raw['roboport']['roboport'].max_health = 500 * settings.startup['PHI-MI-ROBOT'].value + data.raw['roboport']['roboport'].energy_usage = 50 * settings.startup['PHI-MI-ROBOT'].value .. 'kW' + data.raw['roboport']['roboport'].energy_source.input_flow_limit = (10 * settings.startup['PHI-MI-ROBOT'].value) .. 'MW' + data.raw['roboport']['roboport'].energy_source.buffer_capacity = (200 * settings.startup['PHI-MI-ROBOT'].value) .. 'MJ' + data.raw['roboport']['roboport'].recharge_minimum = (80 * settings.startup['PHI-MI-ROBOT'].value) .. 'MJ' + data.raw['roboport']['roboport'].charging_energy = (5 * settings.startup['PHI-MI-ROBOT'].value) .. 'MW' + -- data.raw['roboport']['roboport'].logistics_radius = 25 + -- data.raw['roboport']['roboport'].construction_radius = 55 + data.raw['roboport']['roboport'].charging_offsets = { + {-1.5, -0.5}, + {1.5, -0.5}, + {1.5, 1.5}, + {-1.5, 1.5}, + {-2.5, -1.5}, + {2.5, -1.5}, + {2.5, 2.5}, + {-2.5, 2.5} + } +end + +if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].value then + data.raw['locomotive']['locomotive'].max_health = 500 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['locomotive']['locomotive'].max_speed = 0.6 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['locomotive']['locomotive'].max_power = (600 * settings.startup['PHI-MI-TRAIN'].value) .. 'kW' + data.raw['locomotive']['locomotive'].reversing_power_modifier = 1 + data.raw['locomotive']['locomotive'].energy_per_hit_point = 4 + settings.startup['PHI-MI-TRAIN'].value + data.raw['locomotive']['locomotive'].braking_force = 5 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['locomotive']['locomotive'].friction_force = 0.50 - (0.05 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['locomotive']['locomotive'].air_resistance = 0.0075 - (0.0007 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['locomotive']['locomotive'].burner.effectivity = 0.5 + (0.5 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['locomotive']['locomotive'].burner.fuel_inventory_size = 3 + + data.raw['cargo-wagon']['cargo-wagon'].max_health = 300 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['cargo-wagon']['cargo-wagon'].max_speed = 0.6 * (2 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['cargo-wagon']['cargo-wagon'].braking_force = 1.5 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['cargo-wagon']['cargo-wagon'].friction_force = 0.50 - (0.05 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['cargo-wagon']['cargo-wagon'].air_resistance = 0.01 - (0.001 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['cargo-wagon']['cargo-wagon'].inventory_size = 5 * (7 + settings.startup['PHI-MI-TRAIN'].value) + + data.raw['fluid-wagon']['fluid-wagon'].max_health = 300 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['fluid-wagon']['fluid-wagon'].max_speed = 0.6 * (2 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['fluid-wagon']['fluid-wagon'].braking_force = 1.5 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['fluid-wagon']['fluid-wagon'].friction_force = 0.50 - (0.05 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['fluid-wagon']['fluid-wagon'].air_resistance = 0.01 - (0.001 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['fluid-wagon']['fluid-wagon'].capacity = 3125 * (7 + settings.startup['PHI-MI-TRAIN'].value) + + data.raw['artillery-wagon']['artillery-wagon'].max_health = 300 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['artillery-wagon']['artillery-wagon'].max_speed = 0.6 * (2 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['artillery-wagon']['artillery-wagon'].braking_force = 1.5 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['artillery-wagon']['artillery-wagon'].friction_force = 0.50 - (0.05 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['artillery-wagon']['artillery-wagon'].air_resistance = 0.015 - (0.0015 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['artillery-wagon']['artillery-wagon'].turret_rotation_speed = 0.0005 * (1 + settings.startup['PHI-MI-TRAIN'].value) +end + +if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].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]' + data:extend({item}) + + local entity = table.deepcopy(data.raw['boiler']['boiler']) + entity.name = 'electric-boiler' + entity.energy_consumption = '7200kW' + entity.target_temperature = 165 if settings.startup['PHI-MI-PIPE'].value then - data.raw['pipe']['pipe'].fluid_box.height = settings.startup['PHI-MI-PIPE'].value - data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.height = settings.startup['PHI-MI-PIPE'].value - data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.pipe_connections = {{position = {0, -1}}, {position = {0, 1}, max_underground_distance = 10}} - data.raw['pump']['pump'].fluid_box.height = 4 * settings.startup['PHI-MI-PIPE'].value - data.raw['pump']['pump'].pumping_speed = 200 * settings.startup['PHI-MI-PIPE'].value - data.raw['storage-tank']['storage-tank'].fluid_box.height = settings.startup['PHI-MI-PIPE'].value + entity.fluid_box.height = settings.startup['PHI-MI-PIPE'].value + entity.output_fluid_box.height = settings.startup['PHI-MI-PIPE'].value + entity.output_fluid_box.base_level = entity.output_fluid_box.base_level + settings.startup['PHI-MI-PIPE'].value end - if settings.startup['PHI-MI-ROBOT'].value then - data.raw['construction-robot']['construction-robot'].speed = 0.06 * settings.startup['PHI-MI-ROBOT'].value - data.raw['construction-robot']['construction-robot'].max_health = 100 * settings.startup['PHI-MI-ROBOT'].value - data.raw['construction-robot']['construction-robot'].max_payload_size = settings.startup['PHI-MI-ROBOT'].value - data.raw['construction-robot']['construction-robot'].max_energy = (1.5 * settings.startup['PHI-MI-ROBOT'].value) .. 'MJ' + entity.minable = {hardness = 0.2, mining_time = 0.5, result = 'electric-boiler'} + entity.emissions_per_minute = 0 + entity.energy_source.type = 'electric' + entity.energy_source.fuel_inventory_size = 0 + entity.energy_source.input_priority = 'secondary' + entity.energy_source.usage_priority = 'secondary-input' + entity.energy_source.light_flicker.color = {r=0.5, g=1, b=1, a=0.5} + entity.energy_source.light_flicker.minimum_light_size = 0.1 + entity.energy_source.light_flicker.light_intensity_to_size_coefficient = 1 + entity.fire_flicker_enabled = false + entity.fire_glow_flicker_enabled = false + entity.fire = {} + data:extend({entity}) - data.raw['logistic-robot']['logistic-robot'].speed = 0.06 * settings.startup['PHI-MI-ROBOT'].value - data.raw['logistic-robot']['logistic-robot'].max_health = 100 * settings.startup['PHI-MI-ROBOT'].value - data.raw['logistic-robot']['logistic-robot'].max_payload_size = settings.startup['PHI-MI-ROBOT'].value - data.raw['logistic-robot']['logistic-robot'].max_energy = (1.5 * settings.startup['PHI-MI-ROBOT'].value) .. 'MJ' + data:extend({{ + type = 'recipe', + name = 'electric-boiler', + energy_required = 2, + enabled = true, + ingredients = {{name='boiler', amount=1}, {name='electronic-circuit', amount=1}}, + result = 'electric-boiler', + }}) - data.raw['roboport']['roboport'].max_health = 500 * settings.startup['PHI-MI-ROBOT'].value - data.raw['roboport']['roboport'].energy_usage = 50 * settings.startup['PHI-MI-ROBOT'].value .. 'kW' - data.raw['roboport']['roboport'].energy_source.input_flow_limit = (10 * settings.startup['PHI-MI-ROBOT'].value) .. 'MW' - data.raw['roboport']['roboport'].energy_source.buffer_capacity = (200 * settings.startup['PHI-MI-ROBOT'].value) .. 'MJ' - data.raw['roboport']['roboport'].recharge_minimum = (80 * settings.startup['PHI-MI-ROBOT'].value) .. 'MJ' - data.raw['roboport']['roboport'].charging_energy = (5 * settings.startup['PHI-MI-ROBOT'].value) .. 'MW' - -- data.raw['roboport']['roboport'].logistics_radius = 25 - -- data.raw['roboport']['roboport'].construction_radius = 55 - data.raw['roboport']['roboport'].charging_offsets = { - {-1.5, -0.5}, - {1.5, -0.5}, - {1.5, 1.5}, - {-1.5, 1.5}, - {-2.5, -1.5}, - {2.5, -1.5}, - {2.5, 2.5}, - {-2.5, 2.5} - } - end + -- 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-TRAIN'].value then - data.raw['locomotive']['locomotive'].max_health = 500 * (1 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['locomotive']['locomotive'].max_speed = 0.6 * (1 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['locomotive']['locomotive'].max_power = (600 * settings.startup['PHI-MI-TRAIN'].value) .. 'kW' - data.raw['locomotive']['locomotive'].reversing_power_modifier = 1 - data.raw['locomotive']['locomotive'].energy_per_hit_point = 4 + settings.startup['PHI-MI-TRAIN'].value - data.raw['locomotive']['locomotive'].braking_force = 5 * (1 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['locomotive']['locomotive'].friction_force = 0.50 - (0.05 * settings.startup['PHI-MI-TRAIN'].value) - data.raw['locomotive']['locomotive'].air_resistance = 0.0075 - (0.0007 * settings.startup['PHI-MI-TRAIN'].value) - data.raw['locomotive']['locomotive'].burner.effectivity = 0.5 + (0.5 * settings.startup['PHI-MI-TRAIN'].value) - data.raw['locomotive']['locomotive'].burner.fuel_inventory_size = 3 +if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-CHEST'].value then + local chests = { + 'steel-chest', + 'logistic-chest-passive-provider', + 'logistic-chest-active-provider', + 'logistic-chest-storage', + 'logistic-chest-buffer', + 'logistic-chest-requester' + } - data.raw['cargo-wagon']['cargo-wagon'].max_health = 300 * (1 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['cargo-wagon']['cargo-wagon'].max_speed = 0.6 * (2 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['cargo-wagon']['cargo-wagon'].braking_force = 1.5 * (1 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['cargo-wagon']['cargo-wagon'].friction_force = 0.50 - (0.05 * settings.startup['PHI-MI-TRAIN'].value) - data.raw['cargo-wagon']['cargo-wagon'].air_resistance = 0.01 - (0.001 * settings.startup['PHI-MI-TRAIN'].value) - data.raw['cargo-wagon']['cargo-wagon'].inventory_size = 5 * (7 + settings.startup['PHI-MI-TRAIN'].value) + for i=1, #chests, 1 do + local item = table.deepcopy(data.raw['item'][chests[i]]) + local entity - data.raw['fluid-wagon']['fluid-wagon'].max_health = 300 * (1 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['fluid-wagon']['fluid-wagon'].max_speed = 0.6 * (2 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['fluid-wagon']['fluid-wagon'].braking_force = 1.5 * (1 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['fluid-wagon']['fluid-wagon'].friction_force = 0.50 - (0.05 * settings.startup['PHI-MI-TRAIN'].value) - data.raw['fluid-wagon']['fluid-wagon'].air_resistance = 0.01 - (0.001 * settings.startup['PHI-MI-TRAIN'].value) - data.raw['fluid-wagon']['fluid-wagon'].capacity = 3125 * (7 + settings.startup['PHI-MI-TRAIN'].value) + if chests[i] == 'steel-chest' then + entity = table.deepcopy(data.raw['container'][chests[i]]) - data.raw['artillery-wagon']['artillery-wagon'].max_health = 300 * (1 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['artillery-wagon']['artillery-wagon'].max_speed = 0.6 * (2 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['artillery-wagon']['artillery-wagon'].braking_force = 1.5 * (1 + settings.startup['PHI-MI-TRAIN'].value) - data.raw['artillery-wagon']['artillery-wagon'].friction_force = 0.50 - (0.05 * settings.startup['PHI-MI-TRAIN'].value) - data.raw['artillery-wagon']['artillery-wagon'].air_resistance = 0.015 - (0.0015 * settings.startup['PHI-MI-TRAIN'].value) - data.raw['artillery-wagon']['artillery-wagon'].turret_rotation_speed = 0.0005 * (1 + settings.startup['PHI-MI-TRAIN'].value) - end - - if 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]' - data:extend({item}) - - local entity = table.deepcopy(data.raw['boiler']['boiler']) - entity.name = 'electric-boiler' - entity.energy_consumption = '7200kW' - entity.target_temperature = 165 - - if settings.startup['PHI-MI-PIPE'].value then - entity.fluid_box.height = settings.startup['PHI-MI-PIPE'].value - entity.output_fluid_box.height = settings.startup['PHI-MI-PIPE'].value - entity.output_fluid_box.base_level = entity.output_fluid_box.base_level + settings.startup['PHI-MI-PIPE'].value + else + entity = table.deepcopy(data.raw['logistic-container'][chests[i]]) end - entity.minable = {hardness = 0.2, mining_time = 0.5, result = 'electric-boiler'} - entity.emissions_per_minute = 0 - entity.energy_source.type = 'electric' - entity.energy_source.fuel_inventory_size = 0 - entity.energy_source.input_priority = 'secondary' - entity.energy_source.usage_priority = 'secondary-input' - entity.energy_source.light_flicker.color = {r=0.5, g=1, b=1, a=0.5} - entity.energy_source.light_flicker.minimum_light_size = 0.1 - entity.energy_source.light_flicker.light_intensity_to_size_coefficient = 1 - entity.fire_flicker_enabled = false - entity.fire_glow_flicker_enabled = false - entity.fire = {} + item.name = 'basic-' .. chests[i] + item.place_result = 'basic-' .. chests[i] + item.order = 'b[storage]-d[basic-' .. item.order .. ']' + data:extend({item}) + + entity.inventory_type = 'with_filters_and_bar' + entity.inventory_size = 1 + entity.name = 'basic-' .. chests[i] + entity.minable.result = 'basic-' .. chests[i] data:extend({entity}) data:extend({{ type = 'recipe', - name = 'electric-boiler', + name = 'basic-' .. chests[i], energy_required = 2, - enabled = true, - ingredients = {{name='boiler', amount=1}, {name='electronic-circuit', amount=1}}, - result = 'electric-boiler', + enabled = false, + ingredients = {{chests[i], 1}}, + result = 'basic-' .. chests[i], }}) - - -- 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-CHEST'].value then - local chests = { - 'steel-chest', - 'logistic-chest-passive-provider', - 'logistic-chest-active-provider', - 'logistic-chest-storage', - 'logistic-chest-buffer', - 'logistic-chest-requester' - } - - for i=1, #chests, 1 do - local item = table.deepcopy(data.raw['item'][chests[i]]) - local entity - - if chests[i] == 'steel-chest' then - entity = table.deepcopy(data.raw['container'][chests[i]]) - - else - entity = table.deepcopy(data.raw['logistic-container'][chests[i]]) - end - - item.name = 'basic-' .. chests[i] - item.place_result = 'basic-' .. chests[i] - item.order = 'b[storage]-d[basic-' .. item.order .. ']' - data:extend({item}) - - entity.inventory_type = 'with_filters_and_bar' - entity.inventory_size = 1 - entity.name = 'basic-' .. chests[i] - entity.minable.result = 'basic-' .. chests[i] - data:extend({entity}) - - data:extend({{ - type = 'recipe', - name = 'basic-' .. chests[i], - energy_required = 2, - enabled = false, - ingredients = {{chests[i], 1}}, - result = 'basic-' .. chests[i], - }}) - end - - table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='basic-steel-chest'}) - table.insert(data.raw.technology['construction-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-passive-provider'}) - table.insert(data.raw.technology['construction-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-storage'}) - table.insert(data.raw.technology['logistic-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-passive-provider'}) - table.insert(data.raw.technology['logistic-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-storage'}) - table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-active-provider'}) - table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-buffer'}) - table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-requester'}) - end + table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='basic-steel-chest'}) + table.insert(data.raw.technology['construction-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-passive-provider'}) + table.insert(data.raw.technology['construction-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-storage'}) + table.insert(data.raw.technology['logistic-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-passive-provider'}) + table.insert(data.raw.technology['logistic-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-storage'}) + table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-active-provider'}) + table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-buffer'}) + table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-requester'}) end for k, v in pairs(items['setting']) do diff --git a/PHI-CL/info.json b/PHI-CL/info.json index 7574dee..bbf5429 100644 --- a/PHI-CL/info.json +++ b/PHI-CL/info.json @@ -1,8 +1,8 @@ { "name": "PHI-CL", - "version": "2.0.30", + "version": "2.0.32", "factorio_version": "1.1", - "date": "2024-09-07", + "date": "2024-09-14", "title": "Phidias Collection", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index 9256ff2..8dc96f1 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -848,90 +848,90 @@ empty-world=Empty world empty-world=Useful for design [mod-setting-name] -PHI-EN=Energy -PHI-MB=Megabase -PHI-WE=Military -PHI-EQ=Equipment -PHI-MI=Megabase item -PHI-RS=Recipe -PHI-XC=Clock -PHI-PB=Bonus -PHI-CT=Creative +PHI-EN=EN Enable compound energy +PHI-EN-SOLAR-TIER=EN1 Solar panel tier +PHI-EN-STEAM-TIER=EN2 Steam engine tier +PHI-EN-NUCLEAR-TIER=EN3 Nuclear reactor tier -PHI-EN-SOLAR-TIER=Solar panel, max grade -PHI-EN-STEAM-TIER=Steam engine, max grade -PHI-EN-NUCLEAR-TIER=Nuclear reactor, max grade +PHI-MB=MB Enable fast machine +PHI-MB-ASSEMBLING-TIER=MB1 Assembling machine tier +PHI-MB-FURNACE-TIER=MB2 Electric furnace tier +PHI-MB-OIL-TIER=MB3 Oil refinery tier +PHI-MB-CENTRIFUGE-TIER=MB4 Centrifuge tier +PHI-MB-LAB-TIER=MB5 Lab tier +PHI-MB-MINING-TIER=MB6 Electric mining drill tier +PHI-MB-SE-ASSEMBLING-TIER=MB7 Space exploration tier -PHI-MB-ASSEMBLING-TIER=Assembling machine, max grade -PHI-MB-FURNACE-TIER=Electric furnace, max grade -PHI-MB-OIL-TIER=Oil refinery, max grade -PHI-MB-CENTRIFUGE-TIER=Centrifuge, max grade -PHI-MB-LAB-TIER=Lab, max grade -PHI-MB-MINING-TIER=Electric mining drill, max grade -PHI-MB-SE-ASSEMBLING-TIER=Space exploration, max grade +PHI-WE=WE Enable military defense +PHI-WE-LASER-TIER=WE1 Laser turret tier +PHI-WE-FLAME-TIER=WE2 Flamethrower turret tier +PHI-WE-GUN-TIER=WE3 Gun turret tier +PHI-WE-RADAR-TIER=WE4 Radar tier -PHI-WE-LASER-TIER=Laser turret, max grade -PHI-WE-FLAME-TIER=Flamethrower turret, max grade -PHI-WE-GUN-TIER=Gun turret, max grade -PHI-WE-RADAR-TIER=Radar, max grade +PHI-EQ=EQ Armor equipment +PHI-EQ-SOLAR-TIER=EQ1 Portable solar panel tier +PHI-EQ-BATTERY-TIER=EQ2 Personal battery tier +PHI-EQ-REACTOR-TIER=EQ3 Portable fusion reactor tier +PHI-EQ-LASER-TIER=EQ4 Personal laser defense tier +PHI-EQ-ROBOPORT-TIER=EQ5 Personal roboport tier +PHI-EQ-SHIELD-TIER=EQ6 Energy shield tier +PHI-EQ-NIGHT-TIER=EQ7 Nightvision equipment tier +PHI-EQ-EXO-TIER=EQ8 Exoskeleton tier +PHI-EQ-ARMOR=EQ9 Enable Power armor 3 -PHI-EQ-SOLAR-TIER=Portable solar panel, max grade -PHI-EQ-BATTERY-TIER=Personal battery, max grade -PHI-EQ-REACTOR-TIER=Portable fusion reactor, max grade -PHI-EQ-LASER-TIER=Personal laser defense, max grade -PHI-EQ-ROBOPORT-TIER=Personal roboport, max grade -PHI-EQ-SHIELD-TIER=Energy shield, max grade -PHI-EQ-NIGHT-TIER=Nightvision equipment, max grade -PHI-EQ-EXO-TIER=Exoskeleton, max grade -PHI-EQ-ARMOR=Power armor 3 enable +PHI-MI=MI Miscellaneous change +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-LANDFILL=Landfill requirement -PHI-MI-EFFCY=Efficiency module efficiency -PHI-MI-NUCLEAR=Nuclear adjustable output -PHI-MI-BOILER=Electric boiler -PHI-MI-CHEST=Basic chest -PHI-MI-REPAIR=Repair efficiency -PHI-MI-PIPE=Pipe efficiency -PHI-MI-ROBOT=Robot efficiency -PHI-MI-TRAIN=Train efficiency +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-RS-RECIPE-1=Recipe scale 1 -PHI-RS-RECIPE-2=Recipe scale 2 -PHI-RS-RECIPE-DROF=Dynamic Recipe Overload Factor -PHI-RS-RECIPE-MINROM=Minimum Recipe Overload Multiplier -PHI-RS-RECIPE-MAXROM=Maximum Recipe Overload Multiplier -PHI-RS-MODULE=Module +PHI-XW-WATER=XW Water anywhere -PHI-XW-WATER=Water +PHI-XC=XC Clock GUI -PHI-PB-CMMS=Character manual mining speed -PHI-PB-CRS=Character running speed -PHI-PB-CCS=Character crafting speed -PHI-PB-CISB=Character inventory slots bonus -PHI-PB-CHB=Character health bonus -PHI-PB-CRDB=Character reach distance bonus -PHI-PB-FMMS=Force manual mining speed -PHI-PB-FRS=Force running speed -PHI-PB-FCS=Force crafting speed -PHI-PB-FISB=Force inventory slots bonus -PHI-PB-FHB=Force health bonus -PHI-PB-FRDB=Force reach distance bonus -PHI-PB-FWRSM=Force worker robots speed modifier -PHI-PB-FWRBM=Force worker robots battery modifier -PHI-PB-FWRSB=Force worker robots storage bonus -PHI-PB-FFRLM=Force following robots lifetime modifier +PHI-PB=PB Bonus command +PHI-PB-CMMS=PBA1 Character manual mining speed +PHI-PB-CRS=PBA2 Character running speed +PHI-PB-CCS=PBA3 Character crafting speed +PHI-PB-CISB=PBA4 Character inventory slots bonus +PHI-PB-CHB=PBA5 Character health bonus +PHI-PB-CRDB=PBA6 Character reach distance bonus +PHI-PB-FMMS=PBB1 Force manual mining speed +PHI-PB-FRS=PBB2 Force running speed +PHI-PB-FCS=PBB3 Force crafting speed +PHI-PB-FISB=PBB4 Force inventory slots bonus +PHI-PB-FHB=PBB5 Force health bonus +PHI-PB-FRDB=PBB6 Force reach distance bonus +PHI-PB-FWRSM=PBB7 Force worker robots speed modifier +PHI-PB-FWRBM=PBB8 Force worker robots battery modifier +PHI-PB-FWRSB=PBB9 Force worker robots storage bonus +PHI-PB-FFRLM=PBB10 Force following robots lifetime modifier -PHI-CT-OIL=Oil -PHI-CT-RADAR=Radar -PHI-CT-TILE=World tile -PHI-CT-TILE-CHOICE=Tile choice -PHI-CT-TRASH=Trash chest -PHI-CT-MINER=Large miner -PHI-CT-LINKED=Linked chest -PHI-CT-LOADER=Loader enable -PHI-CT-RECIPE=Recipe -PHI-CT-ENERGY=Energy -PHI-CT-LAMP=Lamp +PHI-CT=CT Creative testing tools +PHI-CT-OIL=CT1 Oil +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-MINER=CT6 Large miner +PHI-CT-LINKED=CT7 Linked chest +PHI-CT-LOADER=CT8 Loader enable +PHI-CT-RECIPE=CT9 Recipe +PHI-CT-ENERGY=CT10 Energy +PHI-CT-LAMP=CT11 Lamp [mod-setting-description] PHI-EN-SOLAR-TIER=Default 8 ; Disable 1 diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg index 5ca066f..ca54cac 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -848,90 +848,90 @@ empty-world=空の世界 empty-world=デザインに役立つ [mod-setting-name] -PHI-EN=エネルギー -PHI-MB=メガベース -PHI-WE=軍事 -PHI-EQ=設備 -PHI-MI=メガベースアイテム -PHI-RS=レシピ -PHI-XC=時計 -PHI-PB=ボーナス -PHI-CT=クリエイティブ +PHI-EN=EN 複合発電を有効にする +PHI-EN-SOLAR-TIER=EN1 ソーラーパネルの最高等級 +PHI-EN-STEAM-TIER=EN2 蒸気機関の最高等級 +PHI-EN-NUCLEAR-TIER=EN3 原子炉の最高等級 -PHI-EN-SOLAR-TIER=ソーラーパネルの最高等級 -PHI-EN-STEAM-TIER=蒸気機関の最高等級 -PHI-EN-NUCLEAR-TIER=原子炉の最高等級 +PHI-MB=MB より速く機械を有効にする +PHI-MB-ASSEMBLING-TIER=MB1 組立機の最高等級 +PHI-MB-FURNACE-TIER=MB2 電気炉の最高等級 +PHI-MB-OIL-TIER=MB3 原油精製所の最高等級 +PHI-MB-CENTRIFUGE-TIER=MB4 遠心分離機の最高等級 +PHI-MB-LAB-TIER=MB5 研究所の最高等級 +PHI-MB-MINING-TIER=MB6 電動掘削機の最高等級 +PHI-MB-SE-ASSEMBLING-TIER=MB7 Space explorationの最高等級 -PHI-MB-ASSEMBLING-TIER=組立機の最高等級 -PHI-MB-FURNACE-TIER=電気炉の最高等級 -PHI-MB-OIL-TIER=原油精製所の最高等級 -PHI-MB-CENTRIFUGE-TIER=遠心分離機の最高等級 -PHI-MB-LAB-TIER=研究所の最高等級 -PHI-MB-MINING-TIER=電動掘削機の最高等級 -PHI-MB-SE-ASSEMBLING-TIER=Space explorationの最高等級 +PHI-WE=WE 軍事防衛を有効にする +PHI-WE-LASER-TIER=WE1 レーザータレットの最高等級 +PHI-WE-FLAME-TIER=WE2 火炎放射タレットの最高等級 +PHI-WE-GUN-TIER=WE3 ガンタレットの最高等級 +PHI-WE-RADAR-TIER=WE4 レーダーの最高等級 -PHI-WE-LASER-TIER=レーザータレットの最高等級 -PHI-WE-FLAME-TIER=火炎放射タレットの最高等級 -PHI-WE-GUN-TIER=ガンタレットの最高等級 -PHI-WE-RADAR-TIER=レーダーの最高等級 +PHI-EQ=EQ アーマー設備を有効にする +PHI-EQ-SOLAR-TIER=EQ1 携帯ソーラーパネルモジュールの最高等級 +PHI-EQ-BATTERY-TIER=EQ2 個人用バッテリーの最高等級 +PHI-EQ-REACTOR-TIER=EQ3 携帯核融合炉モジュールの最高等級 +PHI-EQ-LASER-TIER=EQ4 携帯レーザー防御モジュールの最高等級 +PHI-EQ-ROBOPORT-TIER=EQ5 携帯ロボットステーションの最高等級 +PHI-EQ-SHIELD-TIER=EQ6 エネルギーシールドモジュールの最高等級 +PHI-EQ-NIGHT-TIER=EQ7 暗視モジュールの最高等級 +PHI-EQ-EXO-TIER=EQ8 強化外骨格モジュールの最高等級 +PHI-EQ-ARMOR=EQ9 パワーアーマー3代を有効にする -PHI-EQ-SOLAR-TIER=携帯ソーラーパネルモジュールの最高等級 -PHI-EQ-BATTERY-TIER=個人用バッテリーの最高等級 -PHI-EQ-REACTOR-TIER=携帯核融合炉モジュールの最高等級 -PHI-EQ-LASER-TIER=携帯レーザー防御モジュールの最高等級 -PHI-EQ-ROBOPORT-TIER=携帯ロボットステーションの最高等級 -PHI-EQ-SHIELD-TIER=エネルギーシールドモジュールの最高等級 -PHI-EQ-NIGHT-TIER=暗視モジュールの最高等級 -PHI-EQ-EXO-TIER=強化外骨格モジュールの最高等級 -PHI-EQ-ARMOR=パワーアーマー3代を有効にする +PHI-MI=MI その他の変更 +PHI-MI-LANDFILL=MI2 埋立地要件 +PHI-MI-EFFCY=MI3 エネルギー効率モジュール効率 +PHI-MI-NUCLEAR=MI4 原子炉出力の調整可能 +PHI-MI-BOILER=MI5 電気ボイラー +PHI-MI-CHEST=MI6 基本的な貯蔵チェスト +PHI-MI-REPAIR=MI7 リペア効率 +PHI-MI-PIPE=MI8 パイプ効率 +PHI-MI-ROBOT=MI9 ロボット効率 +PHI-MI-TRAIN=MI10 列車効率 -PHI-MI-LANDFILL=埋立地要件 -PHI-MI-EFFCY=エネルギー効率モジュール効率 -PHI-MI-NUCLEAR=原子炉出力の調整可能 -PHI-MI-BOILER=電気ボイラー -PHI-MI-CHEST=基本的な貯蔵チェスト -PHI-MI-REPAIR=リペア効率 -PHI-MI-PIPE=パイプ効率 -PHI-MI-ROBOT=ロボット効率 -PHI-MI-TRAIN=列車効率 +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-RS-RECIPE-1=レシピ規模 1 -PHI-RS-RECIPE-2=レシピ規模 2 -PHI-RS-RECIPE-DROF=Dynamic Recipe Overload Factor -PHI-RS-RECIPE-MINROM=Minimum Recipe Overload Multiplier -PHI-RS-RECIPE-MAXROM=Maximum Recipe Overload Multiplier -PHI-RS-MODULE=モジュール +PHI-XW-WATER=XW どこでも水 -PHI-XW-WATER=水 +PHI-XC=XC 時計 GUI -PHI-PB-CMMS=Character manual mining speed -PHI-PB-CRS=Character running speed -PHI-PB-CCS=Character crafting speed -PHI-PB-CISB=Character inventory slots bonus -PHI-PB-CHB=Character health bonus -PHI-PB-CRDB=Character reach distance bonus -PHI-PB-FMMS=Force manual mining speed -PHI-PB-FRS=Force running speed -PHI-PB-FCS=Force crafting speed -PHI-PB-FISB=Force inventory slots bonus -PHI-PB-FHB=Force health bonus -PHI-PB-FRDB=Force reach distance bonus -PHI-PB-FWRSM=Force worker robots speed modifier -PHI-PB-FWRBM=Force worker robots battery modifier -PHI-PB-FWRSB=Force worker robots storage bonus -PHI-PB-FFRLM=Force following robots lifetime modifier +PHI-PB=PB ボーナス コマンド +PHI-PB-CMMS=PBA1 Character manual mining speed +PHI-PB-CRS=PBA2 Character running speed +PHI-PB-CCS=PBA3 Character crafting speed +PHI-PB-CISB=PBA4 Character inventory slots bonus +PHI-PB-CHB=PBA5 Character health bonus +PHI-PB-CRDB=PBA6 Character reach distance bonus +PHI-PB-FMMS=PBB1 Force manual mining speed +PHI-PB-FRS=PBB2 Force running speed +PHI-PB-FCS=PBB3 Force crafting speed +PHI-PB-FISB=PBB4 Force inventory slots bonus +PHI-PB-FHB=PBB5 Force health bonus +PHI-PB-FRDB=PBB6 Force reach distance bonus +PHI-PB-FWRSM=PBB7 Force worker robots speed modifier +PHI-PB-FWRBM=PBB8 Force worker robots battery modifier +PHI-PB-FWRSB=PBB9 Force worker robots storage bonus +PHI-PB-FFRLM=PBB10 Force following robots lifetime modifier -PHI-CT-OIL=原油 -PHI-CT-RADAR=レーダー -PHI-CT-TILE=ワールドタイル -PHI-CT-TILE-CHOICE=ドタイル選択 -PHI-CT-TRASH=ごみチェスト -PHI-CT-MINER=大型電動掘削機 -PHI-CT-LINKED=リンクされたチェスト -PHI-CT-LOADER=ローダーを有効にする -PHI-CT-RECIPE=レシピ -PHI-CT-ENERGY=エネルギー -PHI-CT-LAMP=ランプ +PHI-CT=CT クリエイティブテストツール +PHI-CT-OIL=CT1 原油 +PHI-CT-RADAR=CT2 レーダー +PHI-CT-TILE=CT3 ワールドタイル +PHI-CT-TILE-CHOICE=CT4 ドタイル選択 +PHI-CT-TRASH=CT5 ごみチェスト +PHI-CT-MINER=CT6 大型電動掘削機 +PHI-CT-LINKED=CT7 リンクされたチェスト +PHI-CT-LOADER=CT8 ローダーを有効にする +PHI-CT-RECIPE=CT9 レシピ +PHI-CT-ENERGY=CT10 エネルギー +PHI-CT-LAMP=CT11 ランプ [mod-setting-description] PHI-EN-SOLAR-TIER=デフォルト 8 ; 止める 1 diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg index c2b4bc3..2d3417f 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -848,90 +848,90 @@ empty-world=空的世界 empty-world=對設計有用 [mod-setting-name] -PHI-EN=能量 -PHI-MB=大型基地 -PHI-WE=軍事 -PHI-EQ=設備 -PHI-MI=大型基地物品 -PHI-RS=配方 -PHI-XC=時鐘 -PHI-PB=附加 -PHI-CT=創意 +PHI-EN=EN 啟用複合發電 +PHI-EN-SOLAR-TIER=EN1 太陽能板的最高等級 +PHI-EN-STEAM-TIER=EN2 蒸汽發電機的最高等級 +PHI-EN-NUCLEAR-TIER=EN3 核能反應爐的最高等級 -PHI-EN-SOLAR-TIER=太陽能板的最高等級 -PHI-EN-STEAM-TIER=蒸汽發電機的最高等級 -PHI-EN-NUCLEAR-TIER=核能反應爐的最高等級 +PHI-MB=MB 啟用快速機器 +PHI-MB-ASSEMBLING-TIER=MB1 組裝機的最高等級 +PHI-MB-FURNACE-TIER=MB2 電爐的最高等級 +PHI-MB-OIL-TIER=MB3 煉油廠的最高等級 +PHI-MB-CENTRIFUGE-TIER=MB4 離心機的最高等級 +PHI-MB-LAB-TIER=MB5 實驗室的最高等級 +PHI-MB-MINING-TIER=MB6 電能採礦機的最高等級 +PHI-MB-SE-ASSEMBLING-TIER=MB7 Space exploration的最高等級 -PHI-MB-ASSEMBLING-TIER=組裝機的最高等級 -PHI-MB-FURNACE-TIER=電爐的最高等級 -PHI-MB-OIL-TIER=煉油廠的最高等級 -PHI-MB-CENTRIFUGE-TIER=離心機的最高等級 -PHI-MB-LAB-TIER=實驗室的最高等級 -PHI-MB-MINING-TIER=電能採礦機的最高等級 -PHI-MB-SE-ASSEMBLING-TIER=Space exploration的最高等級 +PHI-WE=WE 啟用軍事防禦 +PHI-WE-LASER-TIER=WE1 雷射炮塔的最高等級 +PHI-WE-FLAME-TIER=WE2 火焰噴射器的最高等級 +PHI-WE-GUN-TIER=WE3 機槍炮塔的最高等級 +PHI-WE-RADAR-TIER=WE4 雷達的最高等級 -PHI-WE-LASER-TIER=雷射炮塔的最高等級 -PHI-WE-FLAME-TIER=火焰噴射器的最高等級 -PHI-WE-GUN-TIER=機槍炮塔的最高等級 -PHI-WE-RADAR-TIER=雷達的最高等級 +PHI-EQ=EQ 啟用裝甲設備 +PHI-EQ-SOLAR-TIER=EQ1 攜帶式太陽能板的最高等級 +PHI-EQ-BATTERY-TIER=EQ2 電池設備的最高等級 +PHI-EQ-REACTOR-TIER=EQ3 攜帶式核融合反應器的最高等級 +PHI-EQ-LASER-TIER=EQ4 個人雷射防禦的最高等級 +PHI-EQ-ROBOPORT-TIER=EQ5 機動無人機調度站的最高等級 +PHI-EQ-SHIELD-TIER=EQ6 能量護盾的最高等級 +PHI-EQ-NIGHT-TIER=EQ7 夜視鏡的最高等級 +PHI-EQ-EXO-TIER=EQ8 動力外骨骼的最高等級 +PHI-EQ-ARMOR=EQ9 動力護甲3代啟用 -PHI-EQ-SOLAR-TIER=攜帶式太陽能板的最高等級 -PHI-EQ-BATTERY-TIER=電池設備的最高等級 -PHI-EQ-REACTOR-TIER=攜帶式核融合反應器的最高等級 -PHI-EQ-LASER-TIER=個人雷射防禦的最高等級 -PHI-EQ-ROBOPORT-TIER=機動無人機調度站的最高等級 -PHI-EQ-SHIELD-TIER=能量護盾的最高等級 -PHI-EQ-NIGHT-TIER=夜視鏡的最高等級 -PHI-EQ-EXO-TIER=動力外骨骼的最高等級 -PHI-EQ-ARMOR=動力護甲3代啟用 +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-LANDFILL=人造陸地需求 -PHI-MI-EFFCY=節能組件效率 -PHI-MI-NUCLEAR=核能反應爐可調輸出 -PHI-MI-BOILER=電鍋爐 -PHI-MI-CHEST=基本的儲藏箱 -PHI-MI-REPAIR=維修效率 -PHI-MI-PIPE=水管效率 -PHI-MI-ROBOT=無人機效率 -PHI-MI-TRAIN=火車效率 +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-RS-RECIPE-1=配方規模 1 -PHI-RS-RECIPE-2=配方規模 2 -PHI-RS-RECIPE-DROF=Dynamic Recipe Overload Factor -PHI-RS-RECIPE-MINROM=Minimum Recipe Overload Multiplier -PHI-RS-RECIPE-MAXROM=Maximum Recipe Overload Multiplier -PHI-RS-MODULE=模組 +PHI-XW-WATER=XW 隨處水源 -PHI-XW-WATER=水 +PHI-XC=XC 時鐘介面 -PHI-PB-CMMS=Character manual mining speed -PHI-PB-CRS=Character running speed -PHI-PB-CCS=Character crafting speed -PHI-PB-CISB=Character inventory slots bonus -PHI-PB-CHB=Character health bonus -PHI-PB-CRDB=Character reach distance bonus -PHI-PB-FMMS=Force manual mining speed -PHI-PB-FRS=Force running speed -PHI-PB-FCS=Force crafting speed -PHI-PB-FISB=Force inventory slots bonus -PHI-PB-FHB=Force health bonus -PHI-PB-FRDB=Force reach distance bonus -PHI-PB-FWRSM=Force worker robots speed modifier -PHI-PB-FWRBM=Force worker robots battery modifier -PHI-PB-FWRSB=Force worker robots storage bonus -PHI-PB-FFRLM=Force following robots lifetime modifier +PHI-PB=PB Bonus 命令 +PHI-PB-CMMS=PBA1 個人挖掘速度 +PHI-PB-CRS=PBA2 個人跑步速度 +PHI-PB-CCS=PBA3 個人合成速度 +PHI-PB-CISB=PBA4 個人儲存位 +PHI-PB-CHB=PBA5 個人生命 +PHI-PB-CRDB=PBA6 個人到達距離 +PHI-PB-FMMS=PBB1 勢力挖掘速度 +PHI-PB-FRS=PBB2 勢力跑步速度 +PHI-PB-FCS=PBB3 勢力合成速度 +PHI-PB-FISB=PBB4 勢力儲存位 +PHI-PB-FHB=PBB5 勢力生命 +PHI-PB-FRDB=PBB6 勢力到達距離 +PHI-PB-FWRSM=PBB7 勢力機械人速度 +PHI-PB-FWRBM=PBB8 勢力機械人電力 +PHI-PB-FWRSB=PBB9 勢力機械人儲存 +PHI-PB-FFRLM=PBB10 勢力戰鬥機械人生命時間 -PHI-CT-OIL=原油 -PHI-CT-RADAR=雷達 -PHI-CT-TILE=世界地磚 -PHI-CT-TILE-CHOICE=地磚選擇 -PHI-CT-TRASH=垃圾箱 -PHI-CT-MINER=大型電能採礦機 -PHI-CT-LINKED=連結箱 -PHI-CT-LOADER=裝卸機啟用 -PHI-CT-RECIPE=配方 -PHI-CT-ENERGY=能量 -PHI-CT-LAMP=燈 +PHI-CT=CT 創意測試工具 +PHI-CT-OIL=CT1 原油 +PHI-CT-RADAR=CT2 雷達 +PHI-CT-TILE=CT3 世界地磚 +PHI-CT-TILE-CHOICE=CT4 地磚選擇 +PHI-CT-TRASH=CT5 垃圾箱 +PHI-CT-MINER=CT6 大型電能採礦機 +PHI-CT-LINKED=CT7 連結箱 +PHI-CT-LOADER=CT8 裝卸機啟用 +PHI-CT-RECIPE=CT9 配方 +PHI-CT-ENERGY=CT10 能量 +PHI-CT-LAMP=CT11 燈 [mod-setting-description] PHI-EN-SOLAR-TIER=預設 8 ; 停用 1 diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg index c2b4bc3..2d3417f 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -848,90 +848,90 @@ empty-world=空的世界 empty-world=對設計有用 [mod-setting-name] -PHI-EN=能量 -PHI-MB=大型基地 -PHI-WE=軍事 -PHI-EQ=設備 -PHI-MI=大型基地物品 -PHI-RS=配方 -PHI-XC=時鐘 -PHI-PB=附加 -PHI-CT=創意 +PHI-EN=EN 啟用複合發電 +PHI-EN-SOLAR-TIER=EN1 太陽能板的最高等級 +PHI-EN-STEAM-TIER=EN2 蒸汽發電機的最高等級 +PHI-EN-NUCLEAR-TIER=EN3 核能反應爐的最高等級 -PHI-EN-SOLAR-TIER=太陽能板的最高等級 -PHI-EN-STEAM-TIER=蒸汽發電機的最高等級 -PHI-EN-NUCLEAR-TIER=核能反應爐的最高等級 +PHI-MB=MB 啟用快速機器 +PHI-MB-ASSEMBLING-TIER=MB1 組裝機的最高等級 +PHI-MB-FURNACE-TIER=MB2 電爐的最高等級 +PHI-MB-OIL-TIER=MB3 煉油廠的最高等級 +PHI-MB-CENTRIFUGE-TIER=MB4 離心機的最高等級 +PHI-MB-LAB-TIER=MB5 實驗室的最高等級 +PHI-MB-MINING-TIER=MB6 電能採礦機的最高等級 +PHI-MB-SE-ASSEMBLING-TIER=MB7 Space exploration的最高等級 -PHI-MB-ASSEMBLING-TIER=組裝機的最高等級 -PHI-MB-FURNACE-TIER=電爐的最高等級 -PHI-MB-OIL-TIER=煉油廠的最高等級 -PHI-MB-CENTRIFUGE-TIER=離心機的最高等級 -PHI-MB-LAB-TIER=實驗室的最高等級 -PHI-MB-MINING-TIER=電能採礦機的最高等級 -PHI-MB-SE-ASSEMBLING-TIER=Space exploration的最高等級 +PHI-WE=WE 啟用軍事防禦 +PHI-WE-LASER-TIER=WE1 雷射炮塔的最高等級 +PHI-WE-FLAME-TIER=WE2 火焰噴射器的最高等級 +PHI-WE-GUN-TIER=WE3 機槍炮塔的最高等級 +PHI-WE-RADAR-TIER=WE4 雷達的最高等級 -PHI-WE-LASER-TIER=雷射炮塔的最高等級 -PHI-WE-FLAME-TIER=火焰噴射器的最高等級 -PHI-WE-GUN-TIER=機槍炮塔的最高等級 -PHI-WE-RADAR-TIER=雷達的最高等級 +PHI-EQ=EQ 啟用裝甲設備 +PHI-EQ-SOLAR-TIER=EQ1 攜帶式太陽能板的最高等級 +PHI-EQ-BATTERY-TIER=EQ2 電池設備的最高等級 +PHI-EQ-REACTOR-TIER=EQ3 攜帶式核融合反應器的最高等級 +PHI-EQ-LASER-TIER=EQ4 個人雷射防禦的最高等級 +PHI-EQ-ROBOPORT-TIER=EQ5 機動無人機調度站的最高等級 +PHI-EQ-SHIELD-TIER=EQ6 能量護盾的最高等級 +PHI-EQ-NIGHT-TIER=EQ7 夜視鏡的最高等級 +PHI-EQ-EXO-TIER=EQ8 動力外骨骼的最高等級 +PHI-EQ-ARMOR=EQ9 動力護甲3代啟用 -PHI-EQ-SOLAR-TIER=攜帶式太陽能板的最高等級 -PHI-EQ-BATTERY-TIER=電池設備的最高等級 -PHI-EQ-REACTOR-TIER=攜帶式核融合反應器的最高等級 -PHI-EQ-LASER-TIER=個人雷射防禦的最高等級 -PHI-EQ-ROBOPORT-TIER=機動無人機調度站的最高等級 -PHI-EQ-SHIELD-TIER=能量護盾的最高等級 -PHI-EQ-NIGHT-TIER=夜視鏡的最高等級 -PHI-EQ-EXO-TIER=動力外骨骼的最高等級 -PHI-EQ-ARMOR=動力護甲3代啟用 +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-LANDFILL=人造陸地需求 -PHI-MI-EFFCY=節能組件效率 -PHI-MI-NUCLEAR=核能反應爐可調輸出 -PHI-MI-BOILER=電鍋爐 -PHI-MI-CHEST=基本的儲藏箱 -PHI-MI-REPAIR=維修效率 -PHI-MI-PIPE=水管效率 -PHI-MI-ROBOT=無人機效率 -PHI-MI-TRAIN=火車效率 +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-RS-RECIPE-1=配方規模 1 -PHI-RS-RECIPE-2=配方規模 2 -PHI-RS-RECIPE-DROF=Dynamic Recipe Overload Factor -PHI-RS-RECIPE-MINROM=Minimum Recipe Overload Multiplier -PHI-RS-RECIPE-MAXROM=Maximum Recipe Overload Multiplier -PHI-RS-MODULE=模組 +PHI-XW-WATER=XW 隨處水源 -PHI-XW-WATER=水 +PHI-XC=XC 時鐘介面 -PHI-PB-CMMS=Character manual mining speed -PHI-PB-CRS=Character running speed -PHI-PB-CCS=Character crafting speed -PHI-PB-CISB=Character inventory slots bonus -PHI-PB-CHB=Character health bonus -PHI-PB-CRDB=Character reach distance bonus -PHI-PB-FMMS=Force manual mining speed -PHI-PB-FRS=Force running speed -PHI-PB-FCS=Force crafting speed -PHI-PB-FISB=Force inventory slots bonus -PHI-PB-FHB=Force health bonus -PHI-PB-FRDB=Force reach distance bonus -PHI-PB-FWRSM=Force worker robots speed modifier -PHI-PB-FWRBM=Force worker robots battery modifier -PHI-PB-FWRSB=Force worker robots storage bonus -PHI-PB-FFRLM=Force following robots lifetime modifier +PHI-PB=PB Bonus 命令 +PHI-PB-CMMS=PBA1 個人挖掘速度 +PHI-PB-CRS=PBA2 個人跑步速度 +PHI-PB-CCS=PBA3 個人合成速度 +PHI-PB-CISB=PBA4 個人儲存位 +PHI-PB-CHB=PBA5 個人生命 +PHI-PB-CRDB=PBA6 個人到達距離 +PHI-PB-FMMS=PBB1 勢力挖掘速度 +PHI-PB-FRS=PBB2 勢力跑步速度 +PHI-PB-FCS=PBB3 勢力合成速度 +PHI-PB-FISB=PBB4 勢力儲存位 +PHI-PB-FHB=PBB5 勢力生命 +PHI-PB-FRDB=PBB6 勢力到達距離 +PHI-PB-FWRSM=PBB7 勢力機械人速度 +PHI-PB-FWRBM=PBB8 勢力機械人電力 +PHI-PB-FWRSB=PBB9 勢力機械人儲存 +PHI-PB-FFRLM=PBB10 勢力戰鬥機械人生命時間 -PHI-CT-OIL=原油 -PHI-CT-RADAR=雷達 -PHI-CT-TILE=世界地磚 -PHI-CT-TILE-CHOICE=地磚選擇 -PHI-CT-TRASH=垃圾箱 -PHI-CT-MINER=大型電能採礦機 -PHI-CT-LINKED=連結箱 -PHI-CT-LOADER=裝卸機啟用 -PHI-CT-RECIPE=配方 -PHI-CT-ENERGY=能量 -PHI-CT-LAMP=燈 +PHI-CT=CT 創意測試工具 +PHI-CT-OIL=CT1 原油 +PHI-CT-RADAR=CT2 雷達 +PHI-CT-TILE=CT3 世界地磚 +PHI-CT-TILE-CHOICE=CT4 地磚選擇 +PHI-CT-TRASH=CT5 垃圾箱 +PHI-CT-MINER=CT6 大型電能採礦機 +PHI-CT-LINKED=CT7 連結箱 +PHI-CT-LOADER=CT8 裝卸機啟用 +PHI-CT-RECIPE=CT9 配方 +PHI-CT-ENERGY=CT10 能量 +PHI-CT-LAMP=CT11 燈 [mod-setting-description] PHI-EN-SOLAR-TIER=預設 8 ; 停用 1 diff --git a/PHI-CL/migrations/migrations.lua b/PHI-CL/migrations/migrations.lua index cd97d7c..b5f0c5a 100644 --- a/PHI-CL/migrations/migrations.lua +++ b/PHI-CL/migrations/migrations.lua @@ -141,9 +141,9 @@ for _, force in pairs(game.forces) do end end - if settings.startup['PHI-MB'].value and mods['space-exploration'] then + if settings.startup['PHI-MB'].value and script.active_mods['space-exploration'] then if technologies['se-core-miner'].researched then - for i=1, settings.startup['PHI-MB-MINING-TIER'].value do + 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 diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index 8ab32e1..c9a8c74 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -4,222 +4,191 @@ data:extend({ name = 'PHI-EN', setting_type = 'startup', default_value = true, - order = 'A01' - }, { - type = 'bool-setting', - name = 'PHI-MB', - setting_type = 'startup', - default_value = false, - order = 'A02' - }, { - type = 'bool-setting', - name = 'PHI-WE', - setting_type = 'startup', - default_value = false, - order = 'A03' - }, { - type = 'bool-setting', - name = 'PHI-EQ', - setting_type = 'startup', - default_value = false, - order = 'A04' - }, { - type = 'bool-setting', - name = 'PHI-MI', - setting_type = 'startup', - default_value = false, - order = 'A05' - }, { - type = 'bool-setting', - name = 'PHI-RS', - setting_type = 'startup', - default_value = false, - order = 'A06' - }, { - type = 'int-setting', - name = 'PHI-XW-WATER', - setting_type = 'startup', - default_value = 0, - allowed_values = {0, 1, 2, 3, 4, 5}, - order = 'A07' - }, { - type = 'bool-setting', - name = 'PHI-XC', - setting_type = 'startup', - default_value = false, - order = 'A08' - }, { - type = 'bool-setting', - name = 'PHI-PB', - setting_type = 'startup', - default_value = false, - order = 'A09' - }, { - type = 'bool-setting', - name = 'PHI-CT', - setting_type = 'startup', - default_value = false, - order = 'A10' + order = 'A00' }, { type = 'int-setting', name = 'PHI-EN-SOLAR-TIER', setting_type = 'startup', default_value = 8, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'B01' + order = 'A01' }, { type = 'int-setting', name = 'PHI-EN-STEAM-TIER', setting_type = 'startup', default_value = 5, allowed_values = {1, 2, 3, 4, 5}, - order = 'B02' + order = 'A02' }, { type = 'int-setting', name = 'PHI-EN-NUCLEAR-TIER', setting_type = 'startup', default_value = 5, allowed_values = {1, 2, 3, 4, 5}, - order = 'B03' + order = 'A03' + }, { + type = 'bool-setting', + name = 'PHI-MB', + setting_type = 'startup', + default_value = false, + order = 'B00' }, { type = 'int-setting', name = 'PHI-MB-ASSEMBLING-TIER', setting_type = 'startup', default_value = 5, allowed_values = {3, 4, 5}, - order = 'C01' + order = 'B01' }, { type = 'int-setting', name = 'PHI-MB-FURNACE-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'C02' + order = 'B02' }, { type = 'int-setting', name = 'PHI-MB-OIL-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'C03' + order = 'B03' }, { type = 'int-setting', name = 'PHI-MB-CENTRIFUGE-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'C04' + order = 'B04' }, { type = 'int-setting', name = 'PHI-MB-LAB-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'C05' + order = 'B05' }, { type = 'int-setting', name = 'PHI-MB-MINING-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'C06' + order = 'B06' }, { type = 'int-setting', name = 'PHI-MB-SE-ASSEMBLING-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'C07' + order = 'B07' + }, { + type = 'bool-setting', + name = 'PHI-WE', + setting_type = 'startup', + default_value = false, + order = 'C00' }, { type = 'int-setting', name = 'PHI-WE-LASER-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'D01' + order = 'C01' }, { type = 'int-setting', name = 'PHI-WE-FLAME-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'D02' + order = 'C02' }, { type = 'int-setting', name = 'PHI-WE-GUN-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'D03' + order = 'C03' }, { type = 'int-setting', name = 'PHI-WE-RADAR-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'D04' + order = 'C04' + }, { + type = 'bool-setting', + name = 'PHI-EQ', + setting_type = 'startup', + default_value = false, + order = 'D00' }, { type = 'int-setting', name = 'PHI-EQ-SOLAR-TIER', setting_type = 'startup', default_value = 8, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'E01' + order = 'D01' }, { type = 'int-setting', name = 'PHI-EQ-BATTERY-TIER', setting_type = 'startup', default_value = 8, allowed_values = {2, 3, 4, 5, 6, 7, 8}, - order = 'E02' + order = 'D02' }, { type = 'int-setting', name = 'PHI-EQ-REACTOR-TIER', setting_type = 'startup', default_value = 8, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'E03' + order = 'D03' }, { type = 'int-setting', name = 'PHI-EQ-LASER-TIER', setting_type = 'startup', default_value = 8, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'E04' + order = 'D04' }, { type = 'int-setting', name = 'PHI-EQ-ROBOPORT-TIER', setting_type = 'startup', default_value = 8, allowed_values = {2, 3, 4, 5, 6, 7, 8}, - order = 'E05' + order = 'D05' }, { type = 'int-setting', name = 'PHI-EQ-SHIELD-TIER', setting_type = 'startup', default_value = 8, allowed_values = {2, 3, 4, 5, 6, 7, 8}, - order = 'E06' + order = 'D06' }, { type = 'int-setting', name = 'PHI-EQ-NIGHT-TIER', setting_type = 'startup', default_value = 2, allowed_values = {1, 2}, - order = 'E07' + order = 'D07' }, { type = 'int-setting', name = 'PHI-EQ-EXO-TIER', setting_type = 'startup', default_value = 2, allowed_values = {1, 2}, - order = 'E08' + order = 'D08' }, { type = 'bool-setting', name = 'PHI-EQ-ARMOR', setting_type = 'startup', default_value = true, - order = 'E09' + order = 'D09' + }, { + type = 'bool-setting', + name = 'PHI-MI', + setting_type = 'startup', + default_value = false, + order = 'E00' }, { type = 'int-setting', name = 'PHI-MI-LANDFILL', @@ -227,79 +196,85 @@ data:extend({ default_value = 20, minimum_value = 1, maximum_value = 40, - order = 'F01' + order = 'E01' }, { type = 'bool-setting', name = 'PHI-MI-EFFCY', setting_type = 'startup', - default_value = true, - order = 'F02' + default_value = false, + order = 'E02' }, { type = 'bool-setting', name = 'PHI-MI-NUCLEAR', setting_type = 'startup', - default_value = true, - order = 'F03' + default_value = false, + order = 'E03' }, { type = 'bool-setting', name = 'PHI-MI-BOILER', setting_type = 'startup', - default_value = true, - order = 'F04' + default_value = false, + order = 'E04' }, { type = 'bool-setting', name = 'PHI-MI-CHEST', setting_type = 'startup', - default_value = true, - order = 'F05' + 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 = 'F06' + 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 = 'F07' + 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 = 'F08' + 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 = 'F09' + order = 'E09' + }, { + 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 = 'G01' + 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 = 'G02' + order = 'F02' }, { type = 'bool-setting', name = 'PHI-RS-MODULE', setting_type = 'startup', default_value = true, - order = 'G03' + order = 'F03' }, { type = 'int-setting', name = 'PHI-RS-RECIPE-DROF', @@ -307,7 +282,7 @@ data:extend({ default_value = 1, minimum_value = 1, maximum_value = 100, - order = 'G04' + order = 'F04' }, { type = 'int-setting', name = 'PHI-RS-RECIPE-MINROM', @@ -315,7 +290,7 @@ data:extend({ default_value = 2, minimum_value = 1, maximum_value = 100, - order = 'G05' + order = 'F05' }, { type = 'int-setting', name = 'PHI-RS-RECIPE-MAXROM', @@ -323,14 +298,26 @@ data:extend({ default_value = 100, minimum_value = 1, maximum_value = 100, - order = 'G06' + order = 'F06' }, { type = 'int-setting', name = 'PHI-XW-WATER', setting_type = 'startup', - default_value = 1, - allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'H01' + default_value = 0, + allowed_values = {0, 1, 2, 3, 4, 5}, + order = 'G00' + }, { + type = 'bool-setting', + name = 'PHI-XC', + setting_type = 'startup', + default_value = false, + order = 'H00' + }, { + type = 'bool-setting', + name = 'PHI-PB', + setting_type = 'startup', + default_value = false, + order = 'I00' }, { type = 'int-setting', name = 'PHI-PB-CMMS', @@ -379,8 +366,8 @@ data:extend({ minimum_value = 0, maximum_value = 20, order = 'IA06' - }, - --[[, { + }, + --[[ { type = 'int-setting', name = 'PHI-PB-FMMS', setting_type = 'startup', @@ -455,71 +442,77 @@ data:extend({ }, ]] { + type = 'bool-setting', + name = 'PHI-CT', + setting_type = 'startup', + default_value = false, + order = 'J00' + }, { type = 'bool-setting', name = 'PHI-CT-OIL', setting_type = 'startup', default_value = true, - order = 'JA01' + order = 'J01' }, { type = 'bool-setting', name = 'PHI-CT-RADAR', setting_type = 'startup', default_value = true, - order = 'JA02' + order = 'J02' }, { type = 'bool-setting', name = 'PHI-CT-TRASH', setting_type = 'startup', default_value = true, - order = 'JA03' + order = 'J03' }, { type = 'bool-setting', name = 'PHI-CT-MINER', setting_type = 'startup', default_value = true, - order = 'JA04' + order = 'J04' }, { type = 'bool-setting', name = 'PHI-CT-LINKED', setting_type = 'startup', default_value = true, - order = 'JA05' + order = 'J05' }, { type = 'bool-setting', name = 'PHI-CT-LOADER', setting_type = 'startup', default_value = true, - order = 'JA06' + order = 'J06' }, { type = 'bool-setting', name = 'PHI-CT-RECIPE', setting_type = 'startup', default_value = true, - order = 'JA07' + order = 'J07' }, { type = 'bool-setting', name = 'PHI-CT-ENERGY', setting_type = 'startup', default_value = true, - order = 'JA08' + order = 'J08' }, { type = 'bool-setting', name = 'PHI-CT-LAMP', setting_type = 'startup', default_value = true, - order = 'JA09' + order = 'J09' }, { type = 'bool-setting', name = 'PHI-CT-TILE', setting_type = 'startup', default_value = true, - order = 'JB01' + order = 'J10' }, { 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 = 'JB02' + order = 'J11' } })