.

PHI-CL/data/b/gm-vp.lua

@@ -197,7 +197,6 @@ end
 
 data.raw.technology['automation-productivity'].icons[1].icon = '__base__/graphics/technology/automation-2.png'
 -- data.raw.technology['automation-productivity'].localised_name = {'phi-cl.combine', {'technology-name.automation'}, ''}
--- 'metallurgic-science-pack', 'electromagnetic-science-pack', 'cryogenic-science-pack'
 
 -- GM-VP A 1 SPACE_AGE RESEARCH_EFFECT
 if data.raw.technology['automation'] and data.raw.technology['automation'].effects then

PHI-CL/data/b/gm.lua

@@ -1,6 +1,4 @@
 
-local mod_graphic_location = '__PHI-CL__/graphics/'
-
 -- GM C 1 SPACE_AGE ENTITY
 if data.raw['cargo-bay'] and data.raw['cargo-bay']['cargo-bay'] then
     data.raw['cargo-bay']['cargo-bay'].inventory_size_bonus = math.max(40, data.raw['cargo-bay']['cargo-bay'].inventory_size_bonus)
@@ -56,15 +54,6 @@ if data.raw.recipe['artillery-wagon'] then
     data.raw.recipe['artillery-wagon'].ingredients = {{type = 'item', name = 'engine-unit', amount = 64}, {type = 'item', name = 'iron-gear-wheel', amount = 10}, {type = 'item', name = 'steel-plate', amount = 40}, {type = 'item', name = 'pipe', amount = 16}, {type = 'item', name = 'advanced-circuit', amount = 20}}
 end
 
--- GM C 1 BASE ENTITY
-if data.raw['roboport'] and data.raw['roboport']['roboport'] then
-    data.raw['roboport']['roboport'].energy_source.input_flow_limit = nil
-    data.raw['roboport']['roboport'].charging_energy = tostring(tonumber(string.match(data.raw['roboport']['roboport'].charging_energy, '[%d%.]+')) * 2) .. string.match(data.raw['roboport']['roboport'].charging_energy, '%a+')
-    data.raw['roboport']['roboport'].robot_slots_count = 10
-    data.raw['roboport']['roboport'].material_slots_count = 2
-    data.raw['roboport']['roboport'].charging_station_count = 8
-end
-
 -- GM C 1 BASE ITEM
 if data.raw.ammo['artillery-shell'] then
     data.raw.ammo['artillery-shell'].stack_size = data.raw['inserter']['stack-inserter'].max_belt_stack_size
@@ -140,68 +129,3 @@ for _, v in pairs(data.raw['resource']) do
         data.raw.item[vn].stack_size = math.max(data.raw.item[vn].stack_size, 100)
     end
 end
-
--- GM A 2 BASE ITEM,RECIPE
--- GM C 1 BASE ENTITY
-if data.raw.item['depleted-uranium-fuel-cell'] and data.raw.item['nuclear-fuel'] then
-    local item = table.deepcopy(data.raw.item['depleted-uranium-fuel-cell'])
-    item.name = 'empty-train-battery'
-    item.icon = mod_graphic_location .. 'battery.png'
-    item.order = 'qa'
-    item.stack_size = 100
-    item.localised_name = {'name.empty-train-battery'}
-    item.localised_description = {'description.empty-train-battery'}
-    data:extend({item})
-
-    data:extend({{
-        type = 'recipe',
-        name = 'empty-train-battery',
-        energy_required = 20,
-        enabled = true,
-        icon = mod_graphic_location .. 'battery.png',
-        icon_size = 64,
-        subgroup = 'intermediate-product',
-        order = 'zc',
-        allow_productivity = false,
-        ingredients = {{type = 'item', name = 'battery', amount = 100}},
-        results = {{type = 'item', name = 'empty-train-battery', amount = 1}},
-        main_product = 'empty-train-battery',
-        localised_name = {'name.empty-train-battery'},
-        localised_description = {'description.empty-train-battery'}
-    }})
-
-    item = table.deepcopy(data.raw.item['nuclear-fuel'])
-    item.name = 'charged-train-battery'
-    item.burnt_result = 'empty-train-battery'
-    item.fuel_value = '1GJ'
-    item.icon = mod_graphic_location .. 'battery.png'
-    item.stack_size = 10
-    item.localised_name = {'name.charged-train-battery'}
-    item.localised_description = {'description.charged-train-battery'}
-    data:extend({item})
-
-    data:extend({{
-        type = 'recipe',
-        name = 'charged-train-battery',
-        energy_required = 30,
-        enabled = true,
-        icon = mod_graphic_location .. 'battery.png',
-        icon_size = 64,
-        subgroup = 'intermediate-product',
-        order = 'zd',
-        allow_productivity = false,
-        ingredients = {{type = 'item', name = 'empty-train-battery', amount = 1}},
-        results = {{type = 'item', name = 'charged-train-battery', probability = 0.995, amount = 1}, {type = 'item', name = 'battery', probability = 0.005, amount = 5}},
-        main_product = 'charged-train-battery',
-        localised_name = {'name.charged-train-battery'},
-        localised_description = {'description.charged-train-battery'}
-    }})
-
-    if data.raw['locomotive'] then
-        for _, v in pairs(data.raw['locomotive']) do
-            if v.energy_source then
-                v.energy_source.burnt_inventory_size = (v.energy_source.burnt_inventory_size and math.max(v.energy_source.burnt_inventory_size, 1)) or 1
-            end
-        end
-    end
-end

