.

PHI-CL/control.lua

@@ -1,27 +1,5 @@
 local items = require 'config'
 
-if settings.startup['PHI-XC'].value then
-    script.on_nth_tick(60, function(event)
-        local ts = math.floor(event.tick / 60)
-        local c
-
-        if ts > 3599 then
-            c = string.format('%d:%02d:%02d', math.floor(ts / 3600), math.floor(ts / 60) % 60, math.floor(ts) % 60)
-
-        else
-            c = string.format('%d:%02d', math.floor(ts / 60) % 60, math.floor(ts) % 60)
-        end
-
-        for _, p in pairs(game.connected_players) do
-            if p.gui.top.phi_clock == nil then
-                p.gui.top.add{type='button', name='phi_clock'}
-            end
-
-            p.gui.top.phi_clock.caption = c
-        end
-    end)
-end
-
 if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRASH'].value then
     local function trash_creation(event)
         local entity = event.created_entity or event.entity

PHI-CL/data.lua

@@ -411,6 +411,10 @@ if settings.startup['PHI-MI'].value and (settings.startup['PHI-MI-LANDFILL'].val
     data.raw.recipe['landfill'].ingredients = {{type='item', name='stone', amount=settings.startup['PHI-MI-LANDFILL'].value}}
 end
 
+if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-NUCLEAR'].value then
+    data.raw['reactor']['nuclear-reactor'].scale_energy_usage = true
+end
+
 --[[
 if settings.startup['PHI-EQ'].value and settings.startup['PHI-EQ-ARMOR'].value then
     data:extend({
@@ -514,7 +518,7 @@ if settings.startup['PHI-EQ'].value and settings.startup['PHI-EQ-ARMOR'].value t
 end
 ]]
 
-if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-OIL'].value then
+if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-FLUID'].value then
     data:extend({{type='recipe-category', name='fluid'}})
 
     local item = table.deepcopy(data.raw['item']['offshore-pump'])

PHI-CL/locale/en/locale.cfg

@@ -122,21 +122,16 @@ PHI-MI-ROBOT=MI8 Robot efficiency
 PHI-MI-TRAIN=MI9 Train efficiency
 PHI-MI-ARTILLERY=MI10 Artillery range
 
-PHI-XC=XC Clock GUI
-
 PHI-CT=CT Creative testing tools
-PHI-CT-OIL=CT1 Oil
+PHI-CT-FLUID=CT1 Fluid
 PHI-CT-RADAR=CT2 Radar
 PHI-CT-TILE=CT3 World tile
 PHI-CT-TILE-CHOICE=CT4 Tile choice
 PHI-CT-TRASH=CT5 Trash chest
-PHI-CT-MINER=CT6 Large miner
+PHI-CT-LINKED=CT6 Linked chest
-PHI-CT-LINKED=CT7 Linked chest
+PHI-CT-LOADER=CT7 Loader enable
-PHI-CT-LOADER=CT8 Loader enable
+PHI-CT-ENERGY=CT8 Energy
-PHI-CT-RECIPE=CT9 Recipe
+PHI-CT-TRAIN=CT9 Electric train
-PHI-CT-ENERGY=CT10 Energy
-PHI-CT-LAMP=CT11 Lamp
-PHI-CT-TRAIN=CT12 Electric train
 
 [mod-setting-description]
 PHI-EN-SOLAR-TIER=Default 8 ; Disable 1

PHI-CL/locale/ja/locale.cfg

@@ -121,21 +121,16 @@ PHI-MI-ROBOT=MI8 ロボット効率
 PHI-MI-TRAIN=MI9 列車効率
 PHI-MI-ARTILLERY=MI10 長距離砲射程
 
-PHI-XC=XC 時計 GUI
-
 PHI-CT=CT クリエイティブテストツール
-PHI-CT-OIL=CT1 原油
+PHI-CT-FLUID=CT1 流体
 PHI-CT-RADAR=CT2 レーダー
 PHI-CT-TILE=CT3 ワールドタイル
 PHI-CT-TILE-CHOICE=CT4 ドタイル選択
 PHI-CT-TRASH=CT5 ごみチェスト
-PHI-CT-MINER=CT6 大型電動掘削機
+PHI-CT-LINKED=CT6 リンクされたチェスト
-PHI-CT-LINKED=CT7 リンクされたチェスト
+PHI-CT-LOADER=CT7 ローダーを有効にする
-PHI-CT-LOADER=CT8 ローダーを有効にする
+PHI-CT-ENERGY=CT8 エネルギー
-PHI-CT-RECIPE=CT9 レシピ
+PHI-CT-TRAIN=CT9 電車
-PHI-CT-ENERGY=CT10 エネルギー
-PHI-CT-LAMP=CT11 ランプ
-PHI-CT-TRAIN=CT12 電車
 
 [mod-setting-description]
 PHI-EN-SOLAR-TIER=デフォルト 8 ; 止める 1

PHI-CL/locale/zh-CN/locale.cfg

@@ -121,21 +121,16 @@ PHI-MI-ROBOT=MI8 無人機效率
 PHI-MI-TRAIN=MI9 火車效率
 PHI-MI-ARTILLERY=MI10 火炮炮彈射程
 
-PHI-XC=XC 時鐘介面
-
 PHI-CT=CT 創意測試工具
-PHI-CT-OIL=CT1 原油
+PHI-CT-FLUID=CT1 液體
 PHI-CT-RADAR=CT2 雷達
 PHI-CT-TILE=CT3 世界地磚
 PHI-CT-TILE-CHOICE=CT4 地磚選擇
 PHI-CT-TRASH=CT5 垃圾箱
-PHI-CT-MINER=CT6 大型電能採礦機
+PHI-CT-LINKED=CT6 連結箱
-PHI-CT-LINKED=CT7 連結箱
+PHI-CT-LOADER=CT7 裝卸機啟用
-PHI-CT-LOADER=CT8 裝卸機啟用
+PHI-CT-ENERGY=CT8 能量
-PHI-CT-RECIPE=CT9 配方
+PHI-CT-TRAIN=CT9 電動火車
-PHI-CT-ENERGY=CT10 能量
-PHI-CT-LAMP=CT11 燈
-PHI-CT-TRAIN=CT12 電動火車
 
 [mod-setting-description]
 PHI-EN-SOLAR-TIER=預設 8 ; 停用 1

PHI-CL/locale/zh-TW/locale.cfg

@@ -121,21 +121,16 @@ PHI-MI-ROBOT=MI8 無人機效率
 PHI-MI-TRAIN=MI9 火車效率
 PHI-MI-ARTILLERY=MI10 火炮炮彈射程
 
-PHI-XC=XC 時鐘介面
-
 PHI-CT=CT 創意測試工具
-PHI-CT-OIL=CT1 原油
+PHI-CT-FLUID=CT1 液體
 PHI-CT-RADAR=CT2 雷達
 PHI-CT-TILE=CT3 世界地磚
 PHI-CT-TILE-CHOICE=CT4 地磚選擇
 PHI-CT-TRASH=CT5 垃圾箱
-PHI-CT-MINER=CT6 大型電能採礦機
+PHI-CT-LINKED=CT6 連結箱
-PHI-CT-LINKED=CT7 連結箱
+PHI-CT-LOADER=CT7 裝卸機啟用
-PHI-CT-LOADER=CT8 裝卸機啟用
+PHI-CT-ENERGY=CT8 能量
-PHI-CT-RECIPE=CT9 配方
+PHI-CT-TRAIN=CT9 電動火車
-PHI-CT-ENERGY=CT10 能量
-PHI-CT-LAMP=CT11 燈
-PHI-CT-TRAIN=CT12 電動火車
 
 [mod-setting-description]
 PHI-EN-SOLAR-TIER=預設 8 ; 停用 1

PHI-CL/note.lua

@@ -1230,12 +1230,6 @@ end
     setting_type = 'startup',
     default_value = false,
     order = 'E02'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-MI-NUCLEAR',
-    setting_type = 'startup',
-    default_value = false,
-    order = 'E03'
   }, 
   
         "? aai-industry >= 0.5.0",

PHI-CL/settings.lua

@@ -72,6 +72,12 @@ data:extend({
     minimum_value = 1,
     maximum_value = 100,
     order = 'E01'
+  }, {
+    type = 'bool-setting',
+    name = 'PHI-MI-NUCLEAR',
+    setting_type = 'startup',
+    default_value = false,
+    order = 'E03'
   }, {
     type = 'bool-setting',
     name = 'PHI-MI-BOILER',
@@ -84,12 +90,6 @@ data:extend({
     setting_type = 'startup',
     default_value = false,
     order = 'E05'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-XC',
-    setting_type = 'startup',
-    default_value = false,
-    order = 'H00'
   }, {
     type = 'bool-setting',
     name = 'PHI-CT',
@@ -98,7 +98,7 @@ data:extend({
     order = 'J00'
   },  {
     type = 'bool-setting',
-    name = 'PHI-CT-OIL',
+    name = 'PHI-CT-FLUID',
     setting_type = 'startup',
     default_value = true,
     order = 'J01'
@@ -132,24 +132,24 @@ data:extend({
     name = 'PHI-CT-LINKED',
     setting_type = 'startup',
     default_value = true,
-    order = 'J07'
+    order = 'J06'
   }, {
     type = 'bool-setting',
     name = 'PHI-CT-LOADER',
     setting_type = 'startup',
     default_value = true,
-    order = 'J08'
+    order = 'J07'
   }, {
     type = 'bool-setting',
     name = 'PHI-CT-ENERGY',
     setting_type = 'startup',
     default_value = true,
-    order = 'J10'
+    order = 'J08'
   }, {
     type = 'bool-setting',
     name = 'PHI-CT-TRAIN',
     setting_type = 'startup',
     default_value = true,
-    order = 'J12'
+    order = 'J09'
   }
 })