From b23590667ff1cdc75524e0c67c7706f5ea836a00 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Tue, 18 Apr 2023 14:52:27 +0900 Subject: [PATCH] Update --- PHI-EN/data.lua | 78 ++++++++++++++++++++++++------------------------ PHI-EN/info.json | 7 +++-- PHI-EQ/data.lua | 5 ++-- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/PHI-EN/data.lua b/PHI-EN/data.lua index 800aeaf..296c287 100644 --- a/PHI-EN/data.lua +++ b/PHI-EN/data.lua @@ -1,49 +1,46 @@ local alpha_order = {'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm'} -local base_battery_energy = 5 -local base_battery_flow = 300 -local base_solar_energy = 60 local graphics_location = '__PHI-EN__/graphics/' -local items = {'accumulator', 'solar-panel'} local items = { ['solar-panel'] = { enabled = true, type = 'solar-panel', name = 'solar-panel', - tech = 'solar-panel-equipment', min = 2, max = 8, - base = 30, - graphics_source = nil + base = 60 }, ['accumulator'] = { enabled = true, - type = 'solar-panel', - name = 'solar-panel', - tech = 'solar-panel-equipment', + type = 'accumulator', + name = 'accumulator', min = 2, max = 8, - base = 30, - graphics_source = nil + base = 5 } } +if mods['space-exploration'] then + items['solar-panel'].base = 100 + items['accumulator'].base = 10 +end + -- entity local function EE(source, tier) - local item = table.deepcopy(data.raw[source][source]) - item.name = source .. '-mk' .. tier - item.minable.result = source .. '-mk' .. tier + local item = table.deepcopy(data.raw[source.type][source.name]) + item.name = source.name .. '-mk' .. tier + item.minable.result = source.name .. '-mk' .. tier item.max_health = 200 * (2 ^ (tier - 1)) - item.picture.layers[1].filename = graphics_location .. source .. '-e.png' - item.picture.layers[1].hr_version.filename = graphics_location .. source ..'-eh.png' - item.icon = graphics_location .. source .. '-i.png' + item.picture.layers[1].filename = graphics_location .. source.name .. '-e.png' + item.picture.layers[1].hr_version.filename = graphics_location .. source.name ..'-eh.png' + item.icon = graphics_location .. source.type .. '-i.png' item.icon_size = 64 item.icon_mipmaps = 4 if (source == 'accumulator') then - item.energy_source.buffer_capacity = (base_battery_energy * 4 ^ (tier - 1)) .. 'MJ' - item.energy_source.input_flow_limit = (base_battery_flow * (4 ^ (tier - 1))) .. 'kW' - item.energy_source.output_flow_limit = (base_battery_flow * (4 ^ (tier - 1))) .. 'kW' + 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 @@ -53,11 +50,11 @@ local function EE(source, tier) 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} else - item.production = (base_solar_energy * (4 ^ (tier - 1))) .. 'kW' + item.production = (source.base * (4 ^ (tier - 1))) .. 'kW' end if (tier <= 7) then - item.next_upgrade = source .. '-mk' .. (tier + 1) + item.next_upgrade = source.name .. '-mk' .. (tier + 1) end data:extend({item}) @@ -66,18 +63,18 @@ end -- item local function EI(source, tier) local item = table.deepcopy(data.raw.item[source]) - item.name = source .. '-mk' .. tier - item.place_result = source .. '-mk' .. tier + item.name = source.name .. '-mk' .. tier + item.place_result = source.name .. '-mk' .. tier item.max_health = 200 * (2 ^ (tier - 1)) item.subgroup = 'energy' item.stack_size = 50 item.default_request_amount = 50 - item.icons = {{icon = graphics_location .. source .. '-i.png', icon_mipmaps = 4, icon_size = 64}} + item.icons = {{icon = graphics_location .. source.name .. '-i.png', icon_mipmaps = 4, icon_size = 64}} - if (source == 'accumulator') then - item.order = 'd[' .. source .. ']-a' .. tier .. '[' .. source .. '-mk' .. tier .. ']' + if (source.type == 'accumulator') then + item.order = 'd[' .. source.type .. ']-a' .. tier .. '[' .. source.name .. '-mk' .. tier .. ']' else - item.order = 'e[' .. source .. ']-a' .. tier .. '[' .. source .. '-mk' .. tier .. ']' + item.order = 'e[' .. source.type .. ']-a' .. tier .. '[' .. source.name .. '-mk' .. tier .. ']' end data:extend({item}) @@ -85,7 +82,7 @@ end -- recipe local function ER(source, tier) - local na = source + local na = source.name if (tier >= 3) then na = na .. '-mk' .. (tier - 1) @@ -93,11 +90,11 @@ local function ER(source, tier) data:extend({{ type = 'recipe', - name = source .. '-mk' .. tier, + name = source.name .. '-mk' .. tier, energy_required = 2, enabled = false, ingredients = {{na, 4}}, - result = source .. '-mk' .. tier, + result = source.name .. '-mk' .. tier, }}) end @@ -126,7 +123,7 @@ local function ET(tier) }, prerequisites = prereq, unit = { - count = 200 * (2 ^ (tier - 1)), + count = 100 * (2 * (tier - 1)), ingredients = { {'automation-science-pack', 1}, {'logistic-science-pack', 1} @@ -137,11 +134,14 @@ local function ET(tier) }}) end -for i=1, 2, 1 do - for j=2, 8, 1 do - EE(items[i], j) - EI(items[i], j) - ER(items[i], j) - ET(j) +for _, v in pairs(items) do + if v.enabled then + for j=v.min, v.max, 1 do + EE(v, j) + EI(v, j) + ER(v, j) + ET(j) + end end end + diff --git a/PHI-EN/info.json b/PHI-EN/info.json index a61bfc8..06b7b11 100644 --- a/PHI-EN/info.json +++ b/PHI-EN/info.json @@ -1,14 +1,15 @@ { "name": "PHI-EN", - "version": "1.1.5", + "version": "1.1.6", "factorio_version": "1.1", - "date": "2023-04-13", + "date": "2023-04-18", "title": "Phidias Energy", "author": "PHIDIAS0303", "contributers": "", "homepage": "", "description": "Additional Compound Solars, Accumulator", "dependencies": [ - "base >= 1.1.0" + "base >= 1.1.0", + "? space-exploration >= 0.6.0" ] } \ No newline at end of file diff --git a/PHI-EQ/data.lua b/PHI-EQ/data.lua index dce3d11..80d0992 100644 --- a/PHI-EQ/data.lua +++ b/PHI-EQ/data.lua @@ -87,7 +87,6 @@ local items = { if mods['space-exploration'] then items['solar-panel'].base = 40 - items['fusion-reactor'].name = 'se-rtg-equipment' items['fusion-reactor'].tech = 'se-rtg-equipment' items['fusion-reactor'].base = 800 @@ -231,7 +230,7 @@ local function EE(source, tier) item['shape'] = {width = w, height = h, type = 'full'} if source.graphics_source == nil then - item['sprite'] = {filename = graphics_location .. source.type .. '-equipment-e.png', width = w * 32, height = h * 32, priority = 'medium', hr_version = {filename = graphics_location .. source.type .. '-equipment-eh.png', width = w * 64, height = h *64, priority = 'medium', scale = 0.5}} + item['sprite'] = {filename = graphics_location .. source.name .. '-equipment-e.png', width = w * 32, height = h * 32, priority = 'medium', hr_version = {filename = graphics_location .. source.name .. '-equipment-eh.png', width = w * 64, height = h *64, priority = 'medium', scale = 0.5}} else item['sprite'] = {filename = source.graphics_source, width = w * 32, height = h * 32, priority = 'medium'} end @@ -247,7 +246,7 @@ local function EI(source, tier) item.subgroup = 'equipment' item.stack_size = 20 item.default_request_amount = 5 - item.icons = {{icon = graphics_location .. source.type .. '-equipment-i.png', icon_mipmaps = 4, icon_size = 64}} + item.icons = {{icon = graphics_location .. source.name .. '-equipment-i.png', icon_mipmaps = 4, icon_size = 64}} if (source.type == 'solar-panel') then item.order = 'a[energy-source]-a' .. alpha_order[tier - 1] .. '[' .. source.name .. '-mk' .. tier .. ']'