From 867b225d44b3f581e903ee193060fd961aa4dd7d Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Tue, 19 Sep 2023 01:11:24 +0900 Subject: [PATCH] . --- PHI-RS/config.lua | 36 -------------------------- PHI-RS/data.lua | 47 +++++++++++++++++++++++++++++++++- PHI-RS/info.json | 4 +-- PHI-RS/locale/en/locale.cfg | 11 +++++++- PHI-RS/locale/ja/locale.cfg | 11 +++++++- PHI-RS/locale/zh-CN/locale.cfg | 11 +++++++- PHI-RS/locale/zh-TW/locale.cfg | 11 +++++++- PHI-RS/settings.lua | 21 +++++++++++++++ 8 files changed, 109 insertions(+), 43 deletions(-) create mode 100644 PHI-RS/settings.lua diff --git a/PHI-RS/config.lua b/PHI-RS/config.lua index b22f3ed..d10f90d 100644 --- a/PHI-RS/config.lua +++ b/PHI-RS/config.lua @@ -211,42 +211,6 @@ local items = { name='nuclear-fuel', tech='kovarex-enrichment-process' }, - { - name='speed-module', - tech='speed-module' - }, - { - name='speed-module-2', - tech='speed-module-2' - }, - { - name='speed-module-3', - tech='speed-module-3' - }, - { - name='productivity-module', - tech='productivity-module' - }, - { - name='productivity-module-2', - tech='productivity-module-2' - }, - { - name='productivity-module-3', - tech='productivity-module-3' - }, - { - name='effectivity-module', - tech='effectivity-module' - }, - { - name='effectivity-module-2', - tech='effectivity-module-2' - }, - { - name='effectivity-module-3', - tech='effectivity-module-3' - }, { name='fast-inserter', tech='fast-inserter' diff --git a/PHI-RS/data.lua b/PHI-RS/data.lua index 7813c2a..f6274bf 100644 --- a/PHI-RS/data.lua +++ b/PHI-RS/data.lua @@ -1,6 +1,51 @@ -local recipe_multiplier = {4, 8} +local recipe_multiplier = {settings.startup['PHI-RS-RECIPE-1'].value, settings.startup['PHI-RS-RECIPE-2'].value} local items = require 'config' +if recipe_multiplier[1] == 1 then + recipe_multiplier[1] = nil +end + +if settings.startup['PHI-RS-MODULE'].value == true then + table.insert(items, { + name='speed-module', + tech='speed-module' + }) + table.insert(items, { + name='speed-module-2', + tech='speed-module-2' + }) + table.insert(items, { + name='speed-module-3', + tech='speed-module-3' + }) + table.insert(items, { + name='productivity-module', + tech='productivity-module' + }) + table.insert(items, { + name='productivity-module-2', + tech='productivity-module-2' + }) + table.insert(items, { + name='productivity-module-3', + tech='productivity-module-3' + }) + table.insert(items, { + name='effectivity-module', + tech='effectivity-module' + }) + table.insert(items, { + name='effectivity-module-2', + tech='effectivity-module-2' + }) + table.insert(items, { + name='effectivity-module-3', + tech='effectivity-module-3' + }) +end + + + for i=1, #items, 1 do if data.raw.recipe[items[i].name] ~= nil then for j=1, #recipe_multiplier, 1 do diff --git a/PHI-RS/info.json b/PHI-RS/info.json index 5cf2705..d8fe635 100644 --- a/PHI-RS/info.json +++ b/PHI-RS/info.json @@ -1,8 +1,8 @@ { "name": "PHI-RS", - "version": "1.0.5", + "version": "1.1.0", "factorio_version": "1.1", - "date": "2023-05-13", + "date": "2023-09-19", "title": "Phidias Recipe Scaling", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-RS/locale/en/locale.cfg b/PHI-RS/locale/en/locale.cfg index 0317622..e22181e 100644 --- a/PHI-RS/locale/en/locale.cfg +++ b/PHI-RS/locale/en/locale.cfg @@ -23,4 +23,13 @@ electric-filter-furnace=Electric filter furnace electric-filter-furnace=Electric filter furnace [entity-description] -electric-filter-furnace=Faster and more flexible furnaces. \ No newline at end of file +electric-filter-furnace=Faster and more flexible furnaces. + +[mod-setting-name] +PHI-RS-RECIPE-1=Recipe 1 +PHI-RS-RECIPE-2=Recipe 2 +PHI-RS-MODULE=Module + +[mod-setting-description] +PHI-RS-RECIPE-1=Default 4 ; Disable 1 +PHI-RS-RECIPE-2=Default 8 diff --git a/PHI-RS/locale/ja/locale.cfg b/PHI-RS/locale/ja/locale.cfg index f720a1c..b4a1b31 100644 --- a/PHI-RS/locale/ja/locale.cfg +++ b/PHI-RS/locale/ja/locale.cfg @@ -23,4 +23,13 @@ electric-filter-furnace=電気フィルター炉 electric-filter-furnace=電気フィルター炉 [entity-description] -electric-filter-furnace=より高速で便利な炉です。 \ No newline at end of file +electric-filter-furnace=より高速で便利な炉です。 + +[mod-setting-name] +PHI-RS-RECIPE-1=レシピ 1 +PHI-RS-RECIPE-2=レシピ 2 +PHI-RS-MODULE=モジュール + +[mod-setting-description] +PHI-RS-RECIPE-1=デフォルト 4 ; 止める 1 +PHI-RS-RECIPE-2=デフォルト 8 diff --git a/PHI-RS/locale/zh-CN/locale.cfg b/PHI-RS/locale/zh-CN/locale.cfg index 52eaf57..0c6eca5 100644 --- a/PHI-RS/locale/zh-CN/locale.cfg +++ b/PHI-RS/locale/zh-CN/locale.cfg @@ -23,4 +23,13 @@ electric-filter-furnace=智慧電爐 electric-filter-furnace=智慧電爐 [entity-description] -electric-filter-furnace=更快速、更方便的熔爐。 \ No newline at end of file +electric-filter-furnace=更快速、更方便的熔爐。 + +[mod-setting-name] +PHI-RS-RECIPE-1=配方 1 +PHI-RS-RECIPE-2=配方 2 +PHI-RS-MODULE=模組 + +[mod-setting-description] +PHI-RS-RECIPE-1=預設 4 ; 停用 1 +PHI-RS-RECIPE-2=預設 8 diff --git a/PHI-RS/locale/zh-TW/locale.cfg b/PHI-RS/locale/zh-TW/locale.cfg index 52eaf57..0c6eca5 100644 --- a/PHI-RS/locale/zh-TW/locale.cfg +++ b/PHI-RS/locale/zh-TW/locale.cfg @@ -23,4 +23,13 @@ electric-filter-furnace=智慧電爐 electric-filter-furnace=智慧電爐 [entity-description] -electric-filter-furnace=更快速、更方便的熔爐。 \ No newline at end of file +electric-filter-furnace=更快速、更方便的熔爐。 + +[mod-setting-name] +PHI-RS-RECIPE-1=配方 1 +PHI-RS-RECIPE-2=配方 2 +PHI-RS-MODULE=模組 + +[mod-setting-description] +PHI-RS-RECIPE-1=預設 4 ; 停用 1 +PHI-RS-RECIPE-2=預設 8 diff --git a/PHI-RS/settings.lua b/PHI-RS/settings.lua new file mode 100644 index 0000000..0e6a28a --- /dev/null +++ b/PHI-RS/settings.lua @@ -0,0 +1,21 @@ +data:extend({{ + type = 'int-setting', + name = 'PHI-RS-RECIPE-1', + setting_type = 'startup', + default_value = 4, + allowed_values = {1, 2, 3, 4, 5, 6}, + order = 'A1' + }, { + type = 'int-setting', + name = 'PHI-RS-RECIPE-2', + setting_type = 'startup', + default_value = 8, + allowed_values = {2, 3, 4, 5, 6, 7, 8, 9, 10}, + order = 'A2' + }, { + type = 'bool-setting', + name = 'PHI-RS-MODULE', + setting_type = 'startup', + default_value = true, + order = 'A3' + }}) \ No newline at end of file