diff --git a/PHI-CL/data-updates.lua b/PHI-CL/data-updates.lua index bcf75fd..da75ed1 100644 --- a/PHI-CL/data-updates.lua +++ b/PHI-CL/data-updates.lua @@ -7,16 +7,6 @@ if settings.startup['PHI-EN'].value and settings.startup['PHI-EN-NUCLEAR-TIER']. end if settings.startup['PHI-XW-WATER'].value > 0 then - data.raw['offshore-pump']['offshore-pump'].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20 - data.raw['offshore-pump']['offshore-pump'].fluid_box.height = 4 - data.raw['offshore-pump']['offshore-pump'].fluid_box.level = 5 - data.raw['offshore-pump']['offshore-pump'].flags = {'placeable-neutral', 'player-creation'} - data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_box = {{-0.5, -0.25}, {0.5, 0.25}} - data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'} - data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_mask = nil - data.raw['offshore-pump']['offshore-pump'].placeable_position_visualization = nil - data.raw['offshore-pump']['offshore-pump'].se_allow_in_space = true - if mods['angelsrefining'] then data.raw['offshore-pump']['seafloor-pump'].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20 data.raw['offshore-pump']['seafloor-pump'].fluid_box.height = 4 @@ -40,303 +30,6 @@ if settings.startup['PHI-XW-WATER'].value > 0 then end end -if settings.startup['PHI-CT'].value then - 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' - - item.icons = { - { - icon = item.icon, - tint = items['tint'][2], - icon_size = item.icon_size, - icon_mipmaps = item.icon_mipmaps - } - } - - 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 = { - { - icon = item.icon, - tint = items['tint'][8], - icon_size = item.icon_size, - icon_mipmaps = item.icon_mipmaps - } - } - - 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 = item.icon, - tint = items['tint'][8], - icon_size = item.icon_size, - icon_mipmaps = item.icon_mipmaps - } - } - - 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 = item.icon, - tint = items['tint'][8], - icon_size = item.icon_size, - icon_mipmaps = item.icon_mipmaps - } - } - - 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 - - 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-EQ-ARMOR'].value then data:extend({ { diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 7bb0502..2633dda 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -2,6 +2,17 @@ local items = require 'config' local main = require 'main' local file_stage = 1 +if settings.startup['PHI-XW-WATER'].value > 0 then + data.raw['offshore-pump']['offshore-pump'].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20 + data.raw['offshore-pump']['offshore-pump'].fluid_box.height = 4 + data.raw['offshore-pump']['offshore-pump'].fluid_box.level = 5 + data.raw['offshore-pump']['offshore-pump'].flags = {'placeable-neutral', 'player-creation'} + data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_box = {{-0.5, -0.25}, {0.5, 0.25}} + data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'} + data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_mask = nil + 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({{ @@ -84,10 +95,306 @@ if settings.startup['PHI-CT'].value then 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 = nil + 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-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 + + 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 = { + { + 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-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 + + 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 diff --git a/PHI-CL/info.json b/PHI-CL/info.json index 3fef26d..7574dee 100644 --- a/PHI-CL/info.json +++ b/PHI-CL/info.json @@ -1,8 +1,8 @@ { "name": "PHI-CL", - "version": "2.0.28", + "version": "2.0.30", "factorio_version": "1.1", - "date": "2024-08-29", + "date": "2024-09-07", "title": "Phidias Collection", "author": "PHIDIAS0303", "contributers": "",