.

2025-12-27 11:05:22 +09:00 · 2025-01-24 16:20:53 +09:00
parent f861b746fe
commit af75d6438c
6 changed files with 94 additions and 103 deletions
--- a/PHI-CL/data.lua
+++ b/PHI-CL/data.lua
@@ -332,6 +332,8 @@ if settings.startup['PHI-MI'].value then
    end

    data.raw['utility-constants'].default.default_pipeline_extent = settings.startup['PHI-MI-PIPE-EXTENT'].value
+    data.raw['utility-constants'].default.rocket_lift_weight = settings.startup['PHI-MI-ROCKET-CAPACITY'].value * 1000000
+    data.raw['utility-constants'].default.default_item_weight = settings.startup['PHI-MI-CARGO-WEIGHT'].value
 end

 if (settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TOOL'].value) or (settings.startup['PHI-MI'].value) or (settings.startup['PHI-SA'].value and (settings.startup['PHI-SA-RESTRICTION'].value or settings.startup['PHI-SA-VANILLA'].value)) then
@@ -1089,8 +1091,7 @@ if settings.startup['PHI-SA'].value then
        end
    end

-    if settings.startup['PHI-SA-QUALITY'].value then
-        if mods['quality'] then
+    if settings.startup['PHI-SA-QUALITY'].value and mods['quality'] then
        for _, v in pairs(data.raw.module) do
            if v.category and v.category == 'quality' then
                v.effect.quality = v.effect.quality * settings.startup['PHI-SA-QUALITY'].value / 10
@@ -1100,10 +1101,8 @@ if settings.startup['PHI-SA'].value then
            end
        end
    end
-    end

-    if settings.startup['PHI-SA-NO-QUALITY'].value or settings.startup['PHI-SA-VANILLA'].value then
-        if mods['quality'] then
+    if (settings.startup['PHI-SA-NO-QUALITY'].value or settings.startup['PHI-SA-VANILLA'].value) and mods['quality'] then
        for _, v in pairs({'quality-module', 'quality-module-2', 'quality-module-3'}) do
            data.raw.technology[v] = nil
            data.raw.module[v] = nil
@@ -1147,18 +1146,10 @@ if settings.startup['PHI-SA'].value then
            v.rotation_speed = v.rotation_speed * new_scale
        end
    end
-    end

-    if mods['space-age'] then
-        data.raw['utility-constants'].default.rocket_lift_weight = settings.startup['PHI-SA-ROCKET-CAPACITY'].value * 1000000
-        data.raw['utility-constants'].default.default_item_weight = settings.startup['PHI-SA-CARGO-WEIGHT'].value
-
-        if settings.startup['PHI-SA-HEAT-RADIUS'].value then
-            for _, v in pairs(data.raw['reactor']) do
-                v.heating_radius = settings.startup['PHI-SA-HEAT-RADIUS'].value
-            end
-
-            for _, v in pairs(data.raw['heat-pipe']) do
+    if settings.startup['PHI-SA-HEAT-RADIUS'].value and mods['space-age'] then
+        for k, _ in pairs({'heat-pipe', 'reactor'}) do
+            for _, v in pairs(data.raw[k]) do
                v.heating_radius = settings.startup['PHI-SA-HEAT-RADIUS'].value
            end
        end
--- a/PHI-CL/locale/en/locale.cfg
+++ b/PHI-CL/locale/en/locale.cfg
@@ -121,19 +121,19 @@ 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-MI-ROCKET-CAPACITY=[color=54,228,255]MI9[/color]
+PHI-MI-CARGO-WEIGHT=[color=54,228,255]MI10[/color]

 PHI-SA=[color=255,254,42]SA[/color]
-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-SA-HEAT-RADIUS=[color=54,228,255]SA1[/color]
+PHI-SA-SPOIL=[color=54,228,255]SA2[/color]
+PHI-SA-SPOIL-FREEZE=[color=54,228,255]SA3[/color]
+PHI-SA-SPOIL-FREEZE-RATIO=[color=54,228,255]SA4[/color]
+PHI-SA-RESTRICTION=[color=54,228,255]SA5[/color]
+PHI-SA-GENERIC=[color=54,228,255]SA6[/color]
+PHI-SA-QUALITY=[color=54,228,255]SA7[/color]
+PHI-SA-NO-QUALITY=[color=54,228,255]SA8[/color]
+PHI-SA-VANILLA=[color=54,228,255]SA9[/color]

 PHI-CT=[color=255,254,42]CT[/color]
 PHI-CT-TOOL=[color=54,228,255]CT1[/color]
@@ -171,10 +171,10 @@ PHI-MI-ROBOT=Robot efficiency
 PHI-MI-ROBOT-ENERGY=Nuclear fussion robot
 PHI-MI-TRAIN=Train efficiency
 PHI-MI-PIPE-EXTENT=Pipe Extent
+PHI-MI-ROCKET-CAPACITY=Rocket capacity
+PHI-MI-CARGO-WEIGHT=Rocket cargo weight

 PHI-SA=[color=255,254,42]Space Age[/color]
-PHI-SA-ROCKET-CAPACITY=Rocket capacity
-PHI-SA-CARGO-WEIGHT=Rocket cargo weight
 PHI-SA-HEAT-RADIUS=Heat radius
 PHI-SA-SPOIL=Enable spoilage
 PHI-SA-SPOIL-FREEZE=Freeze spoilage
@@ -195,7 +195,7 @@ PHI-CT-TILE-CHOICE=Map generation tile choice
 [mod-setting-description]
 PHI-EQ-SIZE=1x1
 PHI-MI-LANDFILL=50
-PHI-SA-ROCKET-CAPACITY='000 KG
-PHI-SA-CARGO-WEIGHT=KG
+PHI-MI-ROCKET-CAPACITY='000 KG
+PHI-MI-CARGO-WEIGHT=KG
 PHI-SA-SPOIL-FREEZE-RATIO=x0.1
 PHI-SA-QUALITY=x0.1
--- a/PHI-CL/locale/ja/locale.cfg
+++ b/PHI-CL/locale/ja/locale.cfg
@@ -121,10 +121,10 @@ PHI-MI-ROBOT=ロボット効率
 PHI-MI-ROBOT-ENERGY=核融合ロボット
 PHI-MI-TRAIN=列車効率
 PHI-MI-PIPE-EXTENT=パイプ範囲
+PHI-MI-ROCKET-CAPACITY=ロケット容量
+PHI-MI-CARGO-WEIGHT=ロケット積載重量

 PHI-SA=[color=255,254,42]Space Age[/color]
-PHI-SA-ROCKET-CAPACITY=ロケット容量
-PHI-SA-CARGO-WEIGHT=ロケット積載重量
 PHI-SA-HEAT-RADIUS=熱半径
 PHI-SA-SPOIL=変質を有効にする
 PHI-SA-SPOIL-FREEZE=変質凍結
--- a/PHI-CL/locale/zh-CN/locale.cfg
+++ b/PHI-CL/locale/zh-CN/locale.cfg
@@ -121,10 +121,10 @@ PHI-MI-ROBOT=無人機效率
 PHI-MI-ROBOT-ENERGY=核融合無人機
 PHI-MI-TRAIN=火車效率
 PHI-MI-PIPE-EXTENT=管道長度
+PHI-MI-ROCKET-CAPACITY=火箭容量
+PHI-MI-CARGO-WEIGHT=火箭貨物重量

 PHI-SA=[color=255,254,42]太空時代[/color]
-PHI-SA-ROCKET-CAPACITY=火箭容量
-PHI-SA-CARGO-WEIGHT=火箭貨物重量
 PHI-SA-HEAT-RADIUS=熱半徑
 PHI-SA-SPOIL=啟用變質
 PHI-SA-SPOIL-FREEZE=變質凍結
--- a/PHI-CL/locale/zh-TW/locale.cfg
+++ b/PHI-CL/locale/zh-TW/locale.cfg
@@ -121,10 +121,10 @@ PHI-MI-ROBOT=無人機效率
 PHI-MI-ROBOT-ENERGY=核融合無人機
 PHI-MI-TRAIN=火車效率
 PHI-MI-PIPE-EXTENT=管道長度
+PHI-MI-ROCKET-CAPACITY=火箭容量
+PHI-MI-CARGO-WEIGHT=火箭貨物重量

 PHI-SA=[color=255,254,42]太空時代[/color]
-PHI-SA-ROCKET-CAPACITY=火箭容量
-PHI-SA-CARGO-WEIGHT=火箭貨物重量
 PHI-SA-HEAT-RADIUS=熱半徑
 PHI-SA-SPOIL=啟用變質
 PHI-SA-SPOIL-FREEZE=變質凍結
--- a/PHI-CL/settings.lua
+++ b/PHI-CL/settings.lua
@@ -200,6 +200,24 @@ data:extend({
  maximum_value = 2560,
  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-PIPE-EXTENT'}, {'mod-setting-name.PHI-MI-PIPE-EXTENT'}},
  order = 'C08'
+}, {
+  type = 'int-setting',
+  name = 'PHI-MI-ROCKET-CAPACITY',
+  setting_type = 'startup',
+  default_value = 10,
+  minimum_value = 1,
+  maximum_value = 10000,
+  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-ROCKET-CAPACITY'}, {'mod-setting-name.PHI-SA-ROCKET-CAPACITY'}},
+  order = 'C09'
+}, {
+  type = 'int-setting',
+  name = 'PHI-MI-CARGO-WEIGHT',
+  setting_type = 'startup',
+  default_value = 100,
+  minimum_value = 1,
+  maximum_value = 1000,
+  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-CARGO-WEIGHT'}, {'mod-setting-name.PHI-SA-CARGO-WEIGHT'}},
+  order = 'C10'
 }, {
  type = 'bool-setting',
  name = 'PHI-SA',
@@ -207,24 +225,6 @@ data:extend({
  default_value = false,
  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA'}, {'mod-setting-name.PHI-SA'}},
  order = 'D00'
-}, {
-  type = 'int-setting',
-  name = 'PHI-SA-ROCKET-CAPACITY',
-  setting_type = 'startup',
-  default_value = 10,
-  minimum_value = 1,
-  maximum_value = 10000,
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-ROCKET-CAPACITY'}, {'mod-setting-name.PHI-SA-ROCKET-CAPACITY'}},
-  order = 'D01'
-}, {
-  type = 'int-setting',
-  name = 'PHI-SA-CARGO-WEIGHT',
-  setting_type = 'startup',
-  default_value = 100,
-  minimum_value = 1,
-  maximum_value = 1000,
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-CARGO-WEIGHT'}, {'mod-setting-name.PHI-SA-CARGO-WEIGHT'}},
-  order = 'D02'
 }, {
  type = 'int-setting',
  name = 'PHI-SA-HEAT-RADIUS',
@@ -232,21 +232,21 @@ data:extend({
  default_value = 1,
  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'
+  order = 'D01'
 }, {
  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 = 'D04'
+  order = 'D02'
 }, {
  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 = 'D05'
+  order = 'D03'
 }, {
  type = 'int-setting',
  name = 'PHI-SA-SPOIL-FREEZE-RATIO',
@@ -255,21 +255,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 = 'D06'
+  order = 'D04'
 }, {
  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 = 'D07'
+  order = 'D05'
 }, {
  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 = 'D08'
+  order = 'D06'
 }, {
  type = 'int-setting',
  name = 'PHI-SA-QUALITY',
@@ -278,21 +278,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 = 'D09'
+  order = 'D07'
 }, {
  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 = 'D10'
+  order = 'D08'
 }, {
  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 = 'D11'
+  order = 'D09'
 }, {
  type = 'bool-setting',
  name = 'PHI-CT',