.

2025-12-27 11:05:22 +09:00 · 2025-01-24 16:04:36 +09:00
parent 0b4d5420e6
commit f861b746fe
7 changed files with 31 additions and 44 deletions
--- a/PHI-CL/data-final-fixes.lua
+++ b/PHI-CL/data-final-fixes.lua
@@ -2,7 +2,7 @@ local items = require 'config'
 local main = require 'main'

 if mods['space-age'] then
-    for i=2, settings.startup['PHI-EN-SOLAR-TIER'].value do
+    for i=2, settings.startup['PHI-MB-ENERGY-SOLAR-TIER'].value do
        if data.raw.recipe['accumulator-' .. i] then
            data.raw.recipe['accumulator-' .. i].category = 'electronics'
        end
--- a/PHI-CL/locale/en/locale.cfg
+++ b/PHI-CL/locale/en/locale.cfg
@@ -94,15 +94,15 @@ empty-world=Useful for design

 [mod-setting-name-prefix]
 PHI-MB=[color=255,254,42]MB[/color]
-PHI-MB-ENERGY=[color=255,254,42]MB1[/color]
-PHI-MB-ENERGY-SOLAR-TIER=[color=54,228,255]MB2[/color]
-PHI-MB-ENERGY-SOLAR-RATIO=[color=54,228,255]MB3[/color]
-PHI-MB-ENERGY-POWER-TIER=[color=54,228,255]MB4[/color]
-PHI-MB-MACHINE=[color=255,254,42]MB5[/color]
-PHI-MB-MACHINE-TIER=[color=54,228,255]MB6[/color]
-PHI-MB-WEAPON=[color=255,254,42]MB7[/color]
-PHI-MB-WEAPON-TURRET-TIER=[color=54,228,255]MB8[/color]
-PHI-MB-WEAPON-RADAR-TIER=[color=54,228,255]MB9[/color]
+PHI-MB-ENERGY=[color=255,254,42]MBE[/color]
+PHI-MB-ENERGY-SOLAR-TIER=[color=54,228,255]MBE1[/color]
+PHI-MB-ENERGY-SOLAR-RATIO=[color=54,228,255]MBE2[/color]
+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-EQ=[color=255,254,42]EQ[/color]
 PHI-EQ-POWER-TIER=[color=54,228,255]EQ1[/color]
@@ -164,7 +164,7 @@ PHI-EQ-SIZE=Small equipment

 PHI-MI=[color=255,254,42]Miscellaneous change[/color]
 PHI-MI-LANDFILL=Landfill requirement
-PHI-MI-EFFCY=Efficiency module efficiency
+PHI-MI-EFFCY=Efficiency module efficiency ratio
 PHI-MI-NUCLEAR=Nuclear adjustable output
 PHI-MI-PIPE=Pipe efficiency
 PHI-MI-ROBOT=Robot efficiency
@@ -194,7 +194,7 @@ PHI-CT-TILE-CHOICE=Map generation tile choice

 [mod-setting-description]
 PHI-EQ-SIZE=1x1
-PHI-MI-LANDFILL=20
+PHI-MI-LANDFILL=50
 PHI-SA-ROCKET-CAPACITY='000 KG
 PHI-SA-CARGO-WEIGHT=KG
 PHI-SA-SPOIL-FREEZE-RATIO=x0.1
--- a/PHI-CL/locale/ja/locale.cfg
+++ b/PHI-CL/locale/ja/locale.cfg
@@ -114,7 +114,7 @@ PHI-EQ-SIZE=小さなアーマー設備

 PHI-MI=[color=255,254,42]その他の変更[/color]
 PHI-MI-LANDFILL=埋立地要件
-PHI-MI-EFFCY=エネルギーモジュール効率
+PHI-MI-EFFCY=エネルギーモジュール効率マルチプライヤ
 PHI-MI-NUCLEAR=原子炉出力の調整可能
 PHI-MI-PIPE=パイプ効率
 PHI-MI-ROBOT=ロボット効率
--- a/PHI-CL/locale/zh-CN/locale.cfg
+++ b/PHI-CL/locale/zh-CN/locale.cfg
@@ -114,7 +114,7 @@ PHI-EQ-SIZE=小型裝甲裝備

 PHI-MI=[color=255,254,42]雜項小變化[/color]
 PHI-MI-LANDFILL=人造陸地需求
-PHI-MI-EFFCY=節能組件效率
+PHI-MI-EFFCY=節能組件效率倍數
 PHI-MI-NUCLEAR=核能反應爐可調輸出
 PHI-MI-PIPE=水管效率
 PHI-MI-ROBOT=無人機效率
--- a/PHI-CL/locale/zh-TW/locale.cfg
+++ b/PHI-CL/locale/zh-TW/locale.cfg
@@ -114,7 +114,7 @@ PHI-EQ-SIZE=小型裝甲裝備

 PHI-MI=[color=255,254,42]雜項小變化[/color]
 PHI-MI-LANDFILL=人造陸地需求
-PHI-MI-EFFCY=節能組件效率
+PHI-MI-EFFCY=節能組件效率倍數
 PHI-MI-NUCLEAR=核能反應爐可調輸出
 PHI-MI-PIPE=水管效率
 PHI-MI-ROBOT=無人機效率
--- a/PHI-CL/note.lua
+++ b/PHI-CL/note.lua
@@ -721,17 +721,6 @@ end
            
 ** SETTING
 localised_description = {'phi-cl.combine', {'phi-cl.default'}, {'mod-setting-description.PHI-MB-ENERGY-SOLAR-TIER'}},