PHI-CL/data/b/mig.lua

@@ -1,3 +1,5 @@
+local mod_graphic_location = '__PHI-CL__/graphics/'
+
 local mod_tint = {
     [2] = {r=140, g=142, b=200},
     [3] = {r=242, g=161, b=26},
@@ -81,15 +83,6 @@ if data.raw['reactor'] then
     end
 end
 
--- MIG C 5 BASE ENTITY
-for _, t in pairs({'offshore-pump', 'pump', 'pipe', 'pipe-to-ground', 'infinity-pipe'}) do
-    if data.raw[t] then
-        for _, v in pairs(data.raw[t]) do
-            v.heating_energy = nil
-        end
-    end
-end
-
 -- MIG C 3 BASE ENTITY,ITEM
 -- MIG A 1 BASE RECIPE
 if data.raw['valve'] then
@@ -503,9 +496,9 @@ if data.raw['proxy-container'] and data.raw['proxy-container']['proxy-container'
     data.raw['proxy-container']['proxy-container'].draw_inventory_content = false
 end
 
--- MIG C 13 BASE ENTITY
+-- MIG C 18 BASE ENTITY
 -- MIG C 5 SPACE_AGE ENTITY
-for _, w in pairs({'storage-tank', 'generator', 'furnace', 'roboport', 'assembling-machine'}) do
+for _, w in pairs({'storage-tank', 'generator', 'furnace', 'roboport', 'assembling-machine', 'offshore-pump', 'pump', 'pipe', 'pipe-to-ground', 'infinity-pipe'}) do
     if data.raw[w] then
         for _, v in pairs(data.raw[w]) do
             v.heating_energy = nil
@@ -519,6 +512,17 @@ end
 for _, w in pairs({'roboport', 'roboport-equipment'}) do
     if data.raw[w] then
         for _, v in pairs(data.raw[w]) do
+            if v.energy_source then
+                v.energy_source.input_flow_limit = nil
+            end
+
+            if w == 'roboport' then
+                v.robot_slots_count = 10
+                v.material_slots_count = 2
+            end
+
+            v.charging_energy = tostring(tonumber(string.match(v.charging_energy, '[%d%.]+')) * 2) .. string.match(v.charging_energy, '%a+')
+            v.charging_station_count = 8
             v.charging_station_count_affected_by_quality = true
         end
     end
@@ -526,9 +530,14 @@ end
 
 -- MIG C 1 SPAGE_AGE ENTITY
 if data.raw['thruster'] and data.raw['thruster']['thruster'] then
+    if data.raw['thruster']['thruster'].fuel_fluid_box then
         table.insert(data.raw['thruster']['thruster'].fuel_fluid_box.pipe_connections, {flow_direction = 'input-output', direction = defines.direction.west, position = {-1.5, 2}})
+    end
+
+    if data.raw['thruster']['thruster'].oxidizer_fluid_box then
         table.insert(data.raw['thruster']['thruster'].oxidizer_fluid_box.pipe_connections, {flow_direction = 'input-output', direction = defines.direction.east, position = {1.5, 2}})
     end
+end
 
 -- MIG C 1 SPAGE_AGE ENTITY
 if data.raw['fusion-generator'] and data.raw['fusion-generator']['fusion-generator'] then
@@ -585,3 +594,68 @@ if data.raw['reactor'] and data.raw['reactor']['heating-tower'] then
 
     table.insert(data.raw.technology['heating-tower'].effects, {type = 'unlock-recipe', recipe = item.name})
 end
+
+-- GM A 2 BASE ITEM,RECIPE
+-- GM C 1 BASE ENTITY
+if data.raw.item['depleted-uranium-fuel-cell'] and data.raw.item['nuclear-fuel'] then
+    local item = table.deepcopy(data.raw.item['depleted-uranium-fuel-cell'])
+    item.name = 'empty-train-battery'
+    item.icon = mod_graphic_location .. 'battery.png'
+    item.order = 'qa'
+    item.stack_size = 100
+    item.localised_name = {'name.empty-train-battery'}
+    item.localised_description = {'description.empty-train-battery'}
+    data:extend({item})
+
+    data:extend({{
+        type = 'recipe',
+        name = 'empty-train-battery',
+        energy_required = 20,
+        enabled = true,
+        icon = mod_graphic_location .. 'battery.png',
+        icon_size = 64,
+        subgroup = 'intermediate-product',
+        order = 'zc',
+        allow_productivity = false,
+        ingredients = {{type = 'item', name = 'battery', amount = 100}},
+        results = {{type = 'item', name = 'empty-train-battery', amount = 1}},
+        main_product = 'empty-train-battery',
+        localised_name = {'name.empty-train-battery'},
+        localised_description = {'description.empty-train-battery'}
+    }})
+
+    item = table.deepcopy(data.raw.item['nuclear-fuel'])
+    item.name = 'charged-train-battery'
+    item.burnt_result = 'empty-train-battery'
+    item.fuel_value = '1GJ'
+    item.icon = mod_graphic_location .. 'battery.png'
+    item.stack_size = 10
+    item.localised_name = {'name.charged-train-battery'}
+    item.localised_description = {'description.charged-train-battery'}
+    data:extend({item})
+
+    data:extend({{
+        type = 'recipe',
+        name = 'charged-train-battery',
+        energy_required = 30,
+        enabled = true,
+        icon = mod_graphic_location .. 'battery.png',
+        icon_size = 64,
+        subgroup = 'intermediate-product',
+        order = 'zd',
+        allow_productivity = false,
+        ingredients = {{type = 'item', name = 'empty-train-battery', amount = 1}},
+        results = {{type = 'item', name = 'charged-train-battery', probability = 0.995, amount = 1}, {type = 'item', name = 'battery', probability = 0.005, amount = 5}},
+        main_product = 'charged-train-battery',
+        localised_name = {'name.charged-train-battery'},
+        localised_description = {'description.charged-train-battery'}
+    }})
+
+    if data.raw['locomotive'] then
+        for _, v in pairs(data.raw['locomotive']) do
+            if v.energy_source then
+                v.energy_source.burnt_inventory_size = (v.energy_source.burnt_inventory_size and math.max(v.energy_source.burnt_inventory_size, 1)) or 1
+            end
+        end
+    end
+end

PHI-CL/settings.lua

@@ -77,7 +77,7 @@ data:extend({
   setting_type = 'startup',
   default_value = false,
   localised_name = {'phi-cl.setting-class-color', 'MI1', {'phi-cl.enable'}, {'mod-setting-name.PHI-MI-GENERIC'}},
-  localised_description = {'', {'phi-cl.setting-change-color', '[174] A96 C78'}},
+  localised_description = {'', {'phi-cl.setting-change-color', '[179] A100 C79'}},
   order = 'B01'
 }, {
   type = 'int-setting',
@@ -168,7 +168,7 @@ data:extend({
   default_value = '',
   allowed_values = {'', 'SAP', 'VP'},
   localised_name = {'phi-cl.setting-category-color', 'GM', {'phi-cl.enable'}, {'mod-setting-name.PHI-GM'}},
-  localised_description = {'', {'phi-cl.setting-change-color', '[GM] [60] A26 C25 H9\n[SAP] [30] A3 C27\n[VP] [615] A16 C189 H410'}},
+  localised_description = {'', {'phi-cl.setting-change-color', '[GM] [55] A22 C23 H9\n[SAP] [30] A3 C27\n[VP] [615] A16 C189 H410'}},
   order = 'D00'
 },  {
   type = 'bool-setting',