From 92d8b7a484577ff0c0541c9322aa9f193cb6377d Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Tue, 9 May 2023 01:42:06 +0900 Subject: [PATCH] Update --- PHI-EN/data-updates.lua | 28 +++++++++++------------ PHI-EN/data.lua | 49 +++++++++++++++++++++++++---------------- PHI-MI/data.lua | 1 + 3 files changed, 45 insertions(+), 33 deletions(-) diff --git a/PHI-EN/data-updates.lua b/PHI-EN/data-updates.lua index 1eb37cb..8c705e5 100644 --- a/PHI-EN/data-updates.lua +++ b/PHI-EN/data-updates.lua @@ -1,19 +1,19 @@ -- accumulator data.raw['accumulator']['accumulator'].fast_replaceable_group = 'accumulator' -data.raw['accumulator']['accumulator-mk2'].fast_replaceable_group = data.raw['accumulator']['accumulator'].fast_replaceable_group -data.raw['accumulator']['accumulator-mk3'].fast_replaceable_group = data.raw['accumulator']['accumulator'].fast_replaceable_group -data.raw['accumulator']['accumulator-mk4'].fast_replaceable_group = data.raw['accumulator']['accumulator'].fast_replaceable_group -data.raw['accumulator']['accumulator-mk5'].fast_replaceable_group = data.raw['accumulator']['accumulator'].fast_replaceable_group -data.raw['accumulator']['accumulator-mk6'].fast_replaceable_group = data.raw['accumulator']['accumulator'].fast_replaceable_group -data.raw['accumulator']['accumulator-mk7'].fast_replaceable_group = data.raw['accumulator']['accumulator'].fast_replaceable_group -data.raw['accumulator']['accumulator-mk8'].fast_replaceable_group = data.raw['accumulator']['accumulator'].fast_replaceable_group +data.raw['accumulator']['accumulator-2'].fast_replaceable_group = data.raw['accumulator']['accumulator'].fast_replaceable_group +data.raw['accumulator']['accumulator-3'].fast_replaceable_group = data.raw['accumulator']['accumulator-2'].fast_replaceable_group +data.raw['accumulator']['accumulator-4'].fast_replaceable_group = data.raw['accumulator']['accumulator-3'].fast_replaceable_group +data.raw['accumulator']['accumulator-5'].fast_replaceable_group = data.raw['accumulator']['accumulator-4'].fast_replaceable_group +data.raw['accumulator']['accumulator-6'].fast_replaceable_group = data.raw['accumulator']['accumulator-5'].fast_replaceable_group +data.raw['accumulator']['accumulator-7'].fast_replaceable_group = data.raw['accumulator']['accumulator-6'].fast_replaceable_group +data.raw['accumulator']['accumulator-8'].fast_replaceable_group = data.raw['accumulator']['accumulator-7'].fast_replaceable_group -- solar-panel data.raw['solar-panel']['solar-panel'].fast_replaceable_group = 'solar-panel' -data.raw['solar-panel']['solar-panel-mk2'].fast_replaceable_group = data.raw['solar-panel']['solar-panel'].fast_replaceable_group -data.raw['solar-panel']['solar-panel-mk3'].fast_replaceable_group = data.raw['solar-panel']['solar-panel'].fast_replaceable_group -data.raw['solar-panel']['solar-panel-mk4'].fast_replaceable_group = data.raw['solar-panel']['solar-panel'].fast_replaceable_group -data.raw['solar-panel']['solar-panel-mk5'].fast_replaceable_group = data.raw['solar-panel']['solar-panel'].fast_replaceable_group -data.raw['solar-panel']['solar-panel-mk6'].fast_replaceable_group = data.raw['solar-panel']['solar-panel'].fast_replaceable_group -data.raw['solar-panel']['solar-panel-mk7'].fast_replaceable_group = data.raw['solar-panel']['solar-panel'].fast_replaceable_group -data.raw['solar-panel']['solar-panel-mk8'].fast_replaceable_group = data.raw['solar-panel']['solar-panel'].fast_replaceable_group +data.raw['solar-panel']['solar-panel-2'].fast_replaceable_group = data.raw['solar-panel']['solar-panel'].fast_replaceable_group +data.raw['solar-panel']['solar-panel-3'].fast_replaceable_group = data.raw['solar-panel']['solar-panel-2'].fast_replaceable_group +data.raw['solar-panel']['solar-panel-4'].fast_replaceable_group = data.raw['solar-panel']['solar-panel-3'].fast_replaceable_group +data.raw['solar-panel']['solar-panel-5'].fast_replaceable_group = data.raw['solar-panel']['solar-panel-4'].fast_replaceable_group +data.raw['solar-panel']['solar-panel-6'].fast_replaceable_group = data.raw['solar-panel']['solar-panel-5'].fast_replaceable_group +data.raw['solar-panel']['solar-panel-7'].fast_replaceable_group = data.raw['solar-panel']['solar-panel-6'].fast_replaceable_group +data.raw['solar-panel']['solar-panel-8'].fast_replaceable_group = data.raw['solar-panel']['solar-panel-7'].fast_replaceable_group diff --git a/PHI-EN/data.lua b/PHI-EN/data.lua index 54aef6c..ab90ee0 100644 --- a/PHI-EN/data.lua +++ b/PHI-EN/data.lua @@ -21,6 +21,8 @@ local function EE(source, tier) item.energy_source.buffer_capacity = (source.base * 4 ^ (tier - 1)) .. 'MJ' item.energy_source.input_flow_limit = (source.base * 60 * (4 ^ (tier - 1))) .. 'kW' item.energy_source.output_flow_limit = (source.base * 60 * (4 ^ (tier - 1))) .. 'kW' + + --[[ item.charge_animation.layers[1].layers[1].filename = item.picture.layers[1].filename item.charge_animation.layers[1].layers[1].tint = {r = 1, g = 1, b = 1, a = 1} item.charge_animation.layers[1].layers[1].hr_version.filename = item.picture.layers[1].hr_version.filename @@ -29,14 +31,24 @@ local function EE(source, tier) item.discharge_animation.layers[1].layers[1].tint = {r = 1, g = 1, b = 1, a = 1} item.discharge_animation.layers[1].layers[1].hr_version.filename = item.picture.layers[1].hr_version.filename item.discharge_animation.layers[1].layers[1].hr_version.tint = {r = 1, g = 1, b = 1, a = 1} + ]] elseif (source.type == 'solar-panel') then item.production = (source.base * (4 ^ (tier - 1))) .. 'kW' + elseif (source.type == 'boiler') then + item.target_temperature = 15 + (150 * tier) + item.fluid_box.height = 4 + item.output_fluid_box.height = 4 + item.output_fluid_box.base_level = 5 + item.energy_consumption = 1.8 * tier .. 'MW' + elseif (source.type == 'generator') then + item.fluid_box.height = 4 + item.maximum_temperature = 15 + (150 * tier) end if (tier <= source.max - 1) then item.next_upgrade = source.name .. '-' .. (tier + 1) end - + data:extend({item}) end @@ -46,9 +58,9 @@ local function EI(source, tier) item.name = source.name .. '-' .. tier item.place_result = source.name .. '-' .. tier item.max_health = 200 * (2 ^ (tier - 1)) - item.subgroup = 'energy' - item.stack_size = 50 - item.default_request_amount = 50 + -- item.subgroup = 'energy' + -- item.stack_size = 50 + -- item.default_request_amount = 50 -- item.icons = {{icon = graphics_location .. source.name .. '-i.png', icon_mipmaps = 4, icon_size = 64}} item.order = item.order .. tier data:extend({item}) @@ -73,7 +85,7 @@ local function ER(source, tier) end -- technology -local function ET(tier) +local function ET(source, tier) local prereq if (tier == 2) then prereq = {'solar-energy', 'advanced-electronics', 'electric-energy-accumulators'} @@ -81,25 +93,15 @@ local function ET(tier) prereq = {'compound-energy-' .. (tier - 2)} end - data:extend({{ + local item = { type = 'technology', name = 'compound-energy-' .. (tier - 1), icon_size = 256, icon = '__base__/graphics/technology/solar-energy.png', - effects = { - { - type = 'unlock-recipe', - recipe = 'solar-panel-' .. tier - }, - { - type = 'unlock-recipe', - recipe = 'accumulator-' .. tier - } - }, + effects = {}, prerequisites = prereq, unit = { count = 100, - -- count = 50 * tier, ingredients = { {'automation-science-pack', 2}, {'logistic-science-pack', 2} @@ -107,7 +109,16 @@ local function ET(tier) time = 120 }, order = 'a-h-' .. alpha_order[tier + 1] - }}) + } + + if tier <= source.max then + table.insert(item.effects, { + type = 'unlock-recipe', + recipe = source.name .. tier + }) + end + + data:extend({item}) end for _, v in pairs(items) do @@ -116,7 +127,7 @@ for _, v in pairs(items) do EE(v, j) EI(v, j) ER(v, j) - ET(j) + ET(v, j) end end end diff --git a/PHI-MI/data.lua b/PHI-MI/data.lua index 352ea8b..b249464 100644 --- a/PHI-MI/data.lua +++ b/PHI-MI/data.lua @@ -127,6 +127,7 @@ entity.energy_consumption = '7200kW' entity.target_temperature = 165 entity.fluid_box.height = 4 entity.output_fluid_box.height = 4 +entity.output_fluid_box.base_level = 5 entity.minable = {hardness = 0.2, mining_time = 0.5, result = 'electric-boiler'} entity.emissions_per_minute = 0 entity.energy_source.type = 'electric'