This commit is contained in:
2025-05-21 22:42:36 +09:00
parent 5419a11bb0
commit 0905bf9c44
2 changed files with 13 additions and 21 deletions

View File

@@ -41,7 +41,7 @@ local items = {
ref_name = 'solar-panel', ref_name = 'solar-panel',
tech = 'compound-energy', tech = 'compound-energy',
min = 2, min = 2,
max = settings.startup['PHI-MB-ENERGY-SOLAR-TIER'].value max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value
}, },
['accumulator'] = { ['accumulator'] = {
enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value,
@@ -52,7 +52,7 @@ local items = {
ref_name = 'accumulator', ref_name = 'accumulator',
tech = 'compound-energy', tech = 'compound-energy',
min = 2, min = 2,
max = settings.startup['PHI-MB-ENERGY-SOLAR-TIER'].value max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value
}, },
['boiler'] = { ['boiler'] = {
enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value,
@@ -63,7 +63,7 @@ local items = {
ref_name = 'boiler', ref_name = 'boiler',
tech = 'compound-energy', tech = 'compound-energy',
min = 2, min = 2,
max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value max = math.min(settings.startup['PHI-MB-ENERGY-POWER-TIER'].value, 5)
}, },
['steam-engine'] = { ['steam-engine'] = {
enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value,
@@ -74,7 +74,7 @@ local items = {
ref_name = 'steam-engine', ref_name = 'steam-engine',
tech = 'compound-energy', tech = 'compound-energy',
min = 2, min = 2,
max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value max = math.min(settings.startup['PHI-MB-ENERGY-POWER-TIER'].value, 5)
}, },
['nuclear-reactor'] = { ['nuclear-reactor'] = {
enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value,
@@ -85,7 +85,7 @@ local items = {
ref_name = 'nuclear-reactor', ref_name = 'nuclear-reactor',
tech = 'compound-energy', tech = 'compound-energy',
min = 2, min = 2,
max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value max = math.min(settings.startup['PHI-MB-ENERGY-POWER-TIER'].value, 5)
}, },
['heat-pipe'] = { ['heat-pipe'] = {
enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value,
@@ -96,7 +96,7 @@ local items = {
ref_name = 'heat-pipe', ref_name = 'heat-pipe',
tech = 'compound-energy', tech = 'compound-energy',
min = 2, min = 2,
max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value max = math.min(settings.startup['PHI-MB-ENERGY-POWER-TIER'].value, 5)
}, },
['heat-exchanger'] = { ['heat-exchanger'] = {
enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value,
@@ -107,7 +107,7 @@ local items = {
ref_name = 'heat-exchanger', ref_name = 'heat-exchanger',
tech = 'compound-energy', tech = 'compound-energy',
min = 2, min = 2,
max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value max = math.min(settings.startup['PHI-MB-ENERGY-POWER-TIER'].value, 5)
}, },
['steam-turbine'] = { ['steam-turbine'] = {
enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value,
@@ -118,7 +118,7 @@ local items = {
ref_name = 'steam-turbine', ref_name = 'steam-turbine',
tech = 'compound-energy', tech = 'compound-energy',
min = 2, min = 2,
max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value max = math.min(settings.startup['PHI-MB-ENERGY-POWER-TIER'].value, 5)
}, },
['assembling-machine'] = { ['assembling-machine'] = {
enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value,
@@ -666,7 +666,7 @@ if mods and mods['space-age'] then
ref_name = 'fusion-reactor', ref_name = 'fusion-reactor',
tech = 'compound-energy', tech = 'compound-energy',
min = 2, min = 2,
max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value max = math.min(settings.startup['PHI-MB-ENERGY-POWER-TIER'].value, 5)
} }
items['item']['fusion-generator'] = { items['item']['fusion-generator'] = {
@@ -678,7 +678,7 @@ if mods and mods['space-age'] then
ref_name = 'fusion-generator', ref_name = 'fusion-generator',
tech = 'compound-energy', tech = 'compound-energy',
min = 2, min = 2,
max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value max = math.min(settings.startup['PHI-MB-ENERGY-POWER-TIER'].value, 5)
} }
items['item']['heating-tower'] = { items['item']['heating-tower'] = {
@@ -690,7 +690,7 @@ if mods and mods['space-age'] then
ref_name = 'heating-tower', ref_name = 'heating-tower',
tech = 'heating-tower', tech = 'heating-tower',
min = 2, min = 2,
max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value max = math.min(settings.startup['PHI-MB-ENERGY-POWER-TIER'].value, 5)
} }
items['item']['railgun-turret'] = { items['item']['railgun-turret'] = {

View File

@@ -15,11 +15,11 @@ data:extend({
order = 'AA00' order = 'AA00'
}, { }, {
type = 'int-setting', type = 'int-setting',
name = 'PHI-MB-ENERGY-SOLAR-TIER', name = 'PHI-MB-ENERGY-POWER-TIER',
setting_type = 'startup', setting_type = 'startup',
default_value = 8, default_value = 8,
allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8},
localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-ENERGY-SOLAR-TIER'}, {'mod-setting-name.PHI-MB-ENERGY-SOLAR-TIER'}}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-ENERGY-POWER-TIER'}, {'mod-setting-name.PHI-MB-ENERGY-POWER-TIER'}},
order = 'AA01' order = 'AA01'
}, { }, {
type = 'int-setting', type = 'int-setting',
@@ -29,14 +29,6 @@ data:extend({
allowed_values = {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}, allowed_values = {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16},
localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-ENERGY-SOLAR-RATIO'}, {'mod-setting-name.PHI-MB-ENERGY-SOLAR-RATIO'}}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-ENERGY-SOLAR-RATIO'}, {'mod-setting-name.PHI-MB-ENERGY-SOLAR-RATIO'}},
order = 'AA02' order = 'AA02'
}, {
type = 'int-setting',
name = 'PHI-MB-ENERGY-POWER-TIER',
setting_type = 'startup',
default_value = 5,
allowed_values = {1, 2, 3, 4, 5},
localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-ENERGY-POWER-TIER'}, {'mod-setting-name.PHI-MB-ENERGY-POWER-TIER'}},
order = 'AA03'
}, { }, {
type = 'bool-setting', type = 'bool-setting',
name = 'PHI-MB-MACHINE', name = 'PHI-MB-MACHINE',