From 9707e8c792fc674dbe049a312fb6299f3b55f3f6 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Fri, 4 Oct 2024 17:58:38 +0900 Subject: [PATCH] . --- PHI-CL/data-updates.lua | 38 +++++++++++++++++++++++++++++++--- PHI-CL/locale/en/locale.cfg | 4 +++- PHI-CL/locale/ja/locale.cfg | 4 +++- PHI-CL/locale/zh-CN/locale.cfg | 4 +++- PHI-CL/locale/zh-TW/locale.cfg | 4 +++- PHI-CL/settings.lua | 16 +++++++++++++- 6 files changed, 62 insertions(+), 8 deletions(-) diff --git a/PHI-CL/data-updates.lua b/PHI-CL/data-updates.lua index ae36a32..2eeb606 100644 --- a/PHI-CL/data-updates.lua +++ b/PHI-CL/data-updates.lua @@ -83,15 +83,47 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-NUCLEAR'].value 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 + for _, t in pairs({data.raw['pipe'], data.raw['pipe-to-ground']}) do for _, v in pairs(t) do - v.fluid_box.height = v.fluid_box.height * ((1 + settings.startup['PHI-MI-PIPE'].value) / 2) + v.fluid_box.height = v.fluid_box.height * s end end for _, v in pairs(data.raw['pump']) do - v.fluid_box.height = v.fluid_box.height * ((1 + settings.startup['PHI-MI-PIPE'].value) / 2) - v.pumping_speed = v.pumping_speed * ((1 + settings.startup['PHI-MI-PIPE'].value) / 2) + v.fluid_box.height = v.fluid_box.height * s + v.pumping_speed = v.pumping_speed * s + end +end + +if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-ROBOT'].value then + local s = (1 + settings.startup['PHI-MI-ROBOT'].value) / 2 + local sn = (17 - settings.startup['PHI-MI-ROBOT'].value) / 16 + + for _, t in pairs({data.raw['construction-robot'], data.raw['logistic-robot']}) do + for _, v in pairs(t) do + v.speed = v.speed * s + v.energy_per_tick = tostring(tonumber(string.match(v.energy_per_tick, '[%d%.]+')) * sn) .. string.match(v.energy_per_tick, '%a+') + v.energy_per_move = tostring(tonumber(string.match(v.energy_per_move, '[%d%.]+')) * sn) .. string.match(v.energy_per_move, '%a+') + end + end +end + +if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-TRAIN'].value then + local s = (7 + settings.startup['PHI-MI-TRAIN'].value) / 8 + + for _, t in pairs({data.raw['locomotive'], data.raw['cargo-wagon'], data.raw['fluid-wagon'], data.raw['artillery-wagon']}) do + for _, v in pairs(t) do + v.max_health = v.max_health * s + v.max_speed = v.max_speed * s + v.braking_force = v.braking_force * s + + if v.max_power then + v.max_power = tostring(tonumber(string.match(v.max_power, '[%d%.]+')) * s) .. string.match(v.max_power, '%a+') + v.reversing_power_modifier = 1 + end + end end end diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index 9b581f0..3d4985c 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -293,7 +293,9 @@ PHI-MI-BOILER=MI4 Electric boiler PHI-MI-CHEST=MI5 Basic chest PHI-MI-REPAIR=MI6 Repair efficiency PHI-MI-PIPE=MI7 Pipe efficiency -PHI-MI-ARTILLERY=MI8 Artillery range +PHI-MI-ROBOT=MI8 Robot efficiency +PHI-MI-TRAIN=MI9 Train efficiency +PHI-MI-ARTILLERY=MI10 Artillery range PHI-RS=RS Recipe scaling PHI-RS-RECIPE-1=RS1 Recipe scale 1 diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg index a17646e..c257ed5 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -293,7 +293,9 @@ PHI-MI-BOILER=MI4 電気ボイラー PHI-MI-CHEST=MI5 基本的な貯蔵チェスト PHI-MI-REPAIR=MI6 リペア効率 PHI-MI-PIPE=MI7 パイプ効率 -PHI-MI-ARTILLERY=MI8 長距離砲射程 +PHI-MI-ROBOT=MI8 ロボット効率 +PHI-MI-TRAIN=MI9 列車効率 +PHI-MI-ARTILLERY=MI10 長距離砲射程 PHI-RS=RS レシピ スケーリング PHI-RS-RECIPE-1=RS1 レシピ規模 1 diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg index 9c23bb4..707bcd2 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -293,7 +293,9 @@ PHI-MI-BOILER=MI4 電鍋爐 PHI-MI-CHEST=MI5 基本的儲藏箱 PHI-MI-REPAIR=MI6 維修效率 PHI-MI-PIPE=MI7 水管效率 -PHI-MI-ARTILLERY=MI8 火炮炮彈射程 +PHI-MI-ROBOT=MI8 無人機效率 +PHI-MI-TRAIN=MI9 火車效率 +PHI-MI-ARTILLERY=MI10 火炮炮彈射程 PHI-RS=RS 配方規模 PHI-RS-RECIPE-1=RS1 配方規模 1 diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg index 9c23bb4..707bcd2 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -293,7 +293,9 @@ PHI-MI-BOILER=MI4 電鍋爐 PHI-MI-CHEST=MI5 基本的儲藏箱 PHI-MI-REPAIR=MI6 維修效率 PHI-MI-PIPE=MI7 水管效率 -PHI-MI-ARTILLERY=MI8 火炮炮彈射程 +PHI-MI-ROBOT=MI8 無人機效率 +PHI-MI-TRAIN=MI9 火車效率 +PHI-MI-ARTILLERY=MI10 火炮炮彈射程 PHI-RS=RS 配方規模 PHI-RS-RECIPE-1=RS1 配方規模 1 diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index 1ee0f4f..abda759 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -228,12 +228,26 @@ data:extend({ default_value = 1, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, order = 'E07' + }, { + 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' + }, { + 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' }, { type = 'bool-setting', name = 'PHI-MI-ARTILLERY', setting_type = 'startup', default_value = true, - order = 'E08' + order = 'E10' }, { type = 'bool-setting', name = 'PHI-RS',