diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 4853cdd..9b416e6 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -1,8 +1,6 @@ -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 が有効になっていません') - end +if (settings.startup['PHI-SA'].value or settings.startup['PHI-GM'].value ~= '') and (not mods['space-age']) then + error('Mod not found\nSpace Age is not enabled\n太空時代尚未啟用\nSpace Age が有効になっていません') end require('data.b.ct') diff --git a/PHI-CL/data/b/mbe.lua b/PHI-CL/data/b/mbe.lua index a70efdb..77a4bdf 100644 --- a/PHI-CL/data/b/mbe.lua +++ b/PHI-CL/data/b/mbe.lua @@ -13,7 +13,7 @@ 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 +if settings.startup['PHI-MB-ENERGY'].value <= 1 then return end diff --git a/PHI-CL/data/b/mbm.lua b/PHI-CL/data/b/mbm.lua index eda0a55..805ba9a 100644 --- a/PHI-CL/data/b/mbm.lua +++ b/PHI-CL/data/b/mbm.lua @@ -13,7 +13,7 @@ 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 +if settings.startup['PHI-MB-MACHINE'].value <= 1 then return end diff --git a/PHI-CL/data/b/mbq.lua b/PHI-CL/data/b/mbq.lua index b95139f..1c2041e 100644 --- a/PHI-CL/data/b/mbq.lua +++ b/PHI-CL/data/b/mbq.lua @@ -13,7 +13,7 @@ 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 +if settings.startup['PHI-MB-EQUIPMENT'].value <= 1 then return end diff --git a/PHI-CL/data/b/mig.lua b/PHI-CL/data/b/mig.lua index 90c09ae..60c67c3 100644 --- a/PHI-CL/data/b/mig.lua +++ b/PHI-CL/data/b/mig.lua @@ -9,7 +9,7 @@ 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 +if not (settings.startup['PHI-MI'].value and settings.startup['PHI-MI-GENERIC'].value) and not (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '') then return end diff --git a/PHI-CL/data/b/sa.lua b/PHI-CL/data/b/sa.lua index 652fb7c..9cacbe1 100644 --- a/PHI-CL/data/b/sa.lua +++ b/PHI-CL/data/b/sa.lua @@ -1,5 +1,5 @@ -if not settings.startup['PHI-SA'].value or settings.startup['PHI-GM'].value == '' then +if not settings.startup['PHI-SA'].value and settings.startup['PHI-GM'].value == '' then return end @@ -114,10 +114,6 @@ if (settings.startup['PHI-SA'].value and (not settings.startup['PHI-SA-SPOIL'].v end end -if not settings.startup['PHI-SA'].value then - return -end - -- SA C 1 SPACE_AGE CONSTANT data.raw['utility-constants'].default.rocket_lift_weight = settings.startup['PHI-SA-ROCKET-CAPACITY'].value * 1000000