.

PHI-CL/config.lua

@@ -71,7 +71,7 @@ local items = {
             ref_name = 'boiler',
             tech = 'compound-energy',
             min = 2,
-            max = settings.startup['PHI-EN-STEAM-TIER'].value
+            max = settings.startup['PHI-EN-POWER-TIER'].value
         },
         ['steam-engine'] = {
             enabled = settings.startup['PHI-EN'].value,
@@ -81,7 +81,7 @@ local items = {
             ref_name = 'steam-engine',
             tech = 'compound-energy',
             min = 2,
-            max = settings.startup['PHI-EN-STEAM-TIER'].value
+            max = settings.startup['PHI-EN-POWER-TIER'].value
         },
         ['nuclear-reactor'] = {
             enabled = settings.startup['PHI-EN'].value,
@@ -91,7 +91,7 @@ local items = {
             ref_name = 'nuclear-reactor',
             tech = 'compound-energy',
             min = 2,
-            max = settings.startup['PHI-EN-NUCLEAR-TIER'].value
+            max = settings.startup['PHI-EN-POWER-TIER'].value
         },
         ['heat-pipe'] = {
             enabled = settings.startup['PHI-EN'].value,
@@ -101,7 +101,7 @@ local items = {
             ref_name = 'heat-pipe',
             tech = 'compound-energy',
             min = 2,
-            max = settings.startup['PHI-EN-NUCLEAR-TIER'].value
+            max = settings.startup['PHI-EN-POWER-TIER'].value
         },
         ['heat-exchanger'] = {
             enabled = settings.startup['PHI-EN'].value,
@@ -111,7 +111,7 @@ local items = {
             ref_name = 'heat-exchanger',
             tech = 'compound-energy',
             min = 2,
-            max = settings.startup['PHI-EN-NUCLEAR-TIER'].value
+            max = settings.startup['PHI-EN-POWER-TIER'].value
         },
         ['steam-turbine'] = {
             enabled = settings.startup['PHI-EN'].value,
@@ -121,7 +121,7 @@ local items = {
             ref_name = 'steam-turbine',
             tech = 'compound-energy',
             min = 2,
-            max = settings.startup['PHI-EN-NUCLEAR-TIER'].value
+            max = settings.startup['PHI-EN-POWER-TIER'].value
         },
         ['assembling-machine'] = {
             enabled = settings.startup['PHI-MB'].value,
@@ -246,7 +246,7 @@ local items = {
     }
 }
 
-if mods['space-age'] then
+if mods and mods['space-age'] then
     items['item']['fusion-reactor'] = {
         enabled = settings.startup['PHI-EN'].value,
         stage = 2,
@@ -255,7 +255,7 @@ if mods['space-age'] then
         ref_name = 'fusion-reactor',
         tech = 'fusion-reactor',
         min = 2,
-        max = settings.startup['PHI-EN-NUCLEAR-TIER'].value
+        max = settings.startup['PHI-EN-POWER-TIER'].value
     }
 
     items['item']['fusion-generator'] = {
@@ -266,7 +266,7 @@ if mods['space-age'] then
         ref_name = 'fusion-generator',
         tech = 'fusion-reactor',
         min = 2,
-        max = settings.startup['PHI-EN-NUCLEAR-TIER'].value
+        max = settings.startup['PHI-EN-POWER-TIER'].value
     }
 
     items['item']['heating-tower'] = {
@@ -277,7 +277,7 @@ if mods['space-age'] then
         ref_name = 'heating-tower',
         tech = 'heating-tower',
         min = 2,
-        max = settings.startup['PHI-EN-NUCLEAR-TIER'].value
+        max = settings.startup['PHI-EN-ASSEMBLING-TIER'].value
     }
 
     items['item']['railgun-turret'] = {

PHI-CL/data.lua

@@ -2,8 +2,8 @@ local items = require 'config'
 local main = require 'main'
 local file_stage = 1
 
-if settings.startup['PHI-EN'].value and settings.startup['PHI-EN-SOLAR-TIER'].value and settings.startup['PHI-EN-STEAM-TIER'].value and settings.startup['PHI-EN-NUCLEAR-TIER'].value then
+if settings.startup['PHI-EN'].value and settings.startup['PHI-EN-SOLAR-TIER'].value and settings.startup['PHI-EN-POWER-TIER'].value and settings.startup['PHI-EN-POWER-TIER'].value then
-    local ml = math.max(settings.startup['PHI-EN-SOLAR-TIER'].value, settings.startup['PHI-EN-STEAM-TIER'].value, settings.startup['PHI-EN-NUCLEAR-TIER'].value)
+    local ml = math.max(settings.startup['PHI-EN-SOLAR-TIER'].value, settings.startup['PHI-EN-POWER-TIER'].value, settings.startup['PHI-EN-POWER-TIER'].value)
 
     for i=1, 7 do
         local tn = 'compound-energy-' .. i
@@ -403,7 +403,7 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-CHEST'].value t
         table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-' .. r .. '-chest'})
     end
 end
-if settings.startup['PHI-EN'].value and settings.startup['PHI-EN-NUCLEAR-TIER'].value > 1 then
+if settings.startup['PHI-EN'].value and settings.startup['PHI-EN-POWER-TIER'].value > 1 then
     data.raw['fluid']['steam'].max_temperature = 5000
 end
 

PHI-CL/locale/en/locale.cfg

@@ -132,10 +132,10 @@ flamethrower-turret=Fires a stream of burning liquid at enemies.
 radar=Scans the nearby sectors, and actively reveals an area around it.
 basic-steel-chest=
 basic-logistic-chest-active-provider=Sends its content to the logistic network.
-basic-logistic-chest-passive-provider=Makes its content available to the logistic network.
+basic-logistic-chest-buffer=Makes its content available to the logistic network.
-basic-logistic-chest-storage=Long-term storage for the logistic network.
+basic-logistic-chest-passive-provider=Long-term storage for the logistic network.
-basic-logistic-chest-buffer=Requests specified items to be available for personal logistics and automated construction.
+basic-logistic-chest-requester=Requests specified items to be available for personal logistics and automated construction.
-basic-logistic-chest-requester=Requests specified items from the logistic network.
+basic-logistic-chest-storage=Requests specified items from the logistic network.
 electric-boiler=Burns fuel to turn water into steam.
 oil-pump=
 super-radar=Scans the nearby sectors, and actively reveals an area around it.
@@ -232,8 +232,7 @@ empty-world=Useful for design
 [mod-setting-name]
 PHI-EN=EN Enable compound energy
 PHI-EN-SOLAR-TIER=EN1 Solar panel tier
-PHI-EN-STEAM-TIER=EN2 Steam engine tier
+PHI-EN-POWER-TIER=EN2 Power tier
-PHI-EN-NUCLEAR-TIER=EN3 Nuclear reactor tier
 
 PHI-MB=MB Enable fast machine
 PHI-MB-ASSEMBLING-TIER=MB1 Assembling machine tier
@@ -290,8 +289,7 @@ PHI-CT-TRAIN=CT12 Electric train
 
 [mod-setting-description]
 PHI-EN-SOLAR-TIER=Default 8 ; Disable 1
-PHI-EN-STEAM-TIER=Default 5 ; Disable 1
+PHI-EN-POWER-TIER=Default 5 ; Disable 1
-PHI-EN-NUCLEAR-TIER=Default 5 ; Disable 1
 
 PHI-MB-ASSEMBLING-TIER=Default 5 ; Disable 3
 PHI-MB-FURNACE-TIER=Default 3 ; Disable 1

PHI-CL/locale/ja/locale.cfg

@@ -26,11 +26,11 @@ gun-turret=ガンタレット
 flamethrower-turret=火炎放射タレット
 radar=レーダー
 basic-steel-chest=基本的な鋼鉄製チェスト
-basic-logistic-chest-active-provider=基本的なアクティブ供給チェスト
+basic-active-provider-chest=基本的なアクティブ供給チェスト
-basic-logistic-chest-buffer=基本的なバッファーチェスト
+basic-buffer-chest=基本的なバッファーチェスト
-basic-logistic-chest-passive-provider=基本的なパッシブ供給チェスト
+basic-passive-provider-chest=基本的なパッシブ供給チェスト
-basic-logistic-chest-requester=基本的な要求チェスト
+basic-requester-chest=基本的な要求チェスト
-basic-logistic-chest-storage=基本的な貯蔵チェスト
+basic-storage-chest=基本的な貯蔵チェスト
 electric-boiler=電気ボイラー
 oil-pump=オイルポンプ
 super-radar=スーパーレーダー
@@ -130,11 +130,11 @@ gun-turret=弾薬を補充する必要がある基本的な防衛施設。
 flamethrower-turret=敵に火のついた液体を投射します。
 radar=近隣の領域をスキャンし、その周囲のエリアを探索します。
 basic-steel-chest=
-basic-logistic-chest-active-provider=内容物を物流ネットワークへ送り出します。
+basic-active-provider-chest=内容物を物流ネットワークへ送り出します。
-basic-logistic-chest-buffer=個人物流と自動化建設のために指定されたアイテムを要求します。
+basic-buffer-chest=個人物流と自動化建設のために指定されたアイテムを要求します。
-basic-logistic-chest-passive-provider=内容物を物流ネットワークから利用できるようにします。
+basic-passive-provider-chest=内容物を物流ネットワークから利用できるようにします。
-basic-logistic-chest-requester=物流ネットワークから指定したアイテムを取り寄せます。
+basic-requester-chest=物流ネットワークから指定したアイテムを取り寄せます。
-basic-logistic-chest-storage=物流ネットワークにおける長期保管に使用します。
+basic-storage-chest=物流ネットワークにおける長期保管に使用します。
 electric-boiler=燃料を燃やして水を蒸気に変えます。
 oil-pump=
 super-radar=近隣の領域をスキャンし、その周囲のエリアを探索します。
@@ -231,8 +231,7 @@ empty-world=デザインに役立つ
 [mod-setting-name]
 PHI-EN=EN 複合発電を有効にする
 PHI-EN-SOLAR-TIER=EN1 ソーラーパネルの最高等級
-PHI-EN-STEAM-TIER=EN2 蒸気機関の最高等級
+PHI-EN-POWER-TIER=EN2 パワーの最高等級
-PHI-EN-NUCLEAR-TIER=EN3 原子炉の最高等級
 
 PHI-MB=MB より速く機械を有効にする
 PHI-MB-ASSEMBLING-TIER=MB1 組立機の最高等級
@@ -289,8 +288,7 @@ PHI-CT-TRAIN=CT12 電車
 
 [mod-setting-description]
 PHI-EN-SOLAR-TIER=デフォルト 8 ; 止める 1
-PHI-EN-STEAM-TIER=デフォルト 5 ; 止める 1
+PHI-EN-POWER-TIER=デフォルト 5 ; 止める 1
-PHI-EN-NUCLEAR-TIER=デフォルト 5 ; 止める 1
 
 PHI-MB-ASSEMBLING-TIER=デフォルト 5 ; 止める 3
 PHI-MB-FURNACE-TIER=デフォルト 3 ; 止める 1

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

@@ -26,11 +26,11 @@ gun-turret=機槍炮塔
 flamethrower-turret=火焰噴射器
 radar=雷達
 basic-steel-chest=基本的鋼箱
-basic-logistic-chest-active-provider=基本的主動出貨箱
+basic-active-provider-chest=基本的主動出貨箱
-basic-logistic-chest-buffer=基本的轉運箱
+basic-buffer-chest=基本的轉運箱
-basic-logistic-chest-passive-provider=基本的被動出貨箱
+basic-passive-provider-chest=基本的被動出貨箱
-basic-logistic-chest-requester=基本的進貨箱
+basic-requester-chest=基本的進貨箱
-basic-logistic-chest-storage=基本的回收箱
+basic-storage-chest=基本的回收箱
 electric-boiler=電鍋爐
 oil-pump=抽油泵
 super-radar=超級雷達
@@ -130,11 +130,11 @@ gun-turret=基礎防禦設施，須裝填彈匣。
 flamethrower-turret=噴射燃燒的油料燒灼敵人。
 radar=掃描並顯示附近的未知區域。
 basic-steel-chest=
-basic-logistic-chest-active-provider=主動將內容物配送到物流網。
+basic-active-provider-chest=主動將內容物配送到物流網。
-basic-logistic-chest-buffer=可要求備貨指定物品以隨時供給個人物流及自動化建造。
+basic-buffer-chest=可要求備貨指定物品以隨時供給個人物流及自動化建造。
-basic-logistic-chest-passive-provider=放入的物品可供物流網運用。
+basic-passive-provider-chest=放入的物品可供物流網運用。
-basic-logistic-chest-requester=從物流網路中收集指定的物品。
+basic-requester-chest=從物流網路中收集指定的物品。
-basic-logistic-chest-storage=物流網的長期儲藏方案。
+basic-storage-chest=物流網的長期儲藏方案。
 electric-boiler=燃燒燃料，把水煮成蒸汽。
 oil-pump=
 super-radar=掃描並顯示附近的未知區域。
@@ -231,8 +231,7 @@ empty-world=對設計有用
 [mod-setting-name]
 PHI-EN=EN 啟用複合發電
 PHI-EN-SOLAR-TIER=EN1 太陽能板的最高等級
-PHI-EN-STEAM-TIER=EN2 蒸汽發電機的最高等級
+PHI-EN-POWER-TIER=EN2 電力的最高等級
-PHI-EN-NUCLEAR-TIER=EN3 核能反應爐的最高等級
 
 PHI-MB=MB 啟用快速機器
 PHI-MB-ASSEMBLING-TIER=MB1 組裝機的最高等級
@@ -289,8 +288,7 @@ PHI-CT-TRAIN=CT12 電動火車
 
 [mod-setting-description]
 PHI-EN-SOLAR-TIER=預設 8 ; 停用 1
-PHI-EN-STEAM-TIER=預設 5 ; 停用 1
+PHI-EN-POWER-TIER=預設 5 ; 停用 1
-PHI-EN-NUCLEAR-TIER=預設 5 ; 停用 1
 
 PHI-MB-ASSEMBLING-TIER=預設 5 ; 停用 3
 PHI-MB-FURNACE-TIER=預設 3 ; 停用 1

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

@@ -26,11 +26,11 @@ gun-turret=機槍炮塔
 flamethrower-turret=火焰噴射器
 radar=雷達
 basic-steel-chest=基本的鋼箱
-basic-logistic-chest-active-provider=基本的主動出貨箱
+basic-active-provider-chest=基本的主動出貨箱
-basic-logistic-chest-buffer=基本的轉運箱
+basic-buffer-chest=基本的轉運箱
-basic-logistic-chest-passive-provider=基本的被動出貨箱
+basic-passive-provider-chest=基本的被動出貨箱
-basic-logistic-chest-requester=基本的進貨箱
+basic-requester-chest=基本的進貨箱
-basic-logistic-chest-storage=基本的回收箱
+basic-storage-chest=基本的回收箱
 electric-boiler=電鍋爐
 oil-pump=抽油泵
 super-radar=超級雷達
@@ -130,11 +130,11 @@ gun-turret=基礎防禦設施，須裝填彈匣。
 flamethrower-turret=噴射燃燒的油料燒灼敵人。
 radar=掃描並顯示附近的未知區域。
 basic-steel-chest=
-basic-logistic-chest-active-provider=主動將內容物配送到物流網。
+basic-active-provider-chest=主動將內容物配送到物流網。
-basic-logistic-chest-buffer=可要求備貨指定物品以隨時供給個人物流及自動化建造。
+basic-buffer-chest=可要求備貨指定物品以隨時供給個人物流及自動化建造。
-basic-logistic-chest-passive-provider=放入的物品可供物流網運用。
+basic-passive-provider-chest=放入的物品可供物流網運用。
-basic-logistic-chest-requester=從物流網路中收集指定的物品。
+basic-requester-chest=從物流網路中收集指定的物品。
-basic-logistic-chest-storage=物流網的長期儲藏方案。
+basic-storage-chest=物流網的長期儲藏方案。
 electric-boiler=燃燒燃料，把水煮成蒸汽。
 oil-pump=
 super-radar=掃描並顯示附近的未知區域。
@@ -231,8 +231,7 @@ empty-world=對設計有用
 [mod-setting-name]
 PHI-EN=EN 啟用複合發電
 PHI-EN-SOLAR-TIER=EN1 太陽能板的最高等級
-PHI-EN-STEAM-TIER=EN2 蒸汽發電機的最高等級
+PHI-EN-POWER-TIER=EN2 電力的最高等級
-PHI-EN-NUCLEAR-TIER=EN3 核能反應爐的最高等級
 
 PHI-MB=MB 啟用快速機器
 PHI-MB-ASSEMBLING-TIER=MB1 組裝機的最高等級
@@ -289,8 +288,7 @@ PHI-CT-TRAIN=CT12 電動火車
 
 [mod-setting-description]
 PHI-EN-SOLAR-TIER=預設 8 ; 停用 1
-PHI-EN-STEAM-TIER=預設 5 ; 停用 1
+PHI-EN-POWER-TIER=預設 5 ; 停用 1
-PHI-EN-NUCLEAR-TIER=預設 5 ; 停用 1
 
 PHI-MB-ASSEMBLING-TIER=預設 5 ; 停用 3
 PHI-MB-FURNACE-TIER=預設 3 ; 停用 1

PHI-CL/main.lua

@@ -35,18 +35,26 @@ function main.EEE(source, tier)
     end
 
     if (source.type == 'electric-turret') or (source.type == 'ammo-turret') or (source.type == 'fluid-turret') then
-        item.attack_parameters.damage_modifier = (2 ^ (tier - source.min + 1))
+        item.attack_parameters.damage_modifier = 2 ^ (tier - source.min + 1)
         item.attack_parameters.range = item.attack_parameters.range + (2 * (tier - source.min + 1))
         item.call_for_help_radius = item.call_for_help_radius + (2 * (tier - source.min + 1))
 
         if source.type == 'electric-turret' then
-            item.attack_parameters.damage_modifier = item.attack_parameters.damage_modifier * 2
             item.glow_light_intensity = 1
             item.attack_parameters.ammo_type.action.action_delivery.max_length = item.attack_parameters.ammo_type.action.action_delivery.max_length + (2 * (tier - source.min + 1))
             item.attack_parameters.ammo_type.energy_consumption = tonumber(string.match(item.attack_parameters.ammo_type.energy_consumption, '[%d%.]+')) * (2 ^ (tier - source.min + 1)) .. string.match(item.attack_parameters.ammo_type.energy_consumption, '%a+')
             item.energy_source.input_flow_limit = tonumber(string.match(item.energy_source.input_flow_limit, '[%d%.]+')) * (2 ^ (tier - source.min + 1)) .. string.match(item.energy_source.input_flow_limit, '%a+')
             item.energy_source.buffer_capacity = tonumber(string.match(item.energy_source.buffer_capacity, '[%d%.]+')) * (2 ^ (tier - source.min + 1)) .. string.match(item.energy_source.buffer_capacity, '%a+')
 
+        elseif source.type == 'ammo-turret' then
+            if item.energy_per_shot then
+                item.energy_per_shot = tonumber(string.match(item.energy_per_shot, '[%d%.]+')) * (2 ^ (tier - source.min + 1)) .. string.match(item.energy_per_shot, '%a+')
+            end
+
+            if item.energy_source and item.energy_source.input_flow_limit then
+                item.energy_source.input_flow_limit = tonumber(string.match(item.energy_source.input_flow_limit, '[%d%.]+')) * (2 ^ (tier - source.min + 1)) .. string.match(item.energy_source.input_flow_limit, '%a+')
+            end
+
         elseif source.type == 'fluid-turret' then
             item.prepare_range = item.prepare_range + (2 * (tier - source.min + 1))
         end
@@ -99,6 +107,14 @@ function main.EEE(source, tier)
 
             tint_handle(item, tier, {'connection_patches_connected', 'connection_patches_disconnected', 'heat_connection_patches_connected', 'heat_connection_patches_disconnected', 'lower_layer_picture'})
 
+        elseif (source.type == 'fusion-reactor') then
+            item.consumption = tostring(tonumber(string.match(item.consumption, '[%d%.]+')) * tier) .. string.match(item.consumption, '%a+')
+            item.max_fluid_usage = item.max_fluid_usage * (2 ^ (tier - source.min + 1))
+
+        elseif (source.type == 'fusion-generator') then
+            item.max_power_output = tostring(tonumber(string.match(item.max_power_output, '[%d%.]+')) * tier) .. string.match(item.max_power_output, '%a+')
+            item.max_fluid_usage = item.max_fluid_usage * (2 ^ (tier - source.min + 1))
+
         elseif (source.type == 'heat-pipe') then
             item.heat_buffer.max_temperature = item.heat_buffer.max_temperature * tier
             item.heat_buffer.max_transfer = tostring(tonumber(string.match(item.heat_buffer.max_transfer, '[%d%.]+')) * tier)  .. string.match(item.heat_buffer.max_transfer, '%a+')

PHI-CL/settings.lua

@@ -14,18 +14,11 @@ data:extend({
     order = 'A01'
   }, {
     type = 'int-setting',
-    name = 'PHI-EN-STEAM-TIER',
+    name = 'PHI-EN-POWER-TIER',
     setting_type = 'startup',
     default_value = 5,
     allowed_values = {1, 2, 3, 4, 5},
     order = 'A02'
-  }, {
-    type = 'int-setting',
-    name = 'PHI-EN-NUCLEAR-TIER',
-    setting_type = 'startup',
-    default_value = 5,
-    allowed_values = {1, 2, 3, 4, 5},
-    order = 'A03'
   }, {
     type = 'bool-setting',
     name = 'PHI-MB',