From e830a1d441fd1ac4635c17055b9ff979ab5e5a8f Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Mon, 8 May 2023 15:26:22 +0900 Subject: [PATCH] Update --- PHI-EQ/data.lua | 8 ++++---- PHI-EQ/info.json | 4 ++-- PHI-MB/data.lua | 9 +++++++++ PHI-MB/info.json | 4 ++-- PHI-MI/data.lua | 19 ++++++++++++++----- PHI-MI/info.json | 4 ++-- PHI-XW/data.lua | 8 ++++---- PHI-XW/info.json | 4 ++-- 8 files changed, 39 insertions(+), 21 deletions(-) diff --git a/PHI-EQ/data.lua b/PHI-EQ/data.lua index 1ba6236..9c72db3 100644 --- a/PHI-EQ/data.lua +++ b/PHI-EQ/data.lua @@ -149,7 +149,7 @@ local function EE(source, tier) item['energy_source'] = {type = 'electric', usage_priority = 'secondary-input', buffer_capacity = (250 * (2 ^ (tier - 1))) .. 'kJ'} -- item['source_direction_count'] = 64 -- item['source_offset'] = {0, -3.423489 / 4} - item['attack_parameters'] = {type = 'beam', cooldown = 60, range = (18 + tier), damage_modifier = (source.base * (2 ^ (tier - 1))), ammo_type = {category = 'laser', energy_consumption = (50 * (2 ^ (tier - 1))) .. 'kJ', action = {type = 'direct', action_delivery = {type = 'beam', beam = 'laser-beam', max_length = (18 + tier), duration = 60, source_offset = {0, -1.31439}}}}} + item['attack_parameters'] = {type = 'beam', cooldown = 45, range = (18 + tier), damage_modifier = (source.base * (2 ^ (tier - 1))), ammo_type = {category = 'laser', energy_consumption = (50 * (2 ^ (tier - 1))) .. 'kJ', action = {type = 'direct', action_delivery = {type = 'beam', beam = 'laser-beam', max_length = (18 + tier), duration = 60, source_offset = {0, -1.31439}}}}} item['automatic'] = true elseif (source.type == 'energy-shield') then w = 2 @@ -222,13 +222,13 @@ end -- recipe local function ER(source, tier) - na = source.name + local na = source.name - if source.min == tier then + if (tier == 1) then na = source.base_name .. '-equipment' elseif (tier == 2) then na = source.name .. '-equipment' - elseif (tier >= 3) then + else na = source.name .. '-mk' .. (tier - 1) .. '-equipment' end diff --git a/PHI-EQ/info.json b/PHI-EQ/info.json index 3520741..0f89b22 100644 --- a/PHI-EQ/info.json +++ b/PHI-EQ/info.json @@ -1,8 +1,8 @@ { "name": "PHI-EQ", - "version": "1.1.11", + "version": "1.1.12", "factorio_version": "1.1", - "date": "2023-04-20", + "date": "2023-05-08", "title": "Phidias Equipment", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-MB/data.lua b/PHI-MB/data.lua index 8379c71..7a1ebd1 100644 --- a/PHI-MB/data.lua +++ b/PHI-MB/data.lua @@ -17,6 +17,15 @@ local function EE(source, tier) item.energy_source.emissions_per_minute = item.energy_source.emissions_per_minute * (2 ^ (tier - source.min + 1)) end + if item.fluid_boxes ~= nil then + for k, _ in pairs(item.fluid_boxes) do + if item.fluid_boxes[k].production_type ~= nil then + item.fluid_boxes[k].base_area = item.fluid_boxes[k].base_area * 2 + item.fluid_boxes[k].height = 2 + end + end + end + item.energy_usage = tonumber(string.match(item.energy_usage, '%d+')) * (2 ^ (tier - source.min + 1)) .. 'kW' -- item.animation.layers[1].filename = graphics_location .. source .. '-e.png' -- item.animation.layers[1].hr_version.filename = graphics_location .. source ..'-eh.png' diff --git a/PHI-MB/info.json b/PHI-MB/info.json index d21fa27..cef5b93 100644 --- a/PHI-MB/info.json +++ b/PHI-MB/info.json @@ -1,8 +1,8 @@ { "name": "PHI-MB", - "version": "1.0.10", + "version": "1.0.11", "factorio_version": "1.1", - "date": "2023-05-07", + "date": "2023-05-08", "title": "Phidias Megabase", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-MI/data.lua b/PHI-MI/data.lua index ac6c01f..49787ca 100644 --- a/PHI-MI/data.lua +++ b/PHI-MI/data.lua @@ -48,11 +48,16 @@ data.raw['module']['effectivity-module-3'].effect = {consumption = {bonus = -1.5 data.raw['arithmetic-combinator']['arithmetic-combinator'].energy_source.usage_priority = 'primary-input' data.raw['decider-combinator']['decider-combinator'].energy_source.usage_priority = 'primary-input' -data.raw['pipe']['pipe'].fluid_box.height = 4 -data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.height = 4 -data.raw['pump']['pump'].fluid_box.height = 16 +data.raw['pipe']['pipe'].fluid_box.base_area = 2 +data.raw['pipe']['pipe'].fluid_box.height = 2 +data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.base_area = 2 +data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.height = 2 +data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.pipe_connections = {{position = {0, -1}}, {position = {0, 1}, max_underground_distance = 20}} +data.raw['pump']['pump'].fluid_box.base_area = 2 +data.raw['pump']['pump'].fluid_box.height = 8 data.raw['pump']['pump'].pumping_speed = 800 data.raw['storage-tank']['storage-tank'].fluid_box.base_area = 500 +data.raw['storage-tank']['storage-tank'].fluid_box.height = 2 data.raw['locomotive']['locomotive'].max_health = 2000 data.raw['locomotive']['locomotive'].max_speed = 2 @@ -81,14 +86,14 @@ data.raw['construction-robot']['construction-robot'].max_payload_size = 3 data.raw['construction-robot']['construction-robot'].max_energy = '6MJ' data.raw['construction-robot']['construction-robot'].speed = 0.12 data.raw['construction-robot']['construction-robot'].speed_multiplier_when_out_of_energy = 0.4 -data.raw['construction-robot']['construction-robot'].energy_per_move = '10kJ' +data.raw['construction-robot']['construction-robot'].energy_per_move = '1kJ' data.raw['logistic-robot']['logistic-robot'].max_health = 400 data.raw['logistic-robot']['logistic-robot'].max_payload_size = 3 data.raw['logistic-robot']['logistic-robot'].max_energy = '6MJ' data.raw['logistic-robot']['logistic-robot'].speed = 0.12 data.raw['logistic-robot']['logistic-robot'].speed_multiplier_when_out_of_energy = 0.4 -data.raw['logistic-robot']['logistic-robot'].energy_per_move = '10kJ' +data.raw['logistic-robot']['logistic-robot'].energy_per_move = '1kJ' data.raw['roboport']['roboport'].max_health = 1000 data.raw['roboport']['roboport'].energy_usage = '100kW' @@ -121,6 +126,10 @@ local entity = table.deepcopy(data.raw['boiler']['boiler']) entity.name = 'electric-boiler' entity.energy_consumption = '7200kW' entity.target_temperature = 165 +entity.fluid_box.base_area = 2 +entity.fluid_box.height = 4 +entity.output_fluid_box.base_area = 2 +entity.output_fluid_box.height = 4 entity.minable = {hardness = 0.2, mining_time = 0.5, result = 'electric-boiler'} entity.emissions_per_minute = 0 entity.energy_source.type = 'electric' diff --git a/PHI-MI/info.json b/PHI-MI/info.json index a4b516f..72bcb6f 100644 --- a/PHI-MI/info.json +++ b/PHI-MI/info.json @@ -1,8 +1,8 @@ { "name": "PHI-MI", - "version": "1.0.7", + "version": "1.0.8", "factorio_version": "1.1", - "date": "2023-05-07", + "date": "2023-05-08", "title": "Phidias Megabase Item", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-XW/data.lua b/PHI-XW/data.lua index e070b13..1269e1c 100644 --- a/PHI-XW/data.lua +++ b/PHI-XW/data.lua @@ -1,6 +1,6 @@ data.raw['offshore-pump']['offshore-pump'].pumping_speed = 100 -data.raw['offshore-pump']['offshore-pump'].fluid_box.base_area = 5 -data.raw['offshore-pump']['offshore-pump'].fluid_box.base_level = 5 +data.raw['offshore-pump']['offshore-pump'].fluid_box.base_area = 2 +data.raw['offshore-pump']['offshore-pump'].fluid_box.height = 2 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'} @@ -9,8 +9,8 @@ data.raw['offshore-pump']['offshore-pump'].placeable_position_visualization = ni if mods['angelsrefining'] then data.raw['offshore-pump']['seafloor-pump'].pumping_speed = 25 - data.raw['offshore-pump']['seafloor-pump'].fluid_box.base_area = 5 - data.raw['offshore-pump']['seafloor-pump'].fluid_box.base_level = 5 + data.raw['offshore-pump']['seafloor-pump'].fluid_box.base_area = 2 + data.raw['offshore-pump']['seafloor-pump'].fluid_box.height = 2 data.raw['offshore-pump']['seafloor-pump'].flags = {'placeable-neutral', 'player-creation', 'filter-directions'} data.raw['offshore-pump']['seafloor-pump'].adjacent_tile_collision_box = {{-2, -3}, {2, -2}} data.raw['offshore-pump']['seafloor-pump'].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'} diff --git a/PHI-XW/info.json b/PHI-XW/info.json index 074ece3..4dec0ef 100644 --- a/PHI-XW/info.json +++ b/PHI-XW/info.json @@ -1,8 +1,8 @@ { "name": "PHI-XW", - "version": "1.0.4", + "version": "1.0.5", "factorio_version": "1.1", - "date": "2023-04-17", + "date": "2023-05-08", "title": "Phidias Water Pump", "author": "PHIDIAS0303", "contributers": "",