From 0b4d5420e69e1a5de5dba52f97ea9bf9af1d6cbc Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Fri, 24 Jan 2025 15:49:54 +0900 Subject: [PATCH] . --- PHI-CL/changelog.txt | 1 + PHI-CL/config.lua | 119 +++++++++++------------- PHI-CL/data.lua | 10 +- PHI-CL/locale/en/locale.cfg | 137 +++++++++++++--------------- PHI-CL/locale/ja/locale.cfg | 42 ++------- PHI-CL/locale/zh-CN/locale.cfg | 42 ++------- PHI-CL/locale/zh-TW/locale.cfg | 42 ++------- PHI-CL/main.lua | 6 +- PHI-CL/note.lua | 13 +++ PHI-CL/settings.lua | 161 +++++++++++++++++---------------- 10 files changed, 251 insertions(+), 322 deletions(-) diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt index 76b4765..adc9382 100644 --- a/PHI-CL/changelog.txt +++ b/PHI-CL/changelog.txt @@ -4,6 +4,7 @@ Date: 2025-01-25 Changes: - [CL] Some changes on setting locale. + - [CL] Some changes on the setting group. --------------------------------------------------------------------------------------------------- Version: 3.0.57 diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua index 33c163c..1c441fc 100644 --- a/PHI-CL/config.lua +++ b/PHI-CL/config.lua @@ -3,17 +3,6 @@ local items = { ['graphics_location'] = '__PHI-CL__/graphics/' }, ['research_modifier'] = { - --[[ - ['electric-turret'] = { - 'energy-weapons-damage-1', - 'energy-weapons-damage-2', - 'energy-weapons-damage-3', - 'energy-weapons-damage-4', - 'energy-weapons-damage-5', - 'energy-weapons-damage-6', - 'energy-weapons-damage-7' - }, - ]] ['ammo-turret'] = { 'physical-projectile-damage-1', 'physical-projectile-damage-2', @@ -44,7 +33,7 @@ local items = { }, ['item'] = { ['solar-panel'] = { - enabled = settings.startup['PHI-EN'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, stage = 1, mod = 'base', type = 'solar-panel', @@ -52,10 +41,10 @@ local items = { ref_name = 'solar-panel', tech = 'compound-energy', min = 2, - max = settings.startup['PHI-EN-SOLAR-TIER'].value + max = settings.startup['PHI-MB-ENERGY-SOLAR-TIER'].value }, ['accumulator'] = { - enabled = settings.startup['PHI-EN'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, stage = 1, mod = 'base', type = 'accumulator', @@ -63,10 +52,10 @@ local items = { ref_name = 'accumulator', tech = 'compound-energy', min = 2, - max = settings.startup['PHI-EN-SOLAR-TIER'].value + max = settings.startup['PHI-MB-ENERGY-SOLAR-TIER'].value }, ['boiler'] = { - enabled = settings.startup['PHI-EN'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, stage = 1, mod = 'base', type = 'boiler', @@ -74,10 +63,10 @@ local items = { ref_name = 'boiler', tech = 'compound-energy', min = 2, - max = settings.startup['PHI-EN-POWER-TIER'].value + max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value }, ['steam-engine'] = { - enabled = settings.startup['PHI-EN'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, stage = 1, mod = 'base', type = 'generator', @@ -85,10 +74,10 @@ local items = { ref_name = 'steam-engine', tech = 'compound-energy', min = 2, - max = settings.startup['PHI-EN-POWER-TIER'].value + max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value }, ['nuclear-reactor'] = { - enabled = settings.startup['PHI-EN'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, stage = 1, mod = 'base', type = 'reactor', @@ -96,10 +85,10 @@ local items = { ref_name = 'nuclear-reactor', tech = 'compound-energy', min = 2, - max = settings.startup['PHI-EN-POWER-TIER'].value + max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value }, ['heat-pipe'] = { - enabled = settings.startup['PHI-EN'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, stage = 1, mod = 'base', type = 'heat-pipe', @@ -107,10 +96,10 @@ local items = { ref_name = 'heat-pipe', tech = 'compound-energy', min = 2, - max = settings.startup['PHI-EN-POWER-TIER'].value + max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value }, ['heat-exchanger'] = { - enabled = settings.startup['PHI-EN'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, stage = 1, mod = 'base', type = 'boiler', @@ -118,10 +107,10 @@ local items = { ref_name = 'heat-exchanger', tech = 'compound-energy', min = 2, - max = settings.startup['PHI-EN-POWER-TIER'].value + max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value }, ['steam-turbine'] = { - enabled = settings.startup['PHI-EN'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, stage = 1, mod = 'base', type = 'generator', @@ -129,10 +118,10 @@ local items = { ref_name = 'steam-turbine', tech = 'compound-energy', min = 2, - max = settings.startup['PHI-EN-POWER-TIER'].value + max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value }, ['assembling-machine'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'base', type = 'assembling-machine', @@ -143,7 +132,7 @@ local items = { max = settings.startup['PHI-MB-MACHINE-TIER'].value + 2 }, ['electric-furnace'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'base', type = 'furnace', @@ -154,7 +143,7 @@ local items = { max = settings.startup['PHI-MB-MACHINE-TIER'].value }, ['oil-refinery'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'base', type = 'assembling-machine', @@ -165,7 +154,7 @@ local items = { max = settings.startup['PHI-MB-MACHINE-TIER'].value }, ['chemical-plant'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'base', type = 'assembling-machine', @@ -176,7 +165,7 @@ local items = { max = settings.startup['PHI-MB-MACHINE-TIER'].value }, ['centrifuge'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'base', type = 'assembling-machine', @@ -187,7 +176,7 @@ local items = { max = settings.startup['PHI-MB-MACHINE-TIER'].value }, ['lab'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'base', type = 'lab', @@ -198,7 +187,7 @@ local items = { max = settings.startup['PHI-MB-MACHINE-TIER'].value }, ['electric-mining-drill'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'base', type = 'mining-drill', @@ -209,7 +198,7 @@ local items = { max = settings.startup['PHI-MB-MACHINE-TIER'].value }, ['pumpjack'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'base', type = 'mining-drill', @@ -220,7 +209,7 @@ local items = { max = settings.startup['PHI-MB-MACHINE-TIER'].value }, ['laser-turret'] = { - enabled = settings.startup['PHI-WE'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-WEAPON'].value, stage = 1, mod = 'base', type = 'electric-turret', @@ -228,10 +217,10 @@ local items = { ref_name = 'laser-turret', tech = 'laser-turret', min = 2, - max = settings.startup['PHI-WE-TURRET-TIER'].value + max = settings.startup['PHI-MB-WEAPON-TURRET-TIER'].value }, ['flamethrower-turret'] = { - enabled = settings.startup['PHI-WE'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-WEAPON'].value, stage = 1, mod = 'base', type = 'fluid-turret', @@ -239,10 +228,10 @@ local items = { ref_name = 'flamethrower-turret', tech = 'flamethrower', min = 2, - max = settings.startup['PHI-WE-TURRET-TIER'].value + max = settings.startup['PHI-MB-WEAPON-TURRET-TIER'].value }, ['gun-turret'] = { - enabled = settings.startup['PHI-WE'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-WEAPON'].value, stage = 1, mod = 'base', type = 'ammo-turret', @@ -250,10 +239,10 @@ local items = { ref_name = 'gun-turret', tech = 'gun-turret', min = 2, - max = settings.startup['PHI-WE-TURRET-TIER'].value + max = settings.startup['PHI-MB-WEAPON-TURRET-TIER'].value }, ['radar'] = { - enabled = settings.startup['PHI-WE'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-WEAPON'].value, stage = 1, mod = 'base', type = 'radar', @@ -261,7 +250,7 @@ local items = { ref_name = 'radar', tech = 'automation', min = 2, - max = settings.startup['PHI-WE-RADAR-TIER'].value + max = settings.startup['PHI-MB-WEAPON-RADAR-TIER'].value } }, ['equipment'] = { @@ -547,7 +536,7 @@ local items = { if mods and mods['space-age'] then items['item']['fusion-reactor'] = { - enabled = settings.startup['PHI-EN'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, stage = 1, mod = 'space-age', type = 'fusion-reactor', @@ -555,11 +544,11 @@ if mods and mods['space-age'] then ref_name = 'fusion-reactor', tech = 'compound-energy', min = 2, - max = settings.startup['PHI-EN-POWER-TIER'].value + max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value } items['item']['fusion-generator'] = { - enabled = settings.startup['PHI-EN'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, stage = 1, mod = 'space-age', type = 'fusion-generator', @@ -567,11 +556,11 @@ if mods and mods['space-age'] then ref_name = 'fusion-generator', tech = 'compound-energy', min = 2, - max = settings.startup['PHI-EN-POWER-TIER'].value + max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value } items['item']['heating-tower'] = { - enabled = settings.startup['PHI-EN'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value, stage = 1, mod = 'space-age', type = 'reactor', @@ -579,11 +568,11 @@ if mods and mods['space-age'] then ref_name = 'heating-tower', tech = 'heating-tower', min = 2, - max = settings.startup['PHI-EN-POWER-TIER'].value + max = settings.startup['PHI-MB-ENERGY-POWER-TIER'].value } items['item']['railgun-turret'] = { - enabled = settings.startup['PHI-WE'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-WEAPON'].value, stage = 1, mod = 'space-age', type = 'ammo-turret', @@ -591,11 +580,11 @@ if mods and mods['space-age'] then ref_name = 'railgun-turret', tech = 'railgun', min = 2, - max = settings.startup['PHI-WE-TURRET-TIER'].value + max = settings.startup['PHI-MB-WEAPON-TURRET-TIER'].value } items['item']['rocket-turret'] = { - enabled = settings.startup['PHI-WE'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-WEAPON'].value, stage = 1, mod = 'space-age', type = 'ammo-turret', @@ -603,11 +592,11 @@ if mods and mods['space-age'] then ref_name = 'rocket-turret', tech = 'rocket-turret', min = 2, - max = settings.startup['PHI-WE-TURRET-TIER'].value + max = settings.startup['PHI-MB-WEAPON-TURRET-TIER'].value } items['item']['tesla-turret'] = { - enabled = settings.startup['PHI-WE'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-WEAPON'].value, stage = 1, mod = 'space-age', type = 'electric-turret', @@ -615,11 +604,11 @@ if mods and mods['space-age'] then ref_name = 'tesla-turret', tech = 'tesla-weapons', min = 2, - max = settings.startup['PHI-WE-TURRET-TIER'].value + max = settings.startup['PHI-MB-WEAPON-TURRET-TIER'].value } items['item']['foundry'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'space-age', type = 'assembling-machine', @@ -631,7 +620,7 @@ if mods and mods['space-age'] then } items['item']['big-mining-drill'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'space-age', type = 'mining-drill', @@ -643,7 +632,7 @@ if mods and mods['space-age'] then } items['item']['biochamber'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'space-age', type = 'assembling-machine', @@ -655,7 +644,7 @@ if mods and mods['space-age'] then } items['item']['crusher'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'space-age', type = 'assembling-machine', @@ -667,7 +656,7 @@ if mods and mods['space-age'] then } items['item']['biolab'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'space-age', type = 'lab', @@ -679,7 +668,7 @@ if mods and mods['space-age'] then } items['item']['cryogenic-plant'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'space-age', type = 'assembling-machine', @@ -691,7 +680,7 @@ if mods and mods['space-age'] then } items['item']['electromagnetic-plant'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'space-age', type = 'assembling-machine', @@ -703,7 +692,7 @@ if mods and mods['space-age'] then } items['item']['thruster'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'space-age', type = 'thruster', @@ -715,7 +704,7 @@ if mods and mods['space-age'] then } items['item']['agricultural-tower'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'space-age', type = 'agricultural-tower', @@ -757,7 +746,7 @@ end if mods and mods['quality'] then items['item']['recycler'] = { - enabled = settings.startup['PHI-MB'].value, + enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value, stage = 1, mod = 'quality', type = 'furnace', diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 098d3c7..61964cd 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -2,12 +2,12 @@ local items = require 'config' local main = require 'main' local file_stage = 1 -if settings.startup['PHI-EN'].value then - if settings.startup['PHI-EN-POWER-TIER'].value > 1 then +if settings.startup['PHI-MB'].value and settings.startup['PHI-MB-ENERGY'].value then + if settings.startup['PHI-MB-ENERGY-POWER-TIER'].value > 1 then data.raw['fluid']['steam'].max_temperature = 5000 end - local ml = math.max(settings.startup['PHI-EN-SOLAR-TIER'].value, settings.startup['PHI-EN-POWER-TIER'].value) + local ml = math.max(settings.startup['PHI-MB-ENERGY-SOLAR-TIER'].value, settings.startup['PHI-MB-ENERGY-POWER-TIER'].value) for i=1, 7 do local tn = 'compound-energy-' .. i @@ -330,6 +330,8 @@ if settings.startup['PHI-MI'].value then end end end + + data.raw['utility-constants'].default.default_pipeline_extent = settings.startup['PHI-MI-PIPE-EXTENT'].value end if (settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TOOL'].value) or (settings.startup['PHI-MI'].value) or (settings.startup['PHI-SA'].value and (settings.startup['PHI-SA-RESTRICTION'].value or settings.startup['PHI-SA-VANILLA'].value)) then @@ -1146,8 +1148,6 @@ if settings.startup['PHI-SA'].value then end end end - - data.raw['utility-constants'].default.default_pipeline_extent = settings.startup['PHI-SA-PIPE-EXTENT'].value if mods['space-age'] then data.raw['utility-constants'].default.rocket_lift_weight = settings.startup['PHI-SA-ROCKET-CAPACITY'].value * 1000000 diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index c505e47..beaa1a4 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -1,6 +1,7 @@ [phi-cl] combine=__1__ __2__ combine-gen=__1__ MK__2__ +default=Default [name] accumulator=Accumulator @@ -91,18 +92,67 @@ empty-world=Empty world [map-gen-preset-description] empty-world=Useful for design +[mod-setting-name-prefix] +PHI-MB=[color=255,254,42]MB[/color] +PHI-MB-ENERGY=[color=255,254,42]MB1[/color] +PHI-MB-ENERGY-SOLAR-TIER=[color=54,228,255]MB2[/color] +PHI-MB-ENERGY-SOLAR-RATIO=[color=54,228,255]MB3[/color] +PHI-MB-ENERGY-POWER-TIER=[color=54,228,255]MB4[/color] +PHI-MB-MACHINE=[color=255,254,42]MB5[/color] +PHI-MB-MACHINE-TIER=[color=54,228,255]MB6[/color] +PHI-MB-WEAPON=[color=255,254,42]MB7[/color] +PHI-MB-WEAPON-TURRET-TIER=[color=54,228,255]MB8[/color] +PHI-MB-WEAPON-RADAR-TIER=[color=54,228,255]MB9[/color] + +PHI-EQ=[color=255,254,42]EQ[/color] +PHI-EQ-POWER-TIER=[color=54,228,255]EQ1[/color] +PHI-EQ-DEFENSE-TIER=[color=54,228,255]EQ2[/color] +PHI-EQ-TOOL-TIER=[color=54,228,255]EQ3[/color] +PHI-EQ-UTILITY-TIER=[color=54,228,255]EQ4[/color] +PHI-EQ-ARMOR=[color=54,228,255]EQ5[/color] +PHI-EQ-SIZE=[color=54,228,255]EQ6[/color] + +PHI-MI=[color=255,254,42]MI[/color] +PHI-MI-LANDFILL=[color=54,228,255]MI1[/color] +PHI-MI-EFFCY=[color=54,228,255]MI2[/color] +PHI-MI-NUCLEAR=[color=54,228,255]MI3[/color] +PHI-MI-PIPE=[color=54,228,255]MI4[/color] +PHI-MI-ROBOT=[color=54,228,255]MI5[/color] +PHI-MI-ROBOT-ENERGY=[color=54,228,255]MI6[/color] +PHI-MI-TRAIN=[color=54,228,255]MI7[/color] +PHI-MI-PIPE-EXTENT=[color=54,228,255]MI8[/color] + +PHI-SA=[color=255,254,42]SA[/color] +PHI-SA-ROCKET-CAPACITY=[color=54,228,255]SA1[/color] +PHI-SA-CARGO-WEIGHT=[color=54,228,255]SA2[/color] +PHI-SA-HEAT-RADIUS=[color=54,228,255]SA3[/color] +PHI-SA-SPOIL=[color=54,228,255]SA4[/color] +PHI-SA-SPOIL-FREEZE=[color=54,228,255]SA5[/color] +PHI-SA-SPOIL-FREEZE-RATIO=[color=54,228,255]SA6[/color] +PHI-SA-RESTRICTION=[color=54,228,255]SA7[/color] +PHI-SA-GENERIC=[color=54,228,255]SA8[/color] +PHI-SA-QUALITY=[color=54,228,255]SA9[/color] +PHI-SA-NO-QUALITY=[color=54,228,255]SA10[/color] +PHI-SA-VANILLA=[color=54,228,255]SA11[/color] + +PHI-CT=[color=255,254,42]CT[/color] +PHI-CT-TOOL=[color=54,228,255]CT1[/color] +PHI-CT-UTILITY=[color=54,228,255]CT2[/color] +PHI-CT-HIDDEN=[color=54,228,255]CT3[/color] +PHI-CT-TILE=[color=54,228,255]CT4[/color] +PHI-CT-TILE-CHOICE=[color=54,228,255]CT5[/color] + [mod-setting-name] -PHI-EN=[color=255,254,42]Enable compound energy[/color] -PHI-EN-SOLAR-TIER=Solar panel tier -PHI-EN-SOLAR-RATIO=Solar Ratio -PHI-EN-POWER-TIER=Power tier - -PHI-MB=[color=255,254,42]Enable fast machine[/color] +PHI-MB=[color=255,254,42]Enable better entity[/color] +PHI-MB-ENERGY=[color=255,254,42]Enable compound energy[/color] +PHI-MB-ENERGY-SOLAR-TIER=Solar panel tier +PHI-MB-ENERGY-SOLAR-RATIO=Solar ratio +PHI-MB-ENERGY-POWER-TIER=Power tier +PHI-MB-MACHINE=[color=255,254,42]Enable compound machine[/color] PHI-MB-MACHINE-TIER=Machine tier - -PHI-WE=[color=255,254,42]Enable military defense[/color] -PHI-WE-TURRET-TIER=turret tier -PHI-WE-RADAR-TIER=Radar tier +PHI-MB-WEAPON=[color=255,254,42]Enable military defense[/color] +PHI-MB-WEAPON-TURRET-TIER=Turret tier +PHI-MB-WEAPON-RADAR-TIER=Radar tier PHI-EQ=[color=255,254,42]Armor equipment[/color] PHI-EQ-POWER-TIER=Power tier @@ -143,74 +193,9 @@ PHI-CT-TILE=Enable map generation world tile PHI-CT-TILE-CHOICE=Map generation tile choice [mod-setting-description] -PHI-EN-SOLAR-TIER=Default 8 -PHI-EN-POWER-TIER=Default 5 - -PHI-MB-MACHINE-TIER=Default 3 - -PHI-WE-TURRET-TIER=Default 3 -PHI-WE-RADAR-TIER=Default 3 - -PHI-EQ-POWER-TIER=Default 8 -PHI-EQ-DEFENSE-TIER=Default 8 -PHI-EQ-TOOL-TIER=Default 8 -PHI-EQ-UTILITY-TIER=Default 2 PHI-EQ-SIZE=1x1 - -PHI-MI-LANDFILL=Default 20 - +PHI-MI-LANDFILL=20 PHI-SA-ROCKET-CAPACITY='000 KG PHI-SA-CARGO-WEIGHT=KG PHI-SA-SPOIL-FREEZE-RATIO=x0.1 PHI-SA-QUALITY=x0.1 - -[mod-setting-name-prefix] -PHI-EN=[color=255,254,42]EN[/color] -PHI-EN-SOLAR-TIER=[color=54,228,255]EN1[/color] -PHI-EN-SOLAR-RATIO=[color=54,228,255]EN2[/color] -PHI-EN-POWER-TIER=[color=54,228,255]EN3[/color] - -PHI-MB=[color=255,254,42]MB[/color] -PHI-MB-MACHINE-TIER=[color=54,228,255]MB1[/color] - -PHI-WE=[color=255,254,42]WE[/color] -PHI-WE-TURRET-TIER=[color=54,228,255]WE1[/color] -PHI-WE-RADAR-TIER=[color=54,228,255]WE2[/color] - -PHI-EQ=[color=255,254,42]EQ[/color] -PHI-EQ-POWER-TIER=[color=54,228,255]EQ1[/color] -PHI-EQ-DEFENSE-TIER=[color=54,228,255]EQ2[/color] -PHI-EQ-TOOL-TIER=[color=54,228,255]EQ3[/color] -PHI-EQ-UTILITY-TIER=[color=54,228,255]EQ4[/color] -PHI-EQ-ARMOR=[color=54,228,255]EQ5[/color] -PHI-EQ-SIZE=[color=54,228,255]EQ6[/color] - -PHI-MI=[color=255,254,42]MI[/color] -PHI-MI-LANDFILL=[color=54,228,255]MI1[/color] -PHI-MI-EFFCY=[color=54,228,255]MI2[/color] -PHI-MI-NUCLEAR=[color=54,228,255]MI3[/color] -PHI-MI-PIPE=[color=54,228,255]MI4[/color] -PHI-MI-ROBOT=[color=54,228,255]MI5[/color] -PHI-MI-ROBOT-ENERGY=[color=54,228,255]MI6[/color] -PHI-MI-TRAIN=[color=54,228,255]MI7[/color] -PHI-MI-PIPE-EXTENT=[color=54,228,255]MI8[/color] - -PHI-SA=[color=255,254,42]SA[/color] -PHI-SA-ROCKET-CAPACITY=[color=54,228,255]SA1[/color] -PHI-SA-CARGO-WEIGHT=[color=54,228,255]SA2[/color] -PHI-SA-HEAT-RADIUS=[color=54,228,255]SA3[/color] -PHI-SA-SPOIL=[color=54,228,255]SA4[/color] -PHI-SA-SPOIL-FREEZE=[color=54,228,255]SA5[/color] -PHI-SA-SPOIL-FREEZE-RATIO=[color=54,228,255]SA6[/color] -PHI-SA-RESTRICTION=[color=54,228,255]SA7[/color] -PHI-SA-GENERIC=[color=54,228,255]SA8[/color] -PHI-SA-QUALITY=[color=54,228,255]SA9[/color] -PHI-SA-NO-QUALITY=[color=54,228,255]SA10[/color] -PHI-SA-VANILLA=[color=54,228,255]SA11[/color] - -PHI-CT=[color=255,254,42]CT[/color] -PHI-CT-TOOL=[color=54,228,255]CT1[/color] -PHI-CT-UTILITY=[color=54,228,255]CT2[/color] -PHI-CT-HIDDEN=[color=54,228,255]CT3[/color] -PHI-CT-TILE=[color=54,228,255]CT4[/color] -PHI-CT-TILE-CHOICE=[color=54,228,255]CT5[/color] diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg index f715e79..f3f9134 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -1,6 +1,7 @@ [phi-cl] combine=__1__ __2__ combine-gen=__1__ __2__代目 +default=デフォルト [name] accumulator=蓄電池 @@ -92,17 +93,16 @@ empty-world=空の世界 empty-world=デザインに役立つ [mod-setting-name] -PHI-EN=[color=255,254,42]複合発電を有効にする[/color] -PHI-EN-SOLAR-TIER=ソーラーパネルの最高等級 -PHI-EN-SOLAR-RATIO=ソーラーパネルマルチプライヤ -PHI-EN-POWER-TIER=パワーの最高等級 - -PHI-MB=[color=255,254,42]より速く機械を有効にする[/color] +PHI-MB=[color=255,254,42]より良いエンティティを有効にする[/color] +PHI-MB-ENERGY=[color=255,254,42]複合発電を有効にする[/color] +PHI-MB-ENERGY-SOLAR-TIER=ソーラーパネルの最高等級 +PHI-MB-ENERGY-SOLAR-RATIO=ソーラーパネルマルチプライヤ +PHI-MB-ENERGY-POWER-TIER=パワーの最高等級 +PHI-MB-MACHINE=[color=255,254,42]複合機械を有効にする[/color] PHI-MB-MACHINE-TIER=機械の最高等級 - -PHI-WE=[color=255,254,42]軍事防衛を有効にする[/color] -PHI-WE-TURRET-TIER=タレットの最高等級 -PHI-WE-RADAR-TIER=レーダーの最高等級 +PHI-MB-WEAPON=[color=255,254,42]軍事防衛を有効にする[/color] +PHI-MB-WEAPON-TURRET-TIER=タレットの最高等級 +PHI-MB-WEAPON-RADAR-TIER=レーダーの最高等級 PHI-EQ=[color=255,254,42]アーマー設備を有効にする[/color] PHI-EQ-POWER-TIER=発電モジュールの最高等級 @@ -141,25 +141,3 @@ PHI-CT-UTILITY=ユーティリティ PHI-CT-HIDDEN=非表示 PHI-CT-TILE=マップ生成ワールドタイルを有効にする PHI-CT-TILE-CHOICE=マップ生成ドタイル選択 - -[mod-setting-description] -PHI-EN-SOLAR-TIER=デフォルト 8 -PHI-EN-POWER-TIER=デフォルト 5 - -PHI-MB-MACHINE-TIER=デフォルト 3 - -PHI-WE-TURRET-TIER=デフォルト 3 -PHI-WE-RADAR-TIER=デフォルト 3 - -PHI-EQ-POWER-TIER=デフォルト 8 -PHI-EQ-DEFENSE-TIER=デフォルト 8 -PHI-EQ-TOOL-TIER=デフォルト 8 -PHI-EQ-UTILITY-TIER=デフォルト 2 -PHI-EQ-SIZE=1x1 - -PHI-MI-LANDFILL=デフォルト 20 - -PHI-SA-ROCKET-CAPACITY='000 KG -PHI-SA-CARGO-WEIGHT=KG -PHI-SA-SPOIL-FREEZE-RATIO=x0.1 -PHI-SA-QUALITY=x0.1 diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg index 028d2dc..f0263b2 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -1,6 +1,7 @@ [phi-cl] combine=__1__ __2__ combine-gen=__1__ __2__代 +default=預設 [name] accumulator=蓄電池 @@ -92,17 +93,16 @@ empty-world=空的世界 empty-world=對設計有用 [mod-setting-name] -PHI-EN=[color=255,254,42]啟用複合發電[/color] -PHI-EN-SOLAR-TIER=太陽能板的最高等級 -PHI-EN-SOLAR-RATIO=太陽能板倍數 -PHI-EN-POWER-TIER=電力的最高等級 - -PHI-MB=[color=255,254,42]啟用快速機器[/color] +PHI-MB=[color=255,254,42]啟用複合實體[/color] +PHI-MB-ENERGY=[color=255,254,42]啟用複合發電[/color] +PHI-MB-ENERGY-SOLAR-TIER=太陽能板的最高等級 +PHI-MB-ENERGY-SOLAR-RATIO=太陽能板倍數 +PHI-MB-ENERGY-POWER-TIER=電力的最高等級 +PHI-MB-MACHINE=[color=255,254,42]啟用複合機器[/color] PHI-MB-MACHINE-TIER=機器的最高等級 - -PHI-WE=[color=255,254,42]啟用軍事防禦[/color] -PHI-WE-TURRET-TIER=炮塔的最高等級 -PHI-WE-RADAR-TIER=雷達的最高等級 +PHI-MB-WEAPON=[color=255,254,42]啟用軍事防禦[/color] +PHI-MB-WEAPON-TURRET-TIER=炮塔的最高等級 +PHI-MB-WEAPON-RADAR-TIER=雷達的最高等級 PHI-EQ=[color=255,254,42]啟用裝甲設備[/color] PHI-EQ-POWER-TIER=發電的最高等級 @@ -141,25 +141,3 @@ PHI-CT-UTILITY=雜項 PHI-CT-HIDDEN=隱藏 PHI-CT-TILE=啟用地圖生成世界地磚 PHI-CT-TILE-CHOICE=地圖生成世界地磚選擇 - -[mod-setting-description] -PHI-EN-SOLAR-TIER=預設 8 -PHI-EN-POWER-TIER=預設 5 - -PHI-MB-MACHINE-TIER=預設 3 - -PHI-WE-TURRET-TIER=預設 3 -PHI-WE-RADAR-TIER=預設 3 - -PHI-EQ-POWER-TIER=預設 8 -PHI-EQ-DEFENSE-TIER=預設 8 -PHI-EQ-TOOL-TIER=預設 8 -PHI-EQ-UTILITY-TIER=預設 2 -PHI-EQ-SIZE=1x1 - -PHI-MI-LANDFILL=預設 20 - -PHI-SA-ROCKET-CAPACITY='000 KG -PHI-SA-CARGO-WEIGHT=KG -PHI-SA-SPOIL-FREEZE-RATIO=x0.1 -PHI-SA-QUALITY=x0.1 diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg index 028d2dc..f0263b2 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -1,6 +1,7 @@ [phi-cl] combine=__1__ __2__ combine-gen=__1__ __2__代 +default=預設 [name] accumulator=蓄電池 @@ -92,17 +93,16 @@ empty-world=空的世界 empty-world=對設計有用 [mod-setting-name] -PHI-EN=[color=255,254,42]啟用複合發電[/color] -PHI-EN-SOLAR-TIER=太陽能板的最高等級 -PHI-EN-SOLAR-RATIO=太陽能板倍數 -PHI-EN-POWER-TIER=電力的最高等級 - -PHI-MB=[color=255,254,42]啟用快速機器[/color] +PHI-MB=[color=255,254,42]啟用複合實體[/color] +PHI-MB-ENERGY=[color=255,254,42]啟用複合發電[/color] +PHI-MB-ENERGY-SOLAR-TIER=太陽能板的最高等級 +PHI-MB-ENERGY-SOLAR-RATIO=太陽能板倍數 +PHI-MB-ENERGY-POWER-TIER=電力的最高等級 +PHI-MB-MACHINE=[color=255,254,42]啟用複合機器[/color] PHI-MB-MACHINE-TIER=機器的最高等級 - -PHI-WE=[color=255,254,42]啟用軍事防禦[/color] -PHI-WE-TURRET-TIER=炮塔的最高等級 -PHI-WE-RADAR-TIER=雷達的最高等級 +PHI-MB-WEAPON=[color=255,254,42]啟用軍事防禦[/color] +PHI-MB-WEAPON-TURRET-TIER=炮塔的最高等級 +PHI-MB-WEAPON-RADAR-TIER=雷達的最高等級 PHI-EQ=[color=255,254,42]啟用裝甲設備[/color] PHI-EQ-POWER-TIER=發電的最高等級 @@ -141,25 +141,3 @@ PHI-CT-UTILITY=雜項 PHI-CT-HIDDEN=隱藏 PHI-CT-TILE=啟用地圖生成世界地磚 PHI-CT-TILE-CHOICE=地圖生成世界地磚選擇 - -[mod-setting-description] -PHI-EN-SOLAR-TIER=預設 8 -PHI-EN-POWER-TIER=預設 5 - -PHI-MB-MACHINE-TIER=預設 3 - -PHI-WE-TURRET-TIER=預設 3 -PHI-WE-RADAR-TIER=預設 3 - -PHI-EQ-POWER-TIER=預設 8 -PHI-EQ-DEFENSE-TIER=預設 8 -PHI-EQ-TOOL-TIER=預設 8 -PHI-EQ-UTILITY-TIER=預設 2 -PHI-EQ-SIZE=1x1 - -PHI-MI-LANDFILL=預設 20 - -PHI-SA-ROCKET-CAPACITY='000 KG -PHI-SA-CARGO-WEIGHT=KG -PHI-SA-SPOIL-FREEZE-RATIO=x0.1 -PHI-SA-QUALITY=x0.1 diff --git a/PHI-CL/main.lua b/PHI-CL/main.lua index 6b8633d..cf794b5 100644 --- a/PHI-CL/main.lua +++ b/PHI-CL/main.lua @@ -38,7 +38,7 @@ function main.EEE(source, tier) if item.production then if source.tech == 'compound-energy' and source.type == 'solar-panel' then - item.production = tonumber(string.match(item.production, '[%d%.]+')) * (settings.startup['PHI-EN-SOLAR-RATIO'].value ^ (tier - source.min + 1)) .. (string.match(item.production, '%a+') or '') + item.production = tonumber(string.match(item.production, '[%d%.]+')) * (settings.startup['PHI-MB-ENERGY-SOLAR-RATIO'].value ^ (tier - source.min + 1)) .. (string.match(item.production, '%a+') or '') else item.production = tonumber(string.match(item.production, '[%d%.]+')) * (2 ^ (tier - source.min + 1)) .. (string.match(item.production, '%a+') or '') @@ -137,7 +137,7 @@ function main.EEE(source, tier) for _, v in pairs({'buffer_capacity', 'input_flow_limit', 'output_flow_limit'}) do if item.energy_source[v] then - item.energy_source[v] = tonumber(string.match(item.energy_source[v], '[%d%.]+')) * (settings.startup['PHI-EN-SOLAR-RATIO'].value ^ (tier - source.min + 1)) .. string.match(item.energy_source[v], '%a+') + item.energy_source[v] = tonumber(string.match(item.energy_source[v], '[%d%.]+')) * (settings.startup['PHI-MB-ENERGY-SOLAR-RATIO'].value ^ (tier - source.min + 1)) .. string.match(item.energy_source[v], '%a+') end end @@ -430,7 +430,7 @@ function main.ER(source, tier) icons = icons, energy_required = 2, enabled = false, - ingredients = {{type='item', name=ingredient_name, amount=settings.startup['PHI-EN-SOLAR-RATIO'].value}}, + ingredients = {{type='item', name=ingredient_name, amount=settings.startup['PHI-MB-ENERGY-SOLAR-RATIO'].value}}, results = {{type='item', name=result_name, amount=1}}, main_product = result_name, localised_name = {'phi-cl.combine', data.raw[source.type][new_name].localised_name, ''} diff --git a/PHI-CL/note.lua b/PHI-CL/note.lua index c369129..6681a08 100644 --- a/PHI-CL/note.lua +++ b/PHI-CL/note.lua @@ -720,6 +720,19 @@ if script.active_mods['space-exploration'] then end ** SETTING +localised_description = {'phi-cl.combine', {'phi-cl.default'}, {'mod-setting-description.PHI-MB-ENERGY-SOLAR-TIER'}}, +PHI-MB-ENERGY-SOLAR-TIER=8 +PHI-MB-ENERGY-POWER-TIER=5 + +PHI-MB-MACHINE-TIER=3 +PHI-WE-TURRET-TIER=3 +PHI-WE-RADAR-TIER=3 + +PHI-EQ-POWER-TIER=8 +PHI-EQ-DEFENSE-TIER=8 +PHI-EQ-TOOL-TIER=8 +PHI-EQ-UTILITY-TIER=2 + {type = 'laser', decrease = 20, percent = 50}, {type = 'electric', decrease = 20, percent = 50}, {type = 'impact', decrease = 20, percent = 50}, diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index c59491a..ac04fcb 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -1,43 +1,50 @@ data:extend({ { - type = 'bool-setting', - name = 'PHI-EN', - setting_type = 'startup', - default_value = true, - localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EN'}, {'mod-setting-name.PHI-EN'}}, - order = 'A00' -}, { - type = 'int-setting', - name = 'PHI-EN-SOLAR-TIER', - setting_type = 'startup', - default_value = 8, - allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EN-SOLAR-TIER'}, {'mod-setting-name.PHI-EN-SOLAR-TIER'}}, - order = 'A01' -}, { - type = 'int-setting', - name = 'PHI-EN-SOLAR-RATIO', - setting_type = 'startup', - default_value = 4, - minimum_value = 2, - maximum_value = 16, - localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EN-SOLAR-RATIO'}, {'mod-setting-name.PHI-EN-SOLAR-RATIO'}}, - order = 'A02' -}, { - type = 'int-setting', - name = 'PHI-EN-POWER-TIER', - setting_type = 'startup', - default_value = 1, - allowed_values = {1, 2, 3, 4, 5}, - localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EN-POWER-TIER'}, {'mod-setting-name.PHI-EN-POWER-TIER'}}, - order = 'A03' -}, { type = 'bool-setting', name = 'PHI-MB', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB'}, {'mod-setting-name.PHI-MB'}}, - order = 'B00' + order = 'A00' +}, { + type = 'bool-setting', + name = 'PHI-MB-ENERGY', + setting_type = 'startup', + default_value = true, + localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-ENERGY'}, {'mod-setting-name.PHI-MB-ENERGY'}}, + order = 'A01' +}, { + type = 'int-setting', + name = 'PHI-MB-ENERGY-SOLAR-TIER', + setting_type = 'startup', + default_value = 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'}}, + order = 'A02' +}, { + type = 'int-setting', + name = 'PHI-MB-ENERGY-SOLAR-RATIO', + setting_type = 'startup', + default_value = 4, + minimum_value = 2, + maximum_value = 16, + localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-ENERGY-SOLAR-RATIO'}, {'mod-setting-name.PHI-MB-ENERGY-SOLAR-RATIO'}}, + order = 'A03' +}, { + type = 'int-setting', + name = 'PHI-MB-ENERGY-POWER-TIER', + setting_type = 'startup', + default_value = 1, + 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 = 'A04' +}, { + type = 'bool-setting', + name = 'PHI-MB-MACHINE', + setting_type = 'startup', + default_value = false, + localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-MACHINE-TIER'}, {'mod-setting-name.PHI-MB-MACHINE-TIER'}}, + order = 'A05' }, { type = 'int-setting', name = 'PHI-MB-MACHINE-TIER', @@ -45,37 +52,37 @@ data:extend({ default_value = 3, allowed_values = {1, 2, 3}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-MACHINE-TIER'}, {'mod-setting-name.PHI-MB-MACHINE-TIER'}}, - order = 'B01' + order = 'A06' }, { type = 'bool-setting', - name = 'PHI-WE', + name = 'PHI-MB-WEAPON', setting_type = 'startup', default_value = false, - localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-WE'}, {'mod-setting-name.PHI-WE'}}, - order = 'C00' + localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-WEAPON'}, {'mod-setting-name.PHI-MB-WEAPON'}}, + order = 'A07' }, { type = 'int-setting', - name = 'PHI-WE-TURRET-TIER', + name = 'PHI-MB-WEAPON-TURRET-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-WE-TURRET-TIER'}, {'mod-setting-name.PHI-WE-TURRET-TIER'}}, - order = 'C01' + localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-WEAPON-TURRET-TIER'}, {'mod-setting-name.PHI-MB-WEAPON-TURRET-TIER'}}, + order = 'A08' }, { type = 'int-setting', - name = 'PHI-WE-RADAR-TIER', + name = 'PHI-MB-WEAPON-RADAR-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-WE-RADAR-TIER'}, {'mod-setting-name.PHI-WE-RADAR-TIER'}}, - order = 'C02' + localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-WEAPON-RADAR-TIER'}, {'mod-setting-name.PHI-MB-WEAPON-RADAR-TIER'}}, + order = 'A09' }, { type = 'bool-setting', name = 'PHI-EQ', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ'}, {'mod-setting-name.PHI-EQ'}}, - order = 'D00' + order = 'B00' }, { type = 'int-setting', name = 'PHI-EQ-POWER-TIER', @@ -83,7 +90,7 @@ data:extend({ default_value = 8, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-POWER-TIER'}, {'mod-setting-name.PHI-EQ-POWER-TIER'}}, - order = 'D01' + order = 'B01' }, { type = 'int-setting', name = 'PHI-EQ-DEFENSE-TIER', @@ -91,7 +98,7 @@ data:extend({ default_value = 8, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-DEFENSE-TIER'}, {'mod-setting-name.PHI-EQ-DEFENSE-TIER'}}, - order = 'D02' + order = 'B02' }, { type = 'int-setting', name = 'PHI-EQ-TOOL-TIER', @@ -99,7 +106,7 @@ data:extend({ default_value = 8, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-TOOL-TIER'}, {'mod-setting-name.PHI-EQ-TOOL-TIER'}}, - order = 'D03' + order = 'B03' }, { type = 'int-setting', name = 'PHI-EQ-UTILITY-TIER', @@ -107,28 +114,28 @@ data:extend({ default_value = 2, allowed_values = {1, 2}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-UTILITY-TIER'}, {'mod-setting-name.PHI-EQ-UTILITY-TIER'}}, - order = 'D04' + order = 'B04' }, { type = 'bool-setting', name = 'PHI-EQ-ARMOR', setting_type = 'startup', default_value = true, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-ARMOR'}, {'mod-setting-name.PHI-EQ-ARMOR'}}, - order = 'D05' + order = 'B05' }, { type = 'bool-setting', name = 'PHI-EQ-SIZE', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-SIZE'}, {'mod-setting-name.PHI-EQ-SIZE'}}, - order = 'D06' + order = 'B06' }, { type = 'bool-setting', name = 'PHI-MI', setting_type = 'startup', default_value = true, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI'}, {'mod-setting-name.PHI-MI'}}, - order = 'E00' + order = 'C00' }, { type = 'int-setting', name = 'PHI-MI-LANDFILL', @@ -137,7 +144,7 @@ data:extend({ minimum_value = 1, maximum_value = 100, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-LANDFILL'}, {'mod-setting-name.PHI-MI-LANDFILL'}}, - order = 'E01' + order = 'C01' }, { type = 'int-setting', name = 'PHI-MI-EFFCY', @@ -146,14 +153,14 @@ data:extend({ minimum_value = 10, maximum_value = 1000, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-EFFCY'}, {'mod-setting-name.PHI-MI-EFFCY'}}, - order = 'E02' + order = 'C02' }, { type = 'bool-setting', name = 'PHI-MI-NUCLEAR', setting_type = 'startup', default_value = true, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-NUCLEAR'}, {'mod-setting-name.PHI-MI-NUCLEAR'}}, - order = 'E03' + order = 'C03' }, { type = 'int-setting', name = 'PHI-MI-PIPE', @@ -161,7 +168,7 @@ data:extend({ default_value = 1, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-PIPE'}, {'mod-setting-name.PHI-MI-PIPE'}}, - order = 'E04' + order = 'C04' }, { type = 'int-setting', name = 'PHI-MI-ROBOT', @@ -169,14 +176,14 @@ data:extend({ default_value = 1, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-ROBOT'}, {'mod-setting-name.PHI-MI-ROBOT'}}, - order = 'E05' + order = 'C05' }, { type = 'bool-setting', name = 'PHI-MI-ROBOT-ENERGY', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-ROBOT-ENERGY'}, {'mod-setting-name.PHI-MI-ROBOT-ENERGY'}}, - order = 'E06' + order = 'C06' }, { type = 'int-setting', name = 'PHI-MI-TRAIN', @@ -184,7 +191,7 @@ data:extend({ default_value = 1, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-TRAIN'}, {'mod-setting-name.PHI-MI-TRAIN'}}, - order = 'E07' + order = 'C07' }, { type = 'int-setting', name = 'PHI-MI-PIPE-EXTENT', @@ -193,14 +200,14 @@ data:extend({ minimum_value = 80, maximum_value = 2560, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-PIPE-EXTENT'}, {'mod-setting-name.PHI-MI-PIPE-EXTENT'}}, - order = 'E08' + order = 'C08' }, { type = 'bool-setting', name = 'PHI-SA', setting_type = 'startup', default_value = true, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA'}, {'mod-setting-name.PHI-SA'}}, - order = 'F00' + order = 'D00' }, { type = 'int-setting', name = 'PHI-SA-ROCKET-CAPACITY', @@ -209,7 +216,7 @@ data:extend({ minimum_value = 1, maximum_value = 10000, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-ROCKET-CAPACITY'}, {'mod-setting-name.PHI-SA-ROCKET-CAPACITY'}}, - order = 'F01' + order = 'D01' }, { type = 'int-setting', name = 'PHI-SA-CARGO-WEIGHT', @@ -218,7 +225,7 @@ data:extend({ minimum_value = 1, maximum_value = 1000, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-CARGO-WEIGHT'}, {'mod-setting-name.PHI-SA-CARGO-WEIGHT'}}, - order = 'F02' + order = 'D02' }, { type = 'int-setting', name = 'PHI-SA-HEAT-RADIUS', @@ -227,21 +234,21 @@ data:extend({ minimum_value = 1, maximum_value = 7, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-HEAT-RADIUS'}, {'mod-setting-name.PHI-SA-HEAT-RADIUS'}}, - order = 'F03' + order = 'D03' }, { type = 'bool-setting', name = 'PHI-SA-SPOIL', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-SPOIL'}, {'mod-setting-name.PHI-SA-SPOIL'}}, - order = 'F04' + order = 'D04' }, { type = 'bool-setting', name = 'PHI-SA-SPOIL-FREEZE', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-SPOIL-FREEZE'}, {'mod-setting-name.PHI-SA-SPOIL-FREEZE'}}, - order = 'F05' + order = 'D05' }, { type = 'int-setting', name = 'PHI-SA-SPOIL-FREEZE-RATIO', @@ -250,21 +257,21 @@ data:extend({ minimum_value = 1, maximum_value = 1000, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-SPOIL-FREEZE-RATIO'}, {'mod-setting-name.PHI-SA-SPOIL-FREEZE-RATIO'}}, - order = 'F06' + order = 'D06' }, { type = 'bool-setting', name = 'PHI-SA-RESTRICTION', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-RESTRICTION'}, {'mod-setting-name.PHI-SA-RESTRICTION'}}, - order = 'F07' + order = 'D07' }, { type = 'bool-setting', name = 'PHI-SA-GENERIC', setting_type = 'startup', default_value = true, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-GENERIC'}, {'mod-setting-name.PHI-SA-GENERIC'}}, - order = 'F08' + order = 'D08' }, { type = 'int-setting', name = 'PHI-SA-QUALITY', @@ -273,56 +280,56 @@ data:extend({ minimum_value = 1, maximum_value = 100, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-QUALITY'}, {'mod-setting-name.PHI-SA-QUALITY'}}, - order = 'F09' + order = 'D09' }, { type = 'bool-setting', name = 'PHI-SA-NO-QUALITY', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-NO-QUALITY'}, {'mod-setting-name.PHI-SA-NO-QUALITY'}}, - order = 'F10' + order = 'D10' }, { type = 'bool-setting', name = 'PHI-SA-VANILLA', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-VANILLA'}, {'mod-setting-name.PHI-SA-VANILLA'}}, - order = 'F11' + order = 'D11' }, { type = 'bool-setting', name = 'PHI-CT', setting_type = 'startup', default_value = true, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-CT'}, {'mod-setting-name.PHI-CT'}}, - order = 'G00' + order = 'E00' }, { type = 'bool-setting', name = 'PHI-CT-TOOL', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-CT-TOOL'}, {'mod-setting-name.PHI-CT-TOOL'}}, - order = 'G01' + order = 'E01' }, { type = 'bool-setting', name = 'PHI-CT-UTILITY', setting_type = 'startup', default_value = true, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-CT-UTILITY'}, {'mod-setting-name.PHI-CT-UTILITY'}}, - order = 'G02' + order = 'E02' }, { type = 'bool-setting', name = 'PHI-CT-HIDDEN', setting_type = 'startup', default_value = true, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-CT-HIDDEN'}, {'mod-setting-name.PHI-CT-HIDDEN'}}, - order = 'G03' + order = 'E03' }, { type = 'bool-setting', name = 'PHI-CT-TILE', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-CT-TILE'}, {'mod-setting-name.PHI-CT-TILE'}}, - order = 'G04' + order = 'E04' }, { type = 'string-setting', name = 'PHI-CT-TILE-CHOICE', @@ -330,6 +337,6 @@ data:extend({ default_value = 'grass-1', allowed_values = {'concrete', 'deepwater', 'deepwater-green', 'dirt-1', 'dirt-2', 'dirt-3', 'dirt-4', 'dirt-5', 'dirt-6', 'dirt-7', 'dry-dirt', 'grass-1', 'grass-2', 'grass-3', 'grass-4', 'hazard-concrete-left', 'hazard-concrete-right', 'lab-dark-1', 'lab-dark-2', 'lab-white', 'landfill', 'out-of-map', 'red-desert-0', 'red-desert-1', 'red-desert-2', 'red-desert-3', 'refined-concrete', 'refined-hazard-concrete-left', 'refined-hazard-concrete-right', 'sand-1', 'sand-2', 'sand-3', 'stone-path', 'tutorial-grid', 'water', 'water-green', 'water-mud', 'water-shallow'}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-CT-TILE-CHOICE'}, {'mod-setting-name.PHI-CT-TILE-CHOICE'}}, - order = 'G05' + order = 'E05' } })