From f9e467e6a7077613ac61dca7d54c077ef900c909 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Fri, 25 Oct 2024 02:30:16 +0900 Subject: [PATCH] . --- PHI-CL/config.lua | 32 ++++++++++++++--------------- PHI-CL/locale/en/locale.cfg | 15 ++------------ PHI-CL/locale/ja/locale.cfg | 15 ++------------ PHI-CL/locale/zh-CN/locale.cfg | 15 ++------------ PHI-CL/locale/zh-TW/locale.cfg | 15 ++------------ PHI-CL/settings.lua | 37 +--------------------------------- 6 files changed, 25 insertions(+), 104 deletions(-) diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua index 2b28a82..0baff21 100644 --- a/PHI-CL/config.lua +++ b/PHI-CL/config.lua @@ -131,7 +131,7 @@ local items = { ref_name = 'assembling-machine-3', tech = 'automation-3', min = 4, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value + 2 + max = settings.startup['PHI-MB-MACHINE-TIER'].value + 2 }, ['electric-furnace'] = { enabled = settings.startup['PHI-MB'].value, @@ -141,7 +141,7 @@ local items = { ref_name = 'electric-furnace', tech = 'advanced-material-processing-2', min = 2, - max = settings.startup['PHI-MB-FURNACE-TIER'].value + max = settings.startup['PHI-MB-MACHINE-TIER'].value }, ['oil-refinery'] = { enabled = settings.startup['PHI-MB'].value, @@ -151,7 +151,7 @@ local items = { ref_name = 'oil-refinery', tech = 'oil-processing', min = 2, - max = settings.startup['PHI-MB-OIL-TIER'].value + max = settings.startup['PHI-MB-MACHINE-TIER'].value }, ['chemical-plant'] = { enabled = settings.startup['PHI-MB'].value, @@ -161,7 +161,7 @@ local items = { ref_name = 'chemical-plant', tech = 'oil-processing', min = 2, - max = settings.startup['PHI-MB-OIL-TIER'].value + max = settings.startup['PHI-MB-MACHINE-TIER'].value }, ['centrifuge'] = { enabled = settings.startup['PHI-MB'].value, @@ -171,7 +171,7 @@ local items = { ref_name = 'centrifuge', tech = 'uranium-processing', min = 2, - max = settings.startup['PHI-MB-CENTRIFUGE-TIER'].value + max = settings.startup['PHI-MB-MACHINE-TIER'].value }, ['lab'] = { enabled = settings.startup['PHI-MB'].value, @@ -181,7 +181,7 @@ local items = { ref_name = 'lab', tech = 'automation', min = 2, - max = settings.startup['PHI-MB-LAB-TIER'].value + max = settings.startup['PHI-MB-MACHINE-TIER'].value }, ['electric-mining-drill'] = { enabled = settings.startup['PHI-MB'].value, @@ -191,7 +191,7 @@ local items = { ref_name = 'electric-mining-drill', tech = 'automation', min = 2, - max = settings.startup['PHI-MB-MINING-TIER'].value + max = settings.startup['PHI-MB-MACHINE-TIER'].value }, ['pumpjack'] = { enabled = settings.startup['PHI-MB'].value, @@ -201,7 +201,7 @@ local items = { ref_name = 'pumpjack', tech = 'automation', min = 2, - max = settings.startup['PHI-MB-MINING-TIER'].value + max = settings.startup['PHI-MB-MACHINE-TIER'].value }, ['laser-turret'] = { enabled = settings.startup['PHI-WE'].value, @@ -324,7 +324,7 @@ if mods['space-age'] then ref_name = 'foundry', tech = 'foundry', min = 2, - max = settings.startup['PHI-MB-FURNACE-TIER'].value + max = settings.startup['PHI-MB-MACHINE-TIER'].value items['item']['big-mining-drill'] = { @@ -335,7 +335,7 @@ if mods['space-age'] then ref_name = 'big-mining-drill', tech = 'big-mining-drill', min = 2, - max = settings.startup['PHI-MB-MINING-TIER'].value + max = settings.startup['PHI-MB-MACHINE-TIER'].value } items['item']['biochamber'] = { @@ -346,7 +346,7 @@ if mods['space-age'] then ref_name = 'biochamber', tech = 'biochamber', min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value + max = settings.startup['PHI-MB-MACHINE-TIER'].value } items['item']['crusher'] = { @@ -357,7 +357,7 @@ if mods['space-age'] then ref_name = 'crusher', tech = 'space-platform', min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value + max = settings.startup['PHI-MB-MACHINE-TIER'].value } items['item']['biolab'] = { @@ -368,7 +368,7 @@ if mods['space-age'] then ref_name = 'biolab', tech = 'biolab', min = 2, - max = settings.startup['PHI-MB-LAB-TIER'].value + max = settings.startup['PHI-MB-MACHINE-TIER'].value } items['item']['agricultural-tower'] = { @@ -379,7 +379,7 @@ if mods['space-age'] then ref_name = 'agricultural-tower', tech = 'agriculture', min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value + max = settings.startup['PHI-MB-MACHINE-TIER'].value } items['item']['cryogenic-plant'] = { @@ -390,7 +390,7 @@ if mods['space-age'] then ref_name = 'cryogenic-plant', tech = 'cryogenic-plant', min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value + max = settings.startup['PHI-MB-MACHINE-TIER'].value } items['item']['electromagnetic-plant'] = { @@ -401,7 +401,7 @@ if mods['space-age'] then ref_name = 'electromagnetic-plant', tech = 'electromagnetic-plant', min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value + max = settings.startup['PHI-MB-MACHINE-TIER'].value } end ]] diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index e2b7307..e98c143 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -235,12 +235,7 @@ PHI-EN-SOLAR-TIER=EN1 Solar panel tier PHI-EN-POWER-TIER=EN2 Power tier PHI-MB=MB Enable fast machine -PHI-MB-ASSEMBLING-TIER=MB1 Assembling machine tier -PHI-MB-FURNACE-TIER=MB2 Electric furnace tier -PHI-MB-OIL-TIER=MB3 Oil refinery tier -PHI-MB-CENTRIFUGE-TIER=MB4 Centrifuge tier -PHI-MB-LAB-TIER=MB5 Lab tier -PHI-MB-MINING-TIER=MB6 Electric mining drill tier +PHI-MB-MACHINE-TIER=MB1 Machine tier PHI-WE=WE Enable military defense PHI-WE-LASER-TIER=WE1 Laser turret tier @@ -291,13 +286,7 @@ PHI-CT-TRAIN=CT12 Electric train PHI-EN-SOLAR-TIER=Default 8 ; Disable 1 PHI-EN-POWER-TIER=Default 5 ; Disable 1 -PHI-MB-ASSEMBLING-TIER=Default 5 ; Disable 3 -PHI-MB-FURNACE-TIER=Default 3 ; Disable 1 -PHI-MB-OIL-TIER=Default 3 ; Disable 1 -PHI-MB-CENTRIFUGE-TIER=Default 3 ; Disable 1 -PHI-MB-LAB-TIER=Default 3 ; Disable 1 -PHI-MB-MINING-TIER=Default 3 ; Disable 1 -PHI-MB-SE-ASSEMBLING-TIER=Default 3 ; Disable 1 +PHI-MB-MACHINE-TIER=Default 3 ; Disable 1 PHI-WE-LASER-TIER=Default 3 ; Disable 1 PHI-WE-FLAME-TIER=Default 3 ; Disable 1 diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg index 854574a..3daa37a 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -234,12 +234,7 @@ PHI-EN-SOLAR-TIER=EN1 ソーラーパネルの最高等級 PHI-EN-POWER-TIER=EN2 パワーの最高等級 PHI-MB=MB より速く機械を有効にする -PHI-MB-ASSEMBLING-TIER=MB1 組立機の最高等級 -PHI-MB-FURNACE-TIER=MB2 電気炉の最高等級 -PHI-MB-OIL-TIER=MB3 原油精製所の最高等級 -PHI-MB-CENTRIFUGE-TIER=MB4 遠心分離機の最高等級 -PHI-MB-LAB-TIER=MB5 研究所の最高等級 -PHI-MB-MINING-TIER=MB6 電動掘削機の最高等級 +PHI-MB-MACHINE-TIER=MB1 機械の最高等級 PHI-WE=WE 軍事防衛を有効にする PHI-WE-LASER-TIER=WE1 レーザータレットの最高等級 @@ -290,13 +285,7 @@ PHI-CT-TRAIN=CT12 電車 PHI-EN-SOLAR-TIER=デフォルト 8 ; 止める 1 PHI-EN-POWER-TIER=デフォルト 5 ; 止める 1 -PHI-MB-ASSEMBLING-TIER=デフォルト 5 ; 止める 3 -PHI-MB-FURNACE-TIER=デフォルト 3 ; 止める 1 -PHI-MB-OIL-TIER=デフォルト 3 ; 止める 1 -PHI-MB-CENTRIFUGE-TIER=デフォルト 3 ; 止める 1 -PHI-MB-LAB-TIER=デフォルト 3 ; 止める 1 -PHI-MB-MINING-TIER=デフォルト 3 ; 止める 1 -PHI-MB-SE-ASSEMBLING-TIER=デフォルト 3 ; 止める 1 +PHI-MB-MACHINE-TIER=デフォルト 3 ; 止める 1 PHI-WE-LASER-TIER=デフォルト 3 ; 止める 1 PHI-WE-FLAME-TIER=デフォルト 3 ; 止める 1 diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg index 4e78885..95c6b62 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -234,12 +234,7 @@ PHI-EN-SOLAR-TIER=EN1 太陽能板的最高等級 PHI-EN-POWER-TIER=EN2 電力的最高等級 PHI-MB=MB 啟用快速機器 -PHI-MB-ASSEMBLING-TIER=MB1 組裝機的最高等級 -PHI-MB-FURNACE-TIER=MB2 電爐的最高等級 -PHI-MB-OIL-TIER=MB3 煉油廠的最高等級 -PHI-MB-CENTRIFUGE-TIER=MB4 離心機的最高等級 -PHI-MB-LAB-TIER=MB5 實驗室的最高等級 -PHI-MB-MINING-TIER=MB6 電能採礦機的最高等級 +PHI-MB-MACHINE-TIER=MB1 機器的最高等級 PHI-WE=WE 啟用軍事防禦 PHI-WE-LASER-TIER=WE1 雷射炮塔的最高等級 @@ -290,13 +285,7 @@ PHI-CT-TRAIN=CT12 電動火車 PHI-EN-SOLAR-TIER=預設 8 ; 停用 1 PHI-EN-POWER-TIER=預設 5 ; 停用 1 -PHI-MB-ASSEMBLING-TIER=預設 5 ; 停用 3 -PHI-MB-FURNACE-TIER=預設 3 ; 停用 1 -PHI-MB-OIL-TIER=預設 3 ; 停用 1 -PHI-MB-CENTRIFUGE-TIER=預設 3 ; 停用 1 -PHI-MB-LAB-TIER=預設 3 ; 停用 1 -PHI-MB-MINING-TIER=預設 3 ; 停用 1 -PHI-MB-SE-ASSEMBLING-TIER=預設 3 ; 停用 1 +PHI-MB-MACHINE-TIER=預設 3 ; 停用 1 PHI-WE-LASER-TIER=預設 3 ; 停用 1 PHI-WE-FLAME-TIER=預設 3 ; 停用 1 diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg index 4e78885..95c6b62 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -234,12 +234,7 @@ PHI-EN-SOLAR-TIER=EN1 太陽能板的最高等級 PHI-EN-POWER-TIER=EN2 電力的最高等級 PHI-MB=MB 啟用快速機器 -PHI-MB-ASSEMBLING-TIER=MB1 組裝機的最高等級 -PHI-MB-FURNACE-TIER=MB2 電爐的最高等級 -PHI-MB-OIL-TIER=MB3 煉油廠的最高等級 -PHI-MB-CENTRIFUGE-TIER=MB4 離心機的最高等級 -PHI-MB-LAB-TIER=MB5 實驗室的最高等級 -PHI-MB-MINING-TIER=MB6 電能採礦機的最高等級 +PHI-MB-MACHINE-TIER=MB1 機器的最高等級 PHI-WE=WE 啟用軍事防禦 PHI-WE-LASER-TIER=WE1 雷射炮塔的最高等級 @@ -290,13 +285,7 @@ PHI-CT-TRAIN=CT12 電動火車 PHI-EN-SOLAR-TIER=預設 8 ; 停用 1 PHI-EN-POWER-TIER=預設 5 ; 停用 1 -PHI-MB-ASSEMBLING-TIER=預設 5 ; 停用 3 -PHI-MB-FURNACE-TIER=預設 3 ; 停用 1 -PHI-MB-OIL-TIER=預設 3 ; 停用 1 -PHI-MB-CENTRIFUGE-TIER=預設 3 ; 停用 1 -PHI-MB-LAB-TIER=預設 3 ; 停用 1 -PHI-MB-MINING-TIER=預設 3 ; 停用 1 -PHI-MB-SE-ASSEMBLING-TIER=預設 3 ; 停用 1 +PHI-MB-MACHINE-TIER=預設 3 ; 停用 1 PHI-WE-LASER-TIER=預設 3 ; 停用 1 PHI-WE-FLAME-TIER=預設 3 ; 停用 1 diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index be932b9..cc77e1b 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -27,46 +27,11 @@ data:extend({ order = 'B00' }, { type = 'int-setting', - name = 'PHI-MB-ASSEMBLING-TIER', + name = 'PHI-MB-MACHINE-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, order = 'B01' - }, { - type = 'int-setting', - name = 'PHI-MB-FURNACE-TIER', - setting_type = 'startup', - default_value = 3, - allowed_values = {1, 2, 3}, - order = 'B02' - }, { - type = 'int-setting', - name = 'PHI-MB-OIL-TIER', - setting_type = 'startup', - default_value = 3, - allowed_values = {1, 2, 3}, - order = 'B03' - }, { - type = 'int-setting', - name = 'PHI-MB-CENTRIFUGE-TIER', - setting_type = 'startup', - default_value = 3, - allowed_values = {1, 2, 3}, - order = 'B04' - }, { - type = 'int-setting', - name = 'PHI-MB-LAB-TIER', - setting_type = 'startup', - default_value = 3, - allowed_values = {1, 2, 3}, - order = 'B05' - }, { - type = 'int-setting', - name = 'PHI-MB-MINING-TIER', - setting_type = 'startup', - default_value = 3, - allowed_values = {1, 2, 3}, - order = 'B06' }, { type = 'bool-setting', name = 'PHI-WE',