diff --git a/PHI-CL/data-final-fixes.lua b/PHI-CL/data-final-fixes.lua index e0e6b4c..929b2c2 100644 --- a/PHI-CL/data-final-fixes.lua +++ b/PHI-CL/data-final-fixes.lua @@ -1,7 +1,3 @@ -if settings.startup['PHI-CT'].value then - require('data.f.ct') -end -if settings.startup['PHI-MI'].value then - require('data.f.mi') -end +require('data.f.ct') +require('data.f.mi') diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index f620dc7..348bdf1 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -1,43 +1,18 @@ -if settings.startup['PHI-CT'].value then - require('data.b.ct') -end - -if settings.startup['PHI-MI'].value then - require('data.b.mi') -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.b.mig') -end - -if settings.startup['PHI-SA'].value or (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '') then - require('data.b.sa') -end - -if settings.startup['PHI-GM'].value then - if settings.startup['PHI-GM'].value ~= '' then - require('data.b.gm') - end - - if settings.startup['PHI-GM'].value == 'SAP' then - require('data.b.gm-sap') - - elseif settings.startup['PHI-GM'].value == 'VP' then - require('data.b.gm-vp') +if settings.startup['PHI-SA'].value or settings.startup['PHI-GM'].value ~= '' then + if not mods['space-age'] then + error('Mod not found\nSpace Age is not enabled\n太空時代尚未啟用\nSpace Age が有効になっていません') + return end end -if settings.startup['PHI-MB'].value then - if settings.startup['PHI-MB-ENERGY'].value and settings.startup['PHI-MB-ENERGY'].value > 1 then - require('data.b.mbe') - end - - if settings.startup['PHI-MB-MACHINE'].value and settings.startup['PHI-MB-MACHINE'].value > 1 then - require('data.b.mbm') - end - - if settings.startup['PHI-MB-EQUIPMENT'].value and settings.startup['PHI-MB-EQUIPMENT'].value > 1 then - require('data.b.mbq') - end -end +require('data.b.ct') +require('data.b.mi') +require('data.b.mig') +require('data.b.sa') +require('data.b.gm') +require('data.b.gm-sap') +require('data.b.gm-vp') +require('data.b.mbe') +require('data.b.mbm') +require('data.b.mbq') diff --git a/PHI-CL/data/b/ct.lua b/PHI-CL/data/b/ct.lua index b747cc5..efa25f6 100644 --- a/PHI-CL/data/b/ct.lua +++ b/PHI-CL/data/b/ct.lua @@ -8,6 +8,10 @@ local mod_tint = { [8] = {r=233, g=63, b=233} } +if not settings.startup['PHI-CT'].value then + return +end + -- CT U 3 BASE ITEM -- CT A 3 BASE RECIPE for _, v in pairs({'infinity-chest', 'infinity-cargo-wagon', 'infinity-pipe'}) do diff --git a/PHI-CL/data/b/gm-sap.lua b/PHI-CL/data/b/gm-sap.lua index 719cce1..5b83ef7 100644 --- a/PHI-CL/data/b/gm-sap.lua +++ b/PHI-CL/data/b/gm-sap.lua @@ -1,6 +1,7 @@ -local mc = require('mc') -mc.space_age() +if settings.startup['PHI-GM'].value ~= 'SAP' then + return +end -- GM-SAP C 16 SPACE_AGE ENTITY if data.raw['asteroid'] then diff --git a/PHI-CL/data/b/gm-vp.lua b/PHI-CL/data/b/gm-vp.lua index 4f3d62b..957dc35 100644 --- a/PHI-CL/data/b/gm-vp.lua +++ b/PHI-CL/data/b/gm-vp.lua @@ -1,10 +1,11 @@ local items = require('gm-vp-c') local mbm = require('mbm-c') -local mc = require('mc') local item_sounds = require('__base__/prototypes/item_sounds') local resource_autoplace = require('resource-autoplace') -mc.space_age() +if settings.startup['PHI-GM'].value ~= 'VP' then + return +end for c, _ in pairs(defines.prototypes.entity) do if data.raw[c] then diff --git a/PHI-CL/data/b/gm.lua b/PHI-CL/data/b/gm.lua index 070ba5d..eb53250 100644 --- a/PHI-CL/data/b/gm.lua +++ b/PHI-CL/data/b/gm.lua @@ -1,5 +1,9 @@ local items = require('gm-c') +if settings.startup['PHI-GM'].value == '' then + return +end + -- 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 or 0) diff --git a/PHI-CL/data/b/mbe.lua b/PHI-CL/data/b/mbe.lua index ca51331..a70efdb 100644 --- a/PHI-CL/data/b/mbe.lua +++ b/PHI-CL/data/b/mbe.lua @@ -1,5 +1,4 @@ local items = require('mbe-c') - local mod_tint = { [2] = {r=140, g=142, b=200}, [3] = {r=242, g=161, b=26}, @@ -10,6 +9,14 @@ local mod_tint = { [8] = {r=233, g=63, b=233} } +if not settings.startup['PHI-MB'].value then + return +end + +if not settings.startup['PHI-MB-ENERGY'].value or settings.startup['PHI-MB-ENERGY'].value <= 1 then + return +end + -- MBE C 1 BASE FLUID if data.raw['fluid'] and data.raw['fluid']['steam'] then data.raw['fluid']['steam'].max_temperature = math.max(((settings.startup['PHI-MB-ENERGY'].value > 1) and 2000) or 500, data.raw['fluid']['steam'].max_temperature) diff --git a/PHI-CL/data/b/mbm.lua b/PHI-CL/data/b/mbm.lua index f723533..eda0a55 100644 --- a/PHI-CL/data/b/mbm.lua +++ b/PHI-CL/data/b/mbm.lua @@ -1,5 +1,4 @@ local items = require('mbm-c') - local mod_tint = { [2] = {r=140, g=142, b=200}, [3] = {r=242, g=161, b=26}, @@ -10,6 +9,14 @@ local mod_tint = { [8] = {r=233, g=63, b=233} } +if not settings.startup['PHI-MB'].value then + return +end + +if not settings.startup['PHI-MB-MACHINE'].value or settings.startup['PHI-MB-MACHINE'].value <= 1 then + return +end + function main_entity(source, tier) local item = table.deepcopy(data.raw[source.type][source.ref_name]) item.name = source.name .. '-' .. tier diff --git a/PHI-CL/data/b/mbq.lua b/PHI-CL/data/b/mbq.lua index 916d9e4..b95139f 100644 --- a/PHI-CL/data/b/mbq.lua +++ b/PHI-CL/data/b/mbq.lua @@ -1,5 +1,4 @@ local items = require('mbq-c') - local mod_tint = { [2] = {r=140, g=142, b=200}, [3] = {r=242, g=161, b=26}, @@ -10,6 +9,14 @@ local mod_tint = { [8] = {r=233, g=63, b=233} } +if not settings.startup['PHI-MB'].value then + return +end + +if not settings.startup['PHI-MB-EQUIPMENT'].value or settings.startup['PHI-MB-EQUIPMENT'].value <= 1 then + return +end + if settings.startup['PHI-MB-EQUIPMENT-ARMOR'].value then -- MBQ A 1 ARMOR_GRID local grid = table.deepcopy(data.raw['equipment-grid']['large-equipment-grid']) diff --git a/PHI-CL/data/b/mc.lua b/PHI-CL/data/b/mc.lua deleted file mode 100644 index a8f4477..0000000 --- a/PHI-CL/data/b/mc.lua +++ /dev/null @@ -1,10 +0,0 @@ -local main = {} - -function main.space_age() - if not mods['space-age'] then - error('Mod not found\nSpace Age is not enabled\n太空時代尚未啟用\nSpace Age が有効になっていません') - return - end -end - -return main diff --git a/PHI-CL/data/b/mi.lua b/PHI-CL/data/b/mi.lua index 55ca1fe..bafa762 100644 --- a/PHI-CL/data/b/mi.lua +++ b/PHI-CL/data/b/mi.lua @@ -1,4 +1,8 @@ +if not settings.startup['PHI-MI'].value then + return +end + -- MI C 2 BASE ENTITY for _, t in pairs({'construction-robot', 'logistic-robot'}) do if data.raw[t] then diff --git a/PHI-CL/data/b/mig.lua b/PHI-CL/data/b/mig.lua index f2307ba..a885bec 100644 --- a/PHI-CL/data/b/mig.lua +++ b/PHI-CL/data/b/mig.lua @@ -10,6 +10,10 @@ local mod_tint = { [8] = {r=233, g=63, b=233} } +if not (settings.startup['PHI-MI'].value and settings.startup['PHI-MI-GENERIC'].value) or not (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '') then + return +end + -- MIG C 1 BASE ARMOR_EQUIPMENT if data.raw['active-defense-equipment'] and data.raw['active-defense-equipment']['discharge-defense-equipment'] then data.raw['active-defense-equipment']['discharge-defense-equipment'].automatic = true diff --git a/PHI-CL/data/b/sa.lua b/PHI-CL/data/b/sa.lua index 4c60c75..652fb7c 100644 --- a/PHI-CL/data/b/sa.lua +++ b/PHI-CL/data/b/sa.lua @@ -1,6 +1,7 @@ -local mc = require('mc') -mc.space_age() +if not settings.startup['PHI-SA'].value or settings.startup['PHI-GM'].value == '' then + return +end local function spoil_handle(i) i.spoil_ticks = nil diff --git a/PHI-CL/data/f/ct.lua b/PHI-CL/data/f/ct.lua index 2a3e7ac..f2acf78 100644 --- a/PHI-CL/data/f/ct.lua +++ b/PHI-CL/data/f/ct.lua @@ -1,5 +1,9 @@ local items = require('ct-c') +if not settings.startup['PHI-CT'].value then + return +end + if items['hide'] and (data.raw['infinity-container']['super-infinity-chest'] or data.raw['infinity-cargo-wagon']['super-infinity-cargo-wagon']) then local sc = 1 diff --git a/PHI-CL/data/f/mi.lua b/PHI-CL/data/f/mi.lua index 244a188..f31c580 100644 --- a/PHI-CL/data/f/mi.lua +++ b/PHI-CL/data/f/mi.lua @@ -1,5 +1,9 @@ local items = require('mi-c') +if not settings.startup['PHI-MI'].value then + return +end + function status_number_position(entity) local box = entity.selection_box or entity.collision_box