From 37f8ff2a61733c308af5eaa787d5f67568ecfd70 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Sun, 7 May 2023 15:05:01 +0900 Subject: [PATCH] Update --- PHI-MB/config.lua | 2 +- PHI-MB/data-final-fixes.lua | 0 PHI-MB/data-updates.lua | 5 ++--- PHI-RS/data-updates.lua | 4 ++-- PHI-RS/data.lua | 32 ++++++++++++++++---------------- PHI-RS/locale/en/locale.cfg | 6 +++--- PHI-RS/locale/ja/locale.cfg | 6 +++--- PHI-RS/locale/zh-CN/locale.cfg | 6 +++--- PHI-RS/locale/zh-TW/locale.cfg | 6 +++--- 9 files changed, 33 insertions(+), 34 deletions(-) delete mode 100644 PHI-MB/data-final-fixes.lua diff --git a/PHI-MB/config.lua b/PHI-MB/config.lua index d993ec0..44ac55b 100644 --- a/PHI-MB/config.lua +++ b/PHI-MB/config.lua @@ -63,7 +63,7 @@ local items = { if mods['PHI-RS'] then items['electric-filter-furnace'] = { - enabled = false, + enabled = true, stage = 2, type = 'assembling-machine', name = 'electric-filter-furnace', diff --git a/PHI-MB/data-final-fixes.lua b/PHI-MB/data-final-fixes.lua deleted file mode 100644 index e69de29..0000000 diff --git a/PHI-MB/data-updates.lua b/PHI-MB/data-updates.lua index 58d0b69..e09304e 100644 --- a/PHI-MB/data-updates.lua +++ b/PHI-MB/data-updates.lua @@ -109,15 +109,14 @@ data.raw['lab']['lab'].fast_replaceable_group = 'lab' data.raw['lab']['lab-2'].fast_replaceable_group = data.raw['lab']['lab'].fast_replaceable_group data.raw['lab']['lab-3'].fast_replaceable_group = data.raw['lab']['lab-2'].fast_replaceable_group ---[[ if mods['PHI-RS'] then - data.raw['assembling-machine']['electric-filter-furnace-2'].fast_replaceable_group = data.raw['assembling-machine']['electric-filter-furnace-1'].fast_replaceable_group + data.raw['assembling-machine']['electric-filter-furnace-2'].fast_replaceable_group = data.raw['assembling-machine']['electric-filter-furnace'].fast_replaceable_group data.raw['assembling-machine']['electric-filter-furnace-3'].fast_replaceable_group = data.raw['assembling-machine']['electric-filter-furnace-2'].fast_replaceable_group data.raw['assembling-machine']['electric-filter-furnace-2'].crafting_categories = data.raw['furnace']['electric-furnace'].crafting_categories data.raw['assembling-machine']['electric-filter-furnace-3'].crafting_categories = data.raw['furnace']['electric-furnace'].crafting_categories end -]] + -- aai if mods['aai-industry'] then -- industrial furnace diff --git a/PHI-RS/data-updates.lua b/PHI-RS/data-updates.lua index e96f294..320377e 100644 --- a/PHI-RS/data-updates.lua +++ b/PHI-RS/data-updates.lua @@ -1,4 +1,4 @@ -- electric furnace data.raw['furnace']['electric-furnace'].fast_replaceable_group = 'electric-furnace' -data.raw['assembling-machine']['electric-filter-furnace-1'].fast_replaceable_group = data.raw['furnace']['electric-furnace'].fast_replaceable_group -data.raw['assembling-machine']['electric-filter-furnace-1'].crafting_categories = data.raw['furnace']['electric-furnace'].crafting_categories +data.raw['assembling-machine']['electric-filter-furnace'].fast_replaceable_group = data.raw['furnace']['electric-furnace'].fast_replaceable_group +data.raw['assembling-machine']['electric-filter-furnace'].crafting_categories = data.raw['furnace']['electric-furnace'].crafting_categories diff --git a/PHI-RS/data.lua b/PHI-RS/data.lua index 4db3163..008f9c3 100644 --- a/PHI-RS/data.lua +++ b/PHI-RS/data.lua @@ -415,11 +415,11 @@ items = { } -- entity -local function EE(source, tier) +local function EE(source) local item = table.deepcopy(data.raw[source.type][source.ref_name]) - item.name = source.name .. '-' .. tier - item.minable.result = source.name .. '-' .. tier + item.name = source.name + item.minable.result = source.name -- item.animation.layers[1].filename = graphics_location .. source .. '-e.png' -- item.animation.layers[1].hr_version.filename = graphics_location .. source ..'-eh.png' @@ -435,38 +435,38 @@ local function EE(source, tier) end -- item -local function EI(source, tier) +local function EI(source) local item = table.deepcopy(data.raw.item[source.ref_name]) - item.name = source.name .. '-' .. tier - item.place_result = source.name .. '-' .. tier + item.name = source.name + item.place_result = source.ref_name -- item.icons = {{icon = graphics_location .. source .. '-i.png', icon_mipmaps = 4, icon_size = 64}} - item.order = item.order .. tier + item.order = item.order .. 'B' data:extend({item}) end -- recipe -local function ER(source, tier) +local function ER(source) data:extend({{ type = 'recipe', - name = source.name .. '-' .. tier, + name = source.name, energy_required = 2, enabled = false, ingredients = {{'steel-plate', 10}, {'advanced-circuit', 5}, {'stone-brick', 10}}, - result = source.name .. '-' .. tier, + result = source.name, }}) end -- tech -local function ET(source, tier) - table.insert(data.raw.technology[source.tech].effects, {type='unlock-recipe', recipe=source.name .. '-' .. tier}) +local function ET(source) + table.insert(data.raw.technology[source.tech].effects, {type='unlock-recipe', recipe=source.name}) end for _, v in pairs(items) do if v.enabled then - EE(v, 1) - EI(v, 1) - ER(v, 1) - ET(v, 1) + EE(v) + EI(v) + ER(v) + ET(v) end end diff --git a/PHI-RS/locale/en/locale.cfg b/PHI-RS/locale/en/locale.cfg index 65446f1..0317622 100644 --- a/PHI-RS/locale/en/locale.cfg +++ b/PHI-RS/locale/en/locale.cfg @@ -17,10 +17,10 @@ coal-liquefaction-s1=Coal liquefaction coal-liquefaction-s2=Coal liquefaction [item-name] -electric-filter-furnace-1=Electric filter furnace +electric-filter-furnace=Electric filter furnace [entity-name] -electric-filter-furnace-1=Electric filter furnace +electric-filter-furnace=Electric filter furnace [entity-description] -electric-filter-furnace-1=Faster and more flexible furnaces. \ No newline at end of file +electric-filter-furnace=Faster and more flexible furnaces. \ No newline at end of file diff --git a/PHI-RS/locale/ja/locale.cfg b/PHI-RS/locale/ja/locale.cfg index 94b574e..f720a1c 100644 --- a/PHI-RS/locale/ja/locale.cfg +++ b/PHI-RS/locale/ja/locale.cfg @@ -17,10 +17,10 @@ coal-liquefaction-s1=石炭液化 coal-liquefaction-s2=石炭液化 [item-name] -electric-filter-furnace-1=電気フィルター炉 +electric-filter-furnace=電気フィルター炉 [entity-name] -electric-filter-furnace-1=電気フィルター炉 +electric-filter-furnace=電気フィルター炉 [entity-description] -electric-filter-furnace-1=より高速で便利な炉です。 \ No newline at end of file +electric-filter-furnace=より高速で便利な炉です。 \ No newline at end of file diff --git a/PHI-RS/locale/zh-CN/locale.cfg b/PHI-RS/locale/zh-CN/locale.cfg index 4704951..52eaf57 100644 --- a/PHI-RS/locale/zh-CN/locale.cfg +++ b/PHI-RS/locale/zh-CN/locale.cfg @@ -17,10 +17,10 @@ coal-liquefaction-s1=液化煤 coal-liquefaction-s2=液化煤 [item-name] -electric-filter-furnace-1=智慧電爐 +electric-filter-furnace=智慧電爐 [entity-name] -electric-filter-furnace-1=智慧電爐 +electric-filter-furnace=智慧電爐 [entity-description] -electric-filter-furnace-1=更快速、更方便的熔爐。 \ No newline at end of file +electric-filter-furnace=更快速、更方便的熔爐。 \ No newline at end of file diff --git a/PHI-RS/locale/zh-TW/locale.cfg b/PHI-RS/locale/zh-TW/locale.cfg index 4704951..52eaf57 100644 --- a/PHI-RS/locale/zh-TW/locale.cfg +++ b/PHI-RS/locale/zh-TW/locale.cfg @@ -17,10 +17,10 @@ coal-liquefaction-s1=液化煤 coal-liquefaction-s2=液化煤 [item-name] -electric-filter-furnace-1=智慧電爐 +electric-filter-furnace=智慧電爐 [entity-name] -electric-filter-furnace-1=智慧電爐 +electric-filter-furnace=智慧電爐 [entity-description] -electric-filter-furnace-1=更快速、更方便的熔爐。 \ No newline at end of file +electric-filter-furnace=更快速、更方便的熔爐。 \ No newline at end of file