diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt index 1c85b77..77b251a 100644 --- a/PHI-CL/changelog.txt +++ b/PHI-CL/changelog.txt @@ -9,6 +9,7 @@ Date: 2026-05-10 - [MI] Removed train speed setting. - [MI] Removed robot speed setting. - [MI] Removed lab quality affect drain setting. + - [MI] Removed second underground belt set. - [SA] Now spoil freeze ratio equal to zero means it will be disabled. --------------------------------------------------------------------------------------------------- diff --git a/PHI-CL/data-final-fixes.lua b/PHI-CL/data-final-fixes.lua index 689b20b..4d4fc95 100644 --- a/PHI-CL/data-final-fixes.lua +++ b/PHI-CL/data-final-fixes.lua @@ -1,4 +1,4 @@ ---[[ + do local sa = settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value == 'SAP' local p = (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value == 'VP') or sa @@ -46,4 +46,3 @@ if mods['space-age'] then end end end -]] \ No newline at end of file diff --git a/PHI-CL/data-updates.lua b/PHI-CL/data-updates.lua index 12f57b5..3eeb77c 100644 --- a/PHI-CL/data-updates.lua +++ b/PHI-CL/data-updates.lua @@ -13,8 +13,6 @@ if settings.startup['PHI-MB'].value then end end ---[[ if (settings.startup['PHI-MI'].value and settings.startup['PHI-MI-GENERIC'].value) or (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '') then require 'data.u.mi' end -]] \ No newline at end of file diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 8b9b737..b9bd742 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -25,7 +25,6 @@ if (settings.startup['PHI-MI'].value and settings.startup['PHI-MI-GENERIC'].valu require('data.b.mig') end ---[[ if mods['space-age'] then require('data.b.sa') @@ -41,4 +40,3 @@ if settings.startup['PHI-GM'].value then require('data.b.gm-vp') end end -]] \ No newline at end of file diff --git a/PHI-CL/data/b/mig.lua b/PHI-CL/data/b/mig.lua index 45c5ffb..4f8721e 100644 --- a/PHI-CL/data/b/mig.lua +++ b/PHI-CL/data/b/mig.lua @@ -1,4 +1,3 @@ -local mod_graphic_location = '__PHI-CL__/graphics/' local mod_tint = { [2] = {r=140, g=142, b=200}, [3] = {r=242, g=161, b=26}, @@ -163,11 +162,11 @@ for _, v in pairs(data.raw.fluid) do category = 'super-pump-fluid', energy_required = 1, enabled = false, - hidden = true, ingredients = {}, results = {{type = 'fluid', name = v.name, amount = 12000, temperature = v.default_temperature or 15}}, main_product = v.name, hide_from_player_crafting = true, + hidden = true, hidden_in_factoriopedia = true, allow_productivity = false, crafting_machine_tint = {primary = v.flow_color or {r = 255,g = 255,b = 255}}, @@ -203,7 +202,7 @@ for i = 1, #vir_sig do table.insert(s, { type = 'virtual-signal', name = 'signal-' .. char .. 'A', - icon = mod_graphic_location .. 'signal/signal_' .. char .. '.png', + icon = '__PHI-CL__/graphics/signal/signal_' .. char .. '.png', subgroup = (i < 11 and 'virtual-signal-number') or 'virtual-signal-letter', order = ((i < 11 and 'b[numbers]2-[') or 'c[letters]2-[') .. char .. ']', localised_name = {'phi-cl.combine', {'virtual-signal-name.signal-' .. char}, '(II)'} @@ -437,68 +436,6 @@ for _, v in pairs({{'logistics', 'loader'}, {'logistics-2', 'fast-loader'}, {'lo end end --- MIG A 3 BASE ENTITY,ITEM,RECIPE --- MIG A 1 SPACE_AGE ENTITY,ITEM,RECIPE -for _, vn in pairs(data.raw['underground-belt']) do - local v = vn.name - local va = v .. '-a' - - if data.raw.item[v] then - local item = table.deepcopy(data.raw.item[v]) - item.name = va - item.place_result = va - item.localised_name = {'phi-cl.combine', {'entity-name.' .. v}, '(II)'} - item.localised_description = {'entity-description.' .. v} - data:extend({item}) - end - - local entity = table.deepcopy(vn) - entity.name = va - entity.minable.result = va - entity.next_upgrade = (entity.next_upgrade and entity.next_upgrade .. '-a') or nil - entity.surface_conditions = nil - entity.localised_name = {'phi-cl.combine', {'entity-name.' .. v}, '(II)'} - entity.localised_description = {'entity-description.' .. v} - - for _, st in pairs({'direction_in', 'direction_out', 'direction_in_side_loading', 'direction_out_side_loading'}) do - entity.structure[st].sheet.filename = mod_graphic_location .. v .. '.png' - entity.structure[st].sheet.width = 106 - entity.structure[st].sheet.height = 85 - entity.structure[st].sheet.shift = {0.15625, 0.0703125} - end - - entity.structure.direction_in.sheet.y = 85 - entity.structure.direction_out.sheet.y = nil - entity.structure.direction_in_side_loading.sheet.y = 85 - entity.structure.direction_out_side_loading.sheet.y = nil - data:extend({entity}) - - data:extend({{ - type = 'recipe', - name = va, - energy_required = 2, - enabled = false, - ingredients = {{type = 'item', name = v, amount = 2}}, - results = {{type = 'item', name = va, amount = 2}}, - main_product = va, - hide_from_player_crafting = true, - allow_productivity = false, - localised_name = {'phi-cl.combine', {'entity-name.' .. v}, '(II)'} - }}) -end - --- MIG A 3 BASE RESEARCH_EFFECT --- MIG A 1 SPACE_AGE RESEARCH_EFFECT -for _, v in pairs({{'logistics', 'underground-belt'}, {'logistics-2', 'fast-underground-belt'}, {'logistics-3', 'express-underground-belt'}, {'turbo-transport-belt', 'turbo-underground-belt'}}) do - if data.raw['underground-belt'] and data.raw['underground-belt'][v[2]] then - if data.raw.technology[v[1]] then - table.insert(data.raw.technology[v[1]].effects, {type = 'unlock-recipe', recipe = v[2] .. '-a'}) - else - data.raw.recipe[v[2] .. '-a'].enabled = true - end - end -end - -- MIG C 1 BASE ENTITY if data.raw['proxy-container'] and data.raw['proxy-container']['proxy-container'] then data.raw['proxy-container']['proxy-container'].flags = {'not-blueprintable', 'hide-alt-info', 'not-deconstructable', 'not-flammable', 'not-on-map', 'placeable-off-grid', 'placeable-player', 'no-automated-item-insertion', 'no-automated-item-removal'} diff --git a/PHI-CL/graphics/express-underground-belt.png b/PHI-CL/graphics/express-underground-belt.png deleted file mode 100644 index e6ff200..0000000 Binary files a/PHI-CL/graphics/express-underground-belt.png and /dev/null differ diff --git a/PHI-CL/graphics/fast-underground-belt.png b/PHI-CL/graphics/fast-underground-belt.png deleted file mode 100644 index 2c62a03..0000000 Binary files a/PHI-CL/graphics/fast-underground-belt.png and /dev/null differ diff --git a/PHI-CL/graphics/turbo-underground-belt.png b/PHI-CL/graphics/turbo-underground-belt.png deleted file mode 100644 index 5a014cb..0000000 Binary files a/PHI-CL/graphics/turbo-underground-belt.png and /dev/null differ diff --git a/PHI-CL/graphics/underground-belt.png b/PHI-CL/graphics/underground-belt.png deleted file mode 100644 index d8526c7..0000000 Binary files a/PHI-CL/graphics/underground-belt.png and /dev/null differ diff --git a/PHI-CL/migrations.lua b/PHI-CL/migrations.lua index 4d023a8..f704c53 100644 --- a/PHI-CL/migrations.lua +++ b/PHI-CL/migrations.lua @@ -105,12 +105,10 @@ for _, force in pairs(game.forces) do recipes['electric-heating-tower'].reload() end - for _, v in pairs({{'logistics', 'underground-belt'}, {'logistics-2', 'fast-underground-belt'}, {'logistics-3', 'express-underground-belt'}, {'turbo-transport-belt', 'turbo-underground-belt'}, {'logistics', 'loader'}, {'logistics-2', 'fast-loader'}, {'logistics-3', 'express-loader'}, {'turbo-transport-belt', 'turbo-loader'}}) do - local vn = v[2] .. '-a' - - if technologies[v[1]] and technologies[v[1]].researched and recipes[vn] then - recipes[vn].enabled = true - recipes[vn].reload() + for _, v in pairs({{'logistics', 'loader'}, {'logistics-2', 'fast-loader'}, {'logistics-3', 'express-loader'}, {'turbo-transport-belt', 'turbo-loader'}}) do + if technologies[v[1]] and technologies[v[1]].researched and recipes[v[2]] then + recipes[v[2]].enabled = true + recipes[v[2]].reload() end end end