-PHI-MB-ENERGY-SOLAR-TIER=8
-PHI-MB-ENERGY-POWER-TIER=5
-
-PHI-MB-MACHINE-TIER=3
-PHI-WE-TURRET-TIER=3
-PHI-WE-RADAR-TIER=3
-
-PHI-EQ-POWER-TIER=8
-PHI-EQ-DEFENSE-TIER=8
-PHI-EQ-TOOL-TIER=8
-PHI-EQ-UTILITY-TIER=2

 {type = 'laser', decrease = 20, percent = 50},
 {type = 'electric', decrease = 20, percent = 50},
--- a/PHI-CL/settings.lua
+++ b/PHI-CL/settings.lua
@@ -12,7 +12,7 @@ data:extend({
  setting_type = 'startup',
  default_value = true,
  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-ENERGY'}, {'mod-setting-name.PHI-MB-ENERGY'}},
-  order = 'A01'
+  order = 'AA00'
 }, {
  type = 'int-setting',
  name = 'PHI-MB-ENERGY-SOLAR-TIER',
@@ -20,16 +20,15 @@ data:extend({
  default_value = 8,
  allowed_values = {1, 2, 3, 4, 5, 6, 7, 8},
  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-ENERGY-SOLAR-TIER'}, {'mod-setting-name.PHI-MB-ENERGY-SOLAR-TIER'}},
-  order = 'A02'
+  order = 'AA01'
 }, {
  type = 'int-setting',
  name = 'PHI-MB-ENERGY-SOLAR-RATIO',
  setting_type = 'startup',
  default_value = 4,
-  minimum_value = 2,
-  maximum_value = 16,
+  allowed_values = {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16},
  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-ENERGY-SOLAR-RATIO'}, {'mod-setting-name.PHI-MB-ENERGY-SOLAR-RATIO'}},
-  order = 'A03'
+  order = 'AA02'
 }, {
  type = 'int-setting',
  name = 'PHI-MB-ENERGY-POWER-TIER',
@@ -37,14 +36,14 @@ data:extend({
  default_value = 1,
  allowed_values = {1, 2, 3, 4, 5},
  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-ENERGY-POWER-TIER'}, {'mod-setting-name.PHI-MB-ENERGY-POWER-TIER'}},
-  order = 'A04'
+  order = 'AA03'
 }, {
  type = 'bool-setting',
  name = 'PHI-MB-MACHINE',
  setting_type = 'startup',
  default_value = false,
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-MACHINE-TIER'}, {'mod-setting-name.PHI-MB-MACHINE-TIER'}},
-  order = 'A05'
+  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-MACHINE'}, {'mod-setting-name.PHI-MB-MACHINE'}},
+  order = 'AB00'
 }, {
  type = 'int-setting',
  name = 'PHI-MB-MACHINE-TIER',
@@ -52,14 +51,14 @@ data:extend({
  default_value = 3,
  allowed_values = {1, 2, 3},
  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-MACHINE-TIER'}, {'mod-setting-name.PHI-MB-MACHINE-TIER'}},
-  order = 'A06'
+  order = 'AB01'
 }, {
  type = 'bool-setting',
  name = 'PHI-MB-WEAPON',
  setting_type = 'startup',
  default_value = false,
  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-WEAPON'}, {'mod-setting-name.PHI-MB-WEAPON'}},
-  order = 'A07'
+  order = 'AC00'
 }, {
  type = 'int-setting',
  name = 'PHI-MB-WEAPON-TURRET-TIER',
@@ -67,7 +66,7 @@ data:extend({
  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'}},
-  order = 'A08'
+  order = 'AC01'
 }, {
  type = 'int-setting',
  name = 'PHI-MB-WEAPON-RADAR-TIER',
@@ -75,7 +74,7 @@ data:extend({
  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 = 'A09'
+  order = 'AC02'
 }, {
  type = 'bool-setting',
  name = 'PHI-EQ',
@@ -133,7 +132,7 @@ data:extend({
  type = 'bool-setting',
  name = 'PHI-MI',
  setting_type = 'startup',
-  default_value = true,
+  default_value = false,
  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI'}, {'mod-setting-name.PHI-MI'}},
  order = 'C00'
 }, {
@@ -205,7 +204,7 @@ data:extend({
  type = 'bool-setting',
  name = 'PHI-SA',
  setting_type = 'startup',
-  default_value = true,
+  default_value = false,
  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA'}, {'mod-setting-name.PHI-SA'}},
  order = 'D00'
 }, {
@@ -231,8 +230,7 @@ data:extend({
  name = 'PHI-SA-HEAT-RADIUS',
  setting_type = 'startup',
  default_value = 1,
-  minimum_value = 1,
-  maximum_value = 7,
+  allowed_values = {1, 2, 3, 4, 5, 6, 7},
  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-HEAT-RADIUS'}, {'mod-setting-name.PHI-SA-HEAT-RADIUS'}},
  order = 'D03'
 }, {
@@ -299,14 +297,14 @@ data:extend({
  type = 'bool-setting',
  name = 'PHI-CT',
  setting_type = 'startup',
-  default_value = true,
+  default_value = false,
  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-CT'}, {'mod-setting-name.PHI-CT'}},
  order = 'E00'
 },  {
  type = 'bool-setting',
  name = 'PHI-CT-TOOL',
  setting_type = 'startup',
-  default_value = false,
+  default_value = true,
  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-CT-TOOL'}, {'mod-setting-name.PHI-CT-TOOL'}},
  order = 'E01'
 }, {