From b2b20adb3c72c5283f612522a5d6b80f8f5dbaf4 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Thu, 31 Oct 2024 17:45:40 +0900 Subject: [PATCH] . --- PHI-CL/locale/en/locale.cfg | 7 +++---- PHI-CL/locale/ja/locale.cfg | 8 +++----- PHI-CL/locale/zh-CN/locale.cfg | 7 +++---- PHI-CL/locale/zh-TW/locale.cfg | 7 +++---- PHI-CL/main.lua | 14 ++------------ PHI-CL/note.lua | 20 +++----------------- 6 files changed, 17 insertions(+), 46 deletions(-) diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index 63d1112..39ddd45 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -115,10 +115,9 @@ PHI-MI=MI Miscellaneous change PHI-MI-LANDFILL=MI1 Landfill requirement PHI-MI-EFFCY=MI2 Efficiency module efficiency PHI-MI-NUCLEAR=MI3 Nuclear adjustable output -PHI-MI-BOILER=MI4 Electric boiler -PHI-MI-PIPE=MI5 Pipe efficiency -PHI-MI-ROBOT=MI6 Robot efficiency -PHI-MI-TRAIN=MI7 Train efficiency +PHI-MI-PIPE=MI4 Pipe efficiency +PHI-MI-ROBOT=MI5 Robot efficiency +PHI-MI-TRAIN=MI6 Train efficiency PHI-CT=CT Creative testing tools PHI-CT-TOOL=CT1 Tool diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg index 402df9b..7ae13aa 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -57,7 +57,6 @@ rocket-turret=ロケットタレット tesla-turret=テスラタレット thruster=スラスター - battery-mk2-equipment=個人用バッテリー battery-mk3-equipment=個人用バッテリー discharge-defense-equipment=携帯放電防御モジュール @@ -115,10 +114,9 @@ PHI-MI=MI その他の変更 PHI-MI-LANDFILL=MI1 埋立地要件 PHI-MI-EFFCY=MI2 エネルギー効率モジュール効率 PHI-MI-NUCLEAR=MI3 原子炉出力の調整可能 -PHI-MI-REPAIR=MI4 リペア効率 -PHI-MI-PIPE=MI5 パイプ効率 -PHI-MI-ROBOT=MI6 ロボット効率 -PHI-MI-TRAIN=MI7 列車効率 +PHI-MI-PIPE=MI4 パイプ効率 +PHI-MI-ROBOT=MI5 ロボット効率 +PHI-MI-TRAIN=MI6 列車効率 PHI-CT=CT クリエイティブテストツール PHI-CT-TOOL=CT1 ツール diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg index fb79810..21af986 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -114,10 +114,9 @@ PHI-MI=MI 雜項小變化 PHI-MI-LANDFILL=MI1 人造陸地需求 PHI-MI-EFFCY=MI2 節能組件效率 PHI-MI-NUCLEAR=MI3 核能反應爐可調輸出 -PHI-MI-REPAIR=MI4 維修效率 -PHI-MI-PIPE=MI5 水管效率 -PHI-MI-ROBOT=MI6 無人機效率 -PHI-MI-TRAIN=MI7 火車效率 +PHI-MI-PIPE=MI4 水管效率 +PHI-MI-ROBOT=MI5 無人機效率 +PHI-MI-TRAIN=MI6 火車效率 PHI-CT=CT 創意測試工具 PHI-CT-TOOL=CT1 工具 diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg index fb79810..21af986 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -114,10 +114,9 @@ PHI-MI=MI 雜項小變化 PHI-MI-LANDFILL=MI1 人造陸地需求 PHI-MI-EFFCY=MI2 節能組件效率 PHI-MI-NUCLEAR=MI3 核能反應爐可調輸出 -PHI-MI-REPAIR=MI4 維修效率 -PHI-MI-PIPE=MI5 水管效率 -PHI-MI-ROBOT=MI6 無人機效率 -PHI-MI-TRAIN=MI7 火車效率 +PHI-MI-PIPE=MI4 水管效率 +PHI-MI-ROBOT=MI5 無人機效率 +PHI-MI-TRAIN=MI6 火車效率 PHI-CT=CT 創意測試工具 PHI-CT-TOOL=CT1 工具 diff --git a/PHI-CL/main.lua b/PHI-CL/main.lua index 756159c..01c987b 100644 --- a/PHI-CL/main.lua +++ b/PHI-CL/main.lua @@ -5,7 +5,7 @@ local main = {} local function tint_handle(item, tier, tl) for _, ve in pairs(tl) do if item[ve] then - for _, tc in pairs({'layers', 'sheets', 'structure'}) do + for _, tc in pairs({'layers', 'sheets', 'structure', 'frames'}) do if item[ve][tc] and type(item[ve][tc]) == 'table' then for _, v2 in pairs(item[ve][tc]) do v2.tint = items['tint'][tier] @@ -189,17 +189,7 @@ function main.EEE(source, tier) item.radius = item.radius + (1 * (tier - source.min + 1)) end - if item.picture then - item.picture.tint = items['tint'][tier] - end - - tint_handle(item, tier, {'pictures', 'animation', 'structure', 'integration_patch'}) - - for _, v in pairs({'horizontal_animation', 'vertical_animation'}) do - if item[v] then - tint_handle(item[v], tier, {'frames'}) - end - end + tint_handle(item, tier, {'picture', 'pictures', 'animation', 'structure', 'integration_patch', 'horizontal_animation', 'vertical_animation'}) for _, v in pairs({'graphics_set', 'graphics_set_flipped'}) do if item[v] then diff --git a/PHI-CL/note.lua b/PHI-CL/note.lua index d3ba067..debe2e3 100644 --- a/PHI-CL/note.lua +++ b/PHI-CL/note.lua @@ -863,13 +863,6 @@ if settings.startup['PHI-MB'].value and mods['space-exploration'] and settings.s end end -if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-REPAIR'].value then - for _, v in pairs(data.raw['repair-tool']) do - v.speed = v.speed * settings.startup['PHI-MI-REPAIR'].value - v.durability = v.durability * settings.startup['PHI-MI-REPAIR'].value - end -end - if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].value then local s = (1 + settings.startup['PHI-MI-PIPE'].value) / 2 @@ -1004,33 +997,26 @@ end ** SETTING { - type = 'int-setting', - name = 'PHI-MI-REPAIR', - setting_type = 'startup', - default_value = 1, - allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'E06' - }, { type = 'int-setting', name = 'PHI-MI-PIPE', setting_type = 'startup', default_value = 1, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'E07' + order = 'E04' }, { type = 'int-setting', name = 'PHI-MI-ROBOT', setting_type = 'startup', default_value = 1, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'E08' + order = 'E05' }, { type = 'int-setting', name = 'PHI-MI-TRAIN', setting_type = 'startup', default_value = 1, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'E09' + order = 'E06' }, { type = 'bool-setting', name = 'PHI-CT-TILE',