Update

PHI-CC/.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = false

PHI-CC/changelog.txt

@@ -0,0 +1,6 @@
+---------------------------------------------------------------------------------------------------
+Version: 1.1.0
+Date: 2022-12-01
+
+Added:
+    - Compound Solar Panel and Accumulator

PHI-CC/control.lua

@@ -0,0 +1,24 @@
+script.on_init(function()
+    if global.phi == nil then
+        global.phi = {}
+    end
+
+    global.phi.cc = {}
+    global.phi.gui = {}
+end)
+
+script.on_event(defines.events.on_player_created, function(event)
+    global.phi.cc.gui[event.player.index] = {controls_active = true}
+
+    local player = game.get_player(event.player_index)
+
+    local screen_element = player.gui.screen
+    local main_frame = screen_element.add{type='frame', name='ugg_main_frame', caption={'ugg.hello_world'}}
+    main_frame.style.size = {385, 165}
+    main_frame.auto_center = true
+
+    local content_frame = main_frame.add{type='frame', name='content_frame', direction='vertical', style='ugg_content_frame'}
+    local controls_flow = content_frame.add{type='flow', name='controls_flow', direction='horizontal', style='ugg_controls_flow'}
+
+    controls_flow.add{type='button', name='ugg_controls_toggle', caption={'ugg.deactivate'}}
+end)

PHI-CC/info.json

@@ -0,0 +1,14 @@
+{
+    "name": "PHI-CC",
+    "version": "1.0.0",
+    "factorio_version": "1.1",
+    "date": "2023-04-25",
+    "title": "Phidias Circuit Combinator",
+    "author": "PHIDIAS0303",
+    "contributers": "",
+    "homepage": "",
+    "description": "",
+    "dependencies": [
+        "base >= 1.1.0"
+    ]
+}

PHI-MB/info.json

