From 17dc1b51b0ec7c6eadfad4d7772fc41277c27fc5 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Fri, 24 Jan 2025 15:18:48 +0900 Subject: [PATCH] . --- PHI-CL/data.lua | 8 ++-- PHI-CL/locale/en/locale.cfg | 74 +++++++++++++++++----------------- PHI-CL/locale/ja/locale.cfg | 2 +- PHI-CL/locale/zh-CN/locale.cfg | 2 +- PHI-CL/locale/zh-TW/locale.cfg | 2 +- PHI-CL/settings.lua | 44 ++++++++++---------- 6 files changed, 67 insertions(+), 65 deletions(-) diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 46386f2..098d3c7 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -183,10 +183,10 @@ if settings.startup['PHI-MI'].value then v.automatic = true end - if settings.startup['PHI-MI-EFFCY'].value then - data.raw['module']['efficiency-module'].effect = {consumption=-0.4, pollution=-0.4} - data.raw['module']['efficiency-module-2'].effect = {consumption=-0.8, pollution=-0.8} - data.raw['module']['efficiency-module-3'].effect = {consumption=-1.2, pollution=-1.2} + for _, v in pairs({data.raw['module']['efficiency-module'], data.raw['module']['efficiency-module-2'], data.raw['module']['efficiency-module-3']}) do + for _, v2 in pairs(v.effect) do + v2 = v2 * settings.startup['PHI-MI-EFFCY'].value / 100 + end end if settings.startup['PHI-MI-LANDFILL'].value ~= 50 then diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index 2e8fd07..c505e47 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -120,11 +120,11 @@ PHI-MI-PIPE=Pipe efficiency PHI-MI-ROBOT=Robot efficiency PHI-MI-ROBOT-ENERGY=Nuclear fussion robot PHI-MI-TRAIN=Train efficiency +PHI-MI-PIPE-EXTENT=Pipe Extent PHI-SA=[color=255,254,42]Space Age[/color] PHI-SA-ROCKET-CAPACITY=Rocket capacity PHI-SA-CARGO-WEIGHT=Rocket cargo weight -PHI-SA-PIPE-EXTENT=Pipe Extent PHI-SA-HEAT-RADIUS=Heat radius PHI-SA-SPOIL=Enable spoilage PHI-SA-SPOIL-FREEZE=Freeze spoilage @@ -166,51 +166,51 @@ PHI-SA-QUALITY=x0.1 [mod-setting-name-prefix] PHI-EN=[color=255,254,42]EN[/color] -PHI-EN-SOLAR-TIER=EN1 -PHI-EN-SOLAR-RATIO=EN2 -PHI-EN-POWER-TIER=EN3 +PHI-EN-SOLAR-TIER=[color=54,228,255]EN1[/color] +PHI-EN-SOLAR-RATIO=[color=54,228,255]EN2[/color] +PHI-EN-POWER-TIER=[color=54,228,255]EN3[/color] PHI-MB=[color=255,254,42]MB[/color] -PHI-MB-MACHINE-TIER=MB1 +PHI-MB-MACHINE-TIER=[color=54,228,255]MB1[/color] PHI-WE=[color=255,254,42]WE[/color] -PHI-WE-TURRET-TIER=WE1 -PHI-WE-RADAR-TIER=WE2 +PHI-WE-TURRET-TIER=[color=54,228,255]WE1[/color] +PHI-WE-RADAR-TIER=[color=54,228,255]WE2[/color] PHI-EQ=[color=255,254,42]EQ[/color] -PHI-EQ-POWER-TIER=EQ1 -PHI-EQ-DEFENSE-TIER=EQ2 -PHI-EQ-TOOL-TIER=EQ3 -PHI-EQ-UTILITY-TIER=EQ4 -PHI-EQ-ARMOR=EQ5 -PHI-EQ-SIZE=EQ6 +PHI-EQ-POWER-TIER=[color=54,228,255]EQ1[/color] +PHI-EQ-DEFENSE-TIER=[color=54,228,255]EQ2[/color] +PHI-EQ-TOOL-TIER=[color=54,228,255]EQ3[/color] +PHI-EQ-UTILITY-TIER=[color=54,228,255]EQ4[/color] +PHI-EQ-ARMOR=[color=54,228,255]EQ5[/color] +PHI-EQ-SIZE=[color=54,228,255]EQ6[/color] PHI-MI=[color=255,254,42]MI[/color] -PHI-MI-LANDFILL=MI1 -PHI-MI-EFFCY=MI2 -PHI-MI-NUCLEAR=MI3 -PHI-MI-PIPE=MI4 -PHI-MI-ROBOT=MI5 -PHI-MI-ROBOT-ENERGY=MI6 -PHI-MI-TRAIN=MI7 +PHI-MI-LANDFILL=[color=54,228,255]MI1[/color] +PHI-MI-EFFCY=[color=54,228,255]MI2[/color] +PHI-MI-NUCLEAR=[color=54,228,255]MI3[/color] +PHI-MI-PIPE=[color=54,228,255]MI4[/color] +PHI-MI-ROBOT=[color=54,228,255]MI5[/color] +PHI-MI-ROBOT-ENERGY=[color=54,228,255]MI6[/color] +PHI-MI-TRAIN=[color=54,228,255]MI7[/color] +PHI-MI-PIPE-EXTENT=[color=54,228,255]MI8[/color] PHI-SA=[color=255,254,42]SA[/color] -PHI-SA-ROCKET-CAPACITY=SA1 -PHI-SA-CARGO-WEIGHT=SA2 -PHI-SA-PIPE-EXTENT=SA3 -PHI-SA-HEAT-RADIUS=SA4 -PHI-SA-SPOIL=SA5 -PHI-SA-SPOIL-FREEZE=SA6 -PHI-SA-SPOIL-FREEZE-RATIO=SA7 -PHI-SA-RESTRICTION=SA8 -PHI-SA-GENERIC=SA9 -PHI-SA-QUALITY=SA10 -PHI-SA-NO-QUALITY=SA11 -PHI-SA-VANILLA=SA12 +PHI-SA-ROCKET-CAPACITY=[color=54,228,255]SA1[/color] +PHI-SA-CARGO-WEIGHT=[color=54,228,255]SA2[/color] +PHI-SA-HEAT-RADIUS=[color=54,228,255]SA3[/color] +PHI-SA-SPOIL=[color=54,228,255]SA4[/color] +PHI-SA-SPOIL-FREEZE=[color=54,228,255]SA5[/color] +PHI-SA-SPOIL-FREEZE-RATIO=[color=54,228,255]SA6[/color] +PHI-SA-RESTRICTION=[color=54,228,255]SA7[/color] +PHI-SA-GENERIC=[color=54,228,255]SA8[/color] +PHI-SA-QUALITY=[color=54,228,255]SA9[/color] +PHI-SA-NO-QUALITY=[color=54,228,255]SA10[/color] +PHI-SA-VANILLA=[color=54,228,255]SA11[/color] PHI-CT=[color=255,254,42]CT[/color] -PHI-CT-TOOL=CT1 -PHI-CT-UTILITY=CT2 -PHI-CT-HIDDEN=CT3 -PHI-CT-TILE=CT4 -PHI-CT-TILE-CHOICE=CT5 +PHI-CT-TOOL=[color=54,228,255]CT1[/color] +PHI-CT-UTILITY=[color=54,228,255]CT2[/color] +PHI-CT-HIDDEN=[color=54,228,255]CT3[/color] +PHI-CT-TILE=[color=54,228,255]CT4[/color] +PHI-CT-TILE-CHOICE=[color=54,228,255]CT5[/color] diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg index 1e8967c..f715e79 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -120,11 +120,11 @@ PHI-MI-PIPE=パイプ効率 PHI-MI-ROBOT=ロボット効率 PHI-MI-ROBOT-ENERGY=核融合ロボット PHI-MI-TRAIN=列車効率 +PHI-MI-PIPE-EXTENT=パイプ範囲 PHI-SA=[color=255,254,42]Space Age[/color] PHI-SA-ROCKET-CAPACITY=ロケット容量 PHI-SA-CARGO-WEIGHT=ロケット積載重量 -PHI-SA-PIPE-EXTENT=パイプ範囲 PHI-SA-HEAT-RADIUS=熱半径 PHI-SA-SPOIL=変質を有効にする PHI-SA-SPOIL-FREEZE=変質凍結 diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg index cb0bfb5..028d2dc 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -120,11 +120,11 @@ PHI-MI-PIPE=水管效率 PHI-MI-ROBOT=無人機效率 PHI-MI-ROBOT-ENERGY=核融合無人機 PHI-MI-TRAIN=火車效率 +PHI-MI-PIPE-EXTENT=管道長度 PHI-SA=[color=255,254,42]太空時代[/color] PHI-SA-ROCKET-CAPACITY=火箭容量 PHI-SA-CARGO-WEIGHT=火箭貨物重量 -PHI-SA-PIPE-EXTENT=管道長度 PHI-SA-HEAT-RADIUS=熱半徑 PHI-SA-SPOIL=啟用變質 PHI-SA-SPOIL-FREEZE=變質凍結 diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg index cb0bfb5..028d2dc 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -120,11 +120,11 @@ PHI-MI-PIPE=水管效率 PHI-MI-ROBOT=無人機效率 PHI-MI-ROBOT-ENERGY=核融合無人機 PHI-MI-TRAIN=火車效率 +PHI-MI-PIPE-EXTENT=管道長度 PHI-SA=[color=255,254,42]太空時代[/color] PHI-SA-ROCKET-CAPACITY=火箭容量 PHI-SA-CARGO-WEIGHT=火箭貨物重量 -PHI-SA-PIPE-EXTENT=管道長度 PHI-SA-HEAT-RADIUS=熱半徑 PHI-SA-SPOIL=啟用變質 PHI-SA-SPOIL-FREEZE=變質凍結 diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index 53becbb..c59491a 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -139,10 +139,12 @@ data:extend({ localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-LANDFILL'}, {'mod-setting-name.PHI-MI-LANDFILL'}}, order = 'E01' }, { - type = 'bool-setting', + type = 'int-setting', name = 'PHI-MI-EFFCY', setting_type = 'startup', - default_value = true, + default_value = 100, + minimum_value = 10, + maximum_value = 1000, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-EFFCY'}, {'mod-setting-name.PHI-MI-EFFCY'}}, order = 'E02' }, { @@ -164,7 +166,7 @@ data:extend({ type = 'int-setting', name = 'PHI-MI-ROBOT', setting_type = 'startup', - default_value = 2, + default_value = 1, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-ROBOT'}, {'mod-setting-name.PHI-MI-ROBOT'}}, order = 'E05' @@ -183,6 +185,15 @@ data:extend({ allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-TRAIN'}, {'mod-setting-name.PHI-MI-TRAIN'}}, order = 'E07' +}, { + type = 'int-setting', + name = 'PHI-MI-PIPE-EXTENT', + setting_type = 'startup', + default_value = 320, + minimum_value = 80, + maximum_value = 2560, + localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-PIPE-EXTENT'}, {'mod-setting-name.PHI-MI-PIPE-EXTENT'}}, + order = 'E08' }, { type = 'bool-setting', name = 'PHI-SA', @@ -208,15 +219,6 @@ data:extend({ maximum_value = 1000, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-CARGO-WEIGHT'}, {'mod-setting-name.PHI-SA-CARGO-WEIGHT'}}, order = 'F02' -}, { - type = 'int-setting', - name = 'PHI-SA-PIPE-EXTENT', - setting_type = 'startup', - default_value = 320, - minimum_value = 80, - maximum_value = 2560, - localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-PIPE-EXTENT'}, {'mod-setting-name.PHI-SA-PIPE-EXTENT'}}, - order = 'F03' }, { type = 'int-setting', name = 'PHI-SA-HEAT-RADIUS', @@ -225,21 +227,21 @@ data:extend({ minimum_value = 1, maximum_value = 7, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-HEAT-RADIUS'}, {'mod-setting-name.PHI-SA-HEAT-RADIUS'}}, - order = 'F04' + order = 'F03' }, { type = 'bool-setting', name = 'PHI-SA-SPOIL', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-SPOIL'}, {'mod-setting-name.PHI-SA-SPOIL'}}, - order = 'F05' + order = 'F04' }, { type = 'bool-setting', name = 'PHI-SA-SPOIL-FREEZE', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-SPOIL-FREEZE'}, {'mod-setting-name.PHI-SA-SPOIL-FREEZE'}}, - order = 'F06' + order = 'F05' }, { type = 'int-setting', name = 'PHI-SA-SPOIL-FREEZE-RATIO', @@ -248,21 +250,21 @@ data:extend({ minimum_value = 1, maximum_value = 1000, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-SPOIL-FREEZE-RATIO'}, {'mod-setting-name.PHI-SA-SPOIL-FREEZE-RATIO'}}, - order = 'F07' + order = 'F06' }, { type = 'bool-setting', name = 'PHI-SA-RESTRICTION', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-RESTRICTION'}, {'mod-setting-name.PHI-SA-RESTRICTION'}}, - order = 'F08' + order = 'F07' }, { type = 'bool-setting', name = 'PHI-SA-GENERIC', setting_type = 'startup', default_value = true, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-GENERIC'}, {'mod-setting-name.PHI-SA-GENERIC'}}, - order = 'F09' + order = 'F08' }, { type = 'int-setting', name = 'PHI-SA-QUALITY', @@ -271,21 +273,21 @@ data:extend({ minimum_value = 1, maximum_value = 100, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-QUALITY'}, {'mod-setting-name.PHI-SA-QUALITY'}}, - order = 'F10' + order = 'F09' }, { type = 'bool-setting', name = 'PHI-SA-NO-QUALITY', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-NO-QUALITY'}, {'mod-setting-name.PHI-SA-NO-QUALITY'}}, - order = 'F11' + order = 'F10' }, { type = 'bool-setting', name = 'PHI-SA-VANILLA', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-VANILLA'}, {'mod-setting-name.PHI-SA-VANILLA'}}, - order = 'F12' + order = 'F11' }, { type = 'bool-setting', name = 'PHI-CT',