diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt index 946f317..6cfd691 100644 --- a/PHI-CL/changelog.txt +++ b/PHI-CL/changelog.txt @@ -5,6 +5,7 @@ Date: 2025-04-20 Changes: - [CT] Changed the hidden status of some creative items. - [CL] Changed the some locale logic. + - [MI] Fixed heating tower also applied the nuclear reactor scale energy usage flag. --------------------------------------------------------------------------------------------------- Version: 3.0.93 diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua index c7a1f88..5badb31 100644 --- a/PHI-CL/config.lua +++ b/PHI-CL/config.lua @@ -217,7 +217,7 @@ local items = { ref_name = 'laser-turret', tech = 'laser-turret', min = 2, - max = settings.startup['PHI-MB-WEAPON-TURRET-TIER'].value + max = settings.startup['PHI-MB-WEAPON-TIER'].value }, ['flamethrower-turret'] = { enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-WEAPON'].value, @@ -228,7 +228,7 @@ local items = { ref_name = 'flamethrower-turret', tech = 'flamethrower', min = 2, - max = settings.startup['PHI-MB-WEAPON-TURRET-TIER'].value + max = settings.startup['PHI-MB-WEAPON-TIER'].value }, ['gun-turret'] = { enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-WEAPON'].value, @@ -239,7 +239,7 @@ local items = { ref_name = 'gun-turret', tech = 'gun-turret', min = 2, - max = settings.startup['PHI-MB-WEAPON-TURRET-TIER'].value + max = settings.startup['PHI-MB-WEAPON-TIER'].value }, ['radar'] = { enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-WEAPON'].value, @@ -250,7 +250,7 @@ local items = { ref_name = 'radar', tech = 'automation', min = 2, - max = settings.startup['PHI-MB-WEAPON-RADAR-TIER'].value + max = settings.startup['PHI-MB-WEAPON-TIER'].value } }, ['equipment'] = { @@ -715,7 +715,7 @@ if mods and mods['space-age'] then ref_name = 'railgun-turret', tech = 'railgun', min = 2, - max = settings.startup['PHI-MB-WEAPON-TURRET-TIER'].value + max = settings.startup['PHI-MB-WEAPON-TIER'].value } items['item']['rocket-turret'] = { @@ -727,7 +727,7 @@ if mods and mods['space-age'] then ref_name = 'rocket-turret', tech = 'rocket-turret', min = 2, - max = settings.startup['PHI-MB-WEAPON-TURRET-TIER'].value + max = settings.startup['PHI-MB-WEAPON-TIER'].value } items['item']['tesla-turret'] = { @@ -739,7 +739,7 @@ if mods and mods['space-age'] then ref_name = 'tesla-turret', tech = 'tesla-weapons', min = 2, - max = settings.startup['PHI-MB-WEAPON-TURRET-TIER'].value + max = settings.startup['PHI-MB-WEAPON-TIER'].value } items['item']['foundry'] = { diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index 676eb77..f360eed 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -101,8 +101,7 @@ PHI-MB-ENERGY-POWER-TIER=[color=54,228,255]MBE3[/color] PHI-MB-MACHINE=[color=255,254,42]MBM[/color] PHI-MB-MACHINE-TIER=[color=54,228,255]MBM1[/color] PHI-MB-WEAPON=[color=255,254,42]MBW[/color] -PHI-MB-WEAPON-TURRET-TIER=[color=54,228,255]MBW1[/color] -PHI-MB-WEAPON-RADAR-TIER=[color=54,228,255]MBW2[/color] +PHI-MB-WEAPON-TIER=[color=54,228,255]MBW1[/color] PHI-EQ=[color=255,254,42]EQ[/color] PHI-EQ-POWER-TIER=[color=54,228,255]EQ1[/color] @@ -150,8 +149,7 @@ PHI-MB-ENERGY-POWER-TIER=Power tier PHI-MB-MACHINE=[color=255,254,42]Enable compound machine[/color] PHI-MB-MACHINE-TIER=Machine tier PHI-MB-WEAPON=[color=255,254,42]Enable military defense[/color] -PHI-MB-WEAPON-TURRET-TIER=Turret tier -PHI-MB-WEAPON-RADAR-TIER=Radar tier +PHI-MB-WEAPON-TIER=Military tier PHI-EQ=[color=255,254,42]Armor equipment[/color] PHI-EQ-POWER-TIER=Power tier diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg index 0dd2124..d81317b 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -101,8 +101,7 @@ PHI-MB-ENERGY-POWER-TIER=パワーの最高等級 PHI-MB-MACHINE=[color=255,254,42]複合機械を有効にする[/color] PHI-MB-MACHINE-TIER=機械の最高等級 PHI-MB-WEAPON=[color=255,254,42]軍事防衛を有効にする[/color] -PHI-MB-WEAPON-TURRET-TIER=タレットの最高等級 -PHI-MB-WEAPON-RADAR-TIER=レーダーの最高等級 +PHI-MB-WEAPON-TIER=軍事防衛の最高等級 PHI-EQ=[color=255,254,42]アーマー設備を有効にする[/color] PHI-EQ-POWER-TIER=発電モジュールの最高等級 diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg index b063866..d84dcd5 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -101,8 +101,7 @@ PHI-MB-ENERGY-POWER-TIER=電力的最高等級 PHI-MB-MACHINE=[color=255,254,42]啟用複合機器[/color] PHI-MB-MACHINE-TIER=機器的最高等級 PHI-MB-WEAPON=[color=255,254,42]啟用軍事防禦[/color] -PHI-MB-WEAPON-TURRET-TIER=炮塔的最高等級 -PHI-MB-WEAPON-RADAR-TIER=雷達的最高等級 +PHI-MB-WEAPON-TIER=軍事防禦的最高等級 PHI-EQ=[color=255,254,42]啟用裝甲設備[/color] PHI-EQ-POWER-TIER=發電的最高等級 diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg index b063866..d84dcd5 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -101,8 +101,7 @@ PHI-MB-ENERGY-POWER-TIER=電力的最高等級 PHI-MB-MACHINE=[color=255,254,42]啟用複合機器[/color] PHI-MB-MACHINE-TIER=機器的最高等級 PHI-MB-WEAPON=[color=255,254,42]啟用軍事防禦[/color] -PHI-MB-WEAPON-TURRET-TIER=炮塔的最高等級 -PHI-MB-WEAPON-RADAR-TIER=雷達的最高等級 +PHI-MB-WEAPON-TIER=軍事防禦的最高等級 PHI-EQ=[color=255,254,42]啟用裝甲設備[/color] PHI-EQ-POWER-TIER=發電的最高等級 diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index cc2018b..d16032f 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -61,20 +61,12 @@ data:extend({ order = 'AC00' }, { type = 'int-setting', - name = 'PHI-MB-WEAPON-TURRET-TIER', + name = 'PHI-MB-WEAPON-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-WEAPON-TURRET-TIER'}, {'mod-setting-name.PHI-MB-WEAPON-TURRET-TIER'}}, + localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-WEAPON-TIER'}, {'mod-setting-name.PHI-MB-WEAPON-TIER'}}, order = 'AC01' -}, { - type = 'int-setting', - name = 'PHI-MB-WEAPON-RADAR-TIER', - setting_type = 'startup', - default_value = 3, - allowed_values = {1, 2, 3}, - localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-WEAPON-RADAR-TIER'}, {'mod-setting-name.PHI-MB-WEAPON-RADAR-TIER'}}, - order = 'AC02' }, { type = 'bool-setting', name = 'PHI-EQ',