@@ -1,8 +1,8 @@
 {
     "name": "PHI-MB",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "factorio_version": "1.1",
-    "date": "2023-04-22",
+    "date": "2023-04-27",
     "title": "Phidias Megabase",
     "author": "PHIDIAS0303",
     "contributers": "",

PHI-MB/migrations/migrations.lua

@@ -8,31 +8,41 @@ for index, force in pairs(game.forces) do
         recipes['lab-3'].enabled = true
         recipes['lab-3'].reload()
 
-        if mods['aai-industry'] then
+        if recipes['se-fuel-processor'] ~= nil then
-            recipes['fuel-processor-2'].enabled = true
+            if recipes['se-fuel-processor'].enabled then
-            recipes['fuel-processor-2'].reload()
+                recipes['fuel-processor-2'].enabled = true
-            recipes['fuel-processor-3'].enabled = true
+                recipes['fuel-processor-2'].reload()
-            recipes['fuel-processor-3'].reload()
+                recipes['fuel-processor-3'].enabled = true
+                recipes['fuel-processor-3'].reload()
+            end
         end
 
-        if mods['space-exploration'] then
+        if recipes['se-fuel-refinery'] ~= nil then
-            recipes['se-fuel-refinery-2'].enabled = true
+            if recipes['se-fuel-refinery'].enabled then
-            recipes['se-fuel-refinery-2'].reload()
+                recipes['se-fuel-refinery-2'].enabled = true
-            recipes['se-fuel-refinery-3'].enabled = true
+                recipes['se-fuel-refinery-2'].reload()
-            recipes['se-fuel-refinery-3'].reload()
+                recipes['se-fuel-refinery-3'].enabled = true
+                recipes['se-fuel-refinery-3'].reload()
+            end
         end
 
     elseif technologies['automation-2'].researched then
-        if mods['space-exploration'] then
+        if recipes['se-pulveriser'] ~= nil then
-            recipes['se-pulveriser-2'].enabled = true
+            if recipes['se-pulveriser'].enabled then
-            recipes['se-pulveriser-2'].reload()
+                recipes['se-pulveriser-2'].enabled = true
-            recipes['se-pulveriser-3'].enabled = true
+                recipes['se-pulveriser-2'].reload()
-            recipes['se-pulveriser-3'].reload()
+                recipes['se-pulveriser-3'].enabled = true
+                recipes['se-pulveriser-3'].reload()
+            end
+        end
 
-            recipes['se-lifesupport-facility-2'].enabled = true
+        if recipes['se-lifesupport-facility'] ~= nil then
-            recipes['se-lifesupport-facility-2'].reload()
+            if recipes['se-lifesupport-facility'].enabled then
-            recipes['se-lifesupport-facility-3'].enabled = true
+                recipes['se-lifesupport-facility-2'].enabled = true
-            recipes['se-lifesupport-facility-3'].reload()
+                recipes['se-lifesupport-facility-2'].reload()
+                recipes['se-lifesupport-facility-3'].enabled = true
+                recipes['se-lifesupport-facility-3'].reload()
+            end
         end
 
     elseif technologies['automation-3'].researched then
@@ -41,28 +51,40 @@ for index, force in pairs(game.forces) do
         recipes['assembling-machine-5'].enabled = true
         recipes['assembling-machine-5'].reload()
 
-        if mods['aai-industry'] then
+        if recipes['industrial-furnace'] ~= nil then
-            recipes['industrial-furnace-2'].enabled = true
+            if recipes['industrial-furnace'].enabled then
-            recipes['industrial-furnace-2'].reload()
+                recipes['industrial-furnace-2'].enabled = true
-            recipes['industrial-furnace-3'].enabled = true
+                recipes['industrial-furnace-2'].reload()
-            recipes['industrial-furnace-3'].reload()
+                recipes['industrial-furnace-3'].enabled = true
+                recipes['industrial-furnace-3'].reload()
+            end
         end
 
-        if mods['space-exploration'] then
+        if recipes['se-space-assembling-machine'] ~= nil then
-            recipes['se-space-assembling-machine-2'].enabled = true
+            if recipes['se-space-assembling-machine'].enabled then
-            recipes['se-space-assembling-machine-2'].reload()
+                recipes['se-space-assembling-machine-2'].enabled = true
-            recipes['se-space-assembling-machine-3'].enabled = true
+                recipes['se-space-assembling-machine-2'].reload()
-            recipes['se-space-assembling-machine-3'].reload()
+                recipes['se-space-assembling-machine-3'].enabled = true
+                recipes['se-space-assembling-machine-3'].reload()
+            end
+        end
 
-            recipes['se-space-manufactory-2'].enabled = true
+        if recipes['se-space-manufactory'] ~= nil then
-            recipes['se-space-manufactory-2'].reload()
+            if recipes['se-space-manufactory'].enabled then
-            recipes['se-space-manufactory-3'].enabled = true
+                recipes['se-space-manufactory-2'].enabled = true
-            recipes['se-space-manufactory-3'].reload()
+                recipes['se-space-manufactory-2'].reload()
+                recipes['se-space-manufactory-3'].enabled = true
+                recipes['se-space-manufactory-3'].reload()
+            end
+        end
 
-            recipes['se-casting-machine-2'].enabled = true
+        if recipes['se-casting-machine'] ~= nil then
-            recipes['se-casting-machine-2'].reload()
+            if recipes['se-casting-machine'].enabled then
-            recipes['se-casting-machine-3'].enabled = true
+                recipes['se-casting-machine-2'].enabled = true
-            recipes['se-casting-machine-3'].reload()
+                recipes['se-casting-machine-2'].reload()
+                recipes['se-casting-machine-3'].enabled = true
+                recipes['se-casting-machine-3'].reload()
+            end
         end
 
     elseif technologies['advanced-material-processing-2'].researched then

PHI-WE/data-updates.lua

@@ -2,3 +2,13 @@
 data.raw['electric-turret']['laser-turret'].fast_replaceable_group = 'laser-turret'
 data.raw['electric-turret']['laser-turret-2'].fast_replaceable_group = data.raw['electric-turret']['laser-turret'].fast_replaceable_group
 data.raw['electric-turret']['laser-turret-3'].fast_replaceable_group = data.raw['electric-turret']['laser-turret-2'].fast_replaceable_group
+
+-- gun turret
+data.raw['ammo-turret']['gun-turret'].fast_replaceable_group = 'gun-turret'
+data.raw['ammo-turret']['gun-turret-2'].fast_replaceable_group = data.raw['ammo-turret']['gun-turret'].fast_replaceable_group
+data.raw['ammo-turret']['gun-turret-3'].fast_replaceable_group = data.raw['ammo-turret']['gun-turret-2'].fast_replaceable_group
+
+-- gun turret
+data.raw['fluid-turret']['flamethrower-turret'].fast_replaceable_group = 'flamethrower-turret'
+data.raw['fluid-turret']['flamethrower-turret-2'].fast_replaceable_group = data.raw['fluid-turret']['flamethrower-turret'].fast_replaceable_group
+data.raw['fluid-turret']['flamethrower-turret-3'].fast_replaceable_group = data.raw['fluid-turret']['flamethrower-turret-2'].fast_replaceable_group

PHI-WE/data.lua

@@ -6,7 +6,28 @@ local items = {
         ref_name = 'laser-turret',
         tech = 'laser-turret',
         min = 2,
-        max = 3
+        max = 3,
+        range = 24
+    },
+    ['gun-turret'] = {
+        enabled = true,
+        type = 'ammo-turret',
+        name = 'gun-turret',
+        ref_name = 'gun-turret',
+        tech = 'gun-turret',
+        min = 2,
+        max = 3,
+        range = 18
+    },
+    ['flamethrower-turret'] = {
+        enabled = true,
+        type = 'fluid-turret',
+        name = 'flamethrower-turret',
+        ref_name = 'flamethrower-turret',
+        tech = 'flamethrower',
+        min = 2,
+        max = 3,
+        range = 30
     }
 }
 
@@ -17,12 +38,19 @@ local function EE(source, tier)
     item.name = source.name .. '-' .. tier
     item.minable.result = source.name .. '-' .. tier
     item.max_health = item.max_health * tier
-    item.attack_parameters.damage_modifier = 2 * (2 ^ (tier - source.min + 1))
+    item.attack_parameters.damage_modifier = (2 ^ (tier - 1))
+    item.attack_parameters.range = source.range + (2 * (tier - 1))
+    item.call_for_help_radius = 40 + (2 * (tier - 1))
 
     if source.type == 'electric-turret' then
-        item.energy_source.input_flow_limit = tonumber(string.match(item.energy_source.input_flow_limit, '%d+')) * (2 ^ (tier - source.min + 1)) .. 'kW'
+        item.attack_parameters.damage_modifier = item.attack_parameters.damage_modifier * 2
-        item.energy_source.buffer_capacity = tonumber(string.match(item.energy_source.buffer_capacity, '%d+')) * (2 ^ (tier - source.min + 1)) .. 'kW'
         item.glow_light_intensity = 1
+        item.attack_parameters.ammo_type.action.action_delivery.max_length = source.range + (2 * (tier - 1))
+        item.attack_parameters.ammo_type.energy_consumption = 800 * (2 ^ (tier - 1)) .. 'kJ'
+        item.energy_source.input_flow_limit = 9600 * (2 ^ (tier - 1)) .. 'kW'
+        item.energy_source.buffer_capacity = 12816 * (2 ^ (tier - 1)) .. 'kJ'
+    elseif source.type == 'fluid-turret' then
+        item.prepare_range = 35 + (2 * (tier - 1))
     end
 
     -- item.animation.layers[1].filename = graphics_location .. source .. '-e.png'

PHI-WE/info.json

@@ -1,13 +1,13 @@
 {
     "name": "PHI-WE",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "factorio_version": "1.1",
-    "date": "2023-04-21",
+    "date": "2023-04-27",
-    "title": "Phidias Warfare Equipment",
+    "title": "Phidias Warfare",
     "author": "PHIDIAS0303",
     "contributers": "",
     "homepage": "",
-    "description": "Warfare Equipment",
+    "description": "Warfare",
     "dependencies": [
         "base >= 1.1.0"
     ]

PHI-WE/locale/en/locale.cfg

@@ -1,11 +1,21 @@
 [item-name]
 laser-turret-2=Laser turret 2
 laser-turret-3=Laser turret 3
+gun-turret-2=Gun turret 2
+gun-turret-3=Gun turret 3
+flamethrower-turret-2=Flamethrower turret 2
+flamethrower-turret-3=Flamethrower turret 3
 
 [entity-name]
 laser-turret-2=Laser turret 2
 laser-turret-3=Laser turret 3
+gun-turret-2=Gun turret 2
+gun-turret-3=Gun turret 3
+flamethrower-turret-2=Flamethrower turret 2
+flamethrower-turret-3=Flamethrower turret 3
 
 [entity-description]
 laser-turret-2=Advanced defensive buildings that only require electricity.
 laser-turret-3=Advanced defensive buildings that only require electricity.
+gun-turret-2=Basic defensive buildings that must be refilled with magazines.
+gun-turret-3=Basic defensive buildings that must be refilled with magazines.

PHI-WE/locale/ja/locale.cfg

@@ -1,11 +1,23 @@
 [item-name]
 laser-turret-2=レーザータレット 2
 laser-turret-3=レーザータレット 3
+gun-turret-2=ガンタレット 2
+gun-turret-3=ガンタレット 3
+flamethrower-turret-2=火炎放射器 2
+flamethrower-turret-3=火炎放射器 3
 
 [entity-name]
 laser-turret-2=レーザータレット 2
 laser-turret-3=レーザータレット 3
+gun-turret-2=ガンタレット 2
+gun-turret-3=ガンタレット 3
+flamethrower-turret-2=火炎放射器 2
+flamethrower-turret-3=火炎放射器 3
 
 [entity-description]
 laser-turret-2=電気のみで稼動する高度な防衛施設。
 laser-turret-3=電気のみで稼動する高度な防衛施設。
+gun-turret-2=弾薬を補充する必要がある基本的な防衛施設。
+gun-turret-3=弾薬を補充する必要がある基本的な防衛施設。
+flamethrower-turret-2=敵に火のついた液体を投射します。
+flamethrower-turret-3=敵に火のついた液体を投射します。

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

@@ -1,11 +1,23 @@
 [item-name]
 laser-turret-2=雷射炮塔 2
 laser-turret-3=雷射炮塔 3
+gun-turret-2=機槍炮塔 2
+gun-turret-3=機槍炮塔 3
+flamethrower-turret-2=火焰噴射器 2
+flamethrower-turret-3=火焰噴射器 3
 
 [entity-name]
 laser-turret-2=雷射炮塔 2
 laser-turret-3=雷射炮塔 3
+gun-turret-2=機槍炮塔 2
+gun-turret-3=機槍炮塔 3
+flamethrower-turret-2=火焰噴射器 2
+flamethrower-turret-3=火焰噴射器 3
 
 [entity-description]
 laser-turret-2=僅需電力即可運轉的先進防禦工事。
 laser-turret-3=僅需電力即可運轉的先進防禦工事。
+gun-turret-2=基礎防禦設施，須裝填彈匣。
+gun-turret-3=基礎防禦設施，須裝填彈匣。
+flamethrower-turret-2=噴射燃燒的油料燒灼敵人。
+flamethrower-turret-3=噴射燃燒的油料燒灼敵人。

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

@@ -1,11 +1,23 @@
 [item-name]
 laser-turret-2=雷射炮塔 2
 laser-turret-3=雷射炮塔 3
+gun-turret-2=機槍炮塔 2
+gun-turret-3=機槍炮塔 3
+flamethrower-turret-2=火焰噴射器 2
+flamethrower-turret-3=火焰噴射器 3
 
 [entity-name]
 laser-turret-2=雷射炮塔 2
 laser-turret-3=雷射炮塔 3
+gun-turret-2=機槍炮塔 2
+gun-turret-3=機槍炮塔 3
+flamethrower-turret-2=火焰噴射器 2
+flamethrower-turret-3=火焰噴射器 3
 
 [entity-description]
 laser-turret-2=僅需電力即可運轉的先進防禦工事。
 laser-turret-3=僅需電力即可運轉的先進防禦工事。
+gun-turret-2=基礎防禦設施，須裝填彈匣。
+gun-turret-3=基礎防禦設施，須裝填彈匣。
+flamethrower-turret-2=噴射燃燒的油料燒灼敵人。
+flamethrower-turret-3=噴射燃燒的油料燒灼敵人。