diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt index 25f3e3f..1c85b77 100644 --- a/PHI-CL/changelog.txt +++ b/PHI-CL/changelog.txt @@ -1,9 +1,10 @@ --------------------------------------------------------------------------------------------------- Version: 3.0.136 -Date: 2026-04-12 +Date: 2026-05-10 Changes: - [MI] Generic code layout restructure. + - [GM] Generic code layout restructure. - [MI] Removed basic chests. - [MI] Removed train speed setting. - [MI] Removed robot speed setting. diff --git a/PHI-CL/data/b/mi.lua b/PHI-CL/data/b/mi.lua index 5f42955..3460ca2 100644 --- a/PHI-CL/data/b/mi.lua +++ b/PHI-CL/data/b/mi.lua @@ -1,7 +1,7 @@ -if settings.startup['PHI-MI-FLUID'].value then +if settings.startup['PHI-MI-PIPE'].value then -- MI C 1 BASE UTILITY_CONSTANTS - data.raw['utility-constants'].default.max_fluid_flow = 10 * settings.startup['PHI-MI-FLUID'].value + data.raw['utility-constants'].default.max_fluid_flow = 10 * settings.startup['PHI-MI-PIPE'].value end -- MI C 2 BASE ENTITY diff --git a/PHI-CL/info.json b/PHI-CL/info.json index 7ebf734..6d07bae 100644 --- a/PHI-CL/info.json +++ b/PHI-CL/info.json @@ -2,7 +2,7 @@ "name": "PHI-CL", "version": "3.0.136", "factorio_version": "2.0", - "date": "2026-04-12", + "date": "2026-05-10", "title": "Phidias Collection", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index 5a3cd88..edd2d4b 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -60,7 +60,7 @@ PHI-MB-EQUIPMENT-SIZE=MBQ3 PHI-MI=MI PHI-MI-GENERIC=MI1 -PHI-MI-FLUID=MI2 +PHI-MI-PIPE=MI2 PHI-MI-ROBOT-ENERGY=MI3 PHI-MI-PIPE-EXTENT=MI4 @@ -91,7 +91,7 @@ PHI-MB-EQUIPMENT-SIZE=Small equipment PHI-MI=Miscellaneous Item PHI-MI-GENERIC=Generic -PHI-MI-FLUID=Fluid efficiency +PHI-MI-PIPE=Fluid efficiency PHI-MI-ROBOT-ENERGY=Nuclear fussion robot PHI-MI-PIPE-EXTENT=Pipe Extent diff --git a/PHI-CL/note.lua b/PHI-CL/note.lua deleted file mode 100644 index be1511c..0000000 --- a/PHI-CL/note.lua +++ /dev/null @@ -1,276 +0,0 @@ ---[[ -** CONFIG - if mods['Krastorio2'] then - items['item']['kr-mineral-water-pumpjack'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'mining-drill', - name = 'kr-mineral-water-pumpjack', - ref_name = 'kr-mineral-water-pumpjack', - tech = 'kr-mineral-water-gathering', - min = 2, - max = settings.startup['PHI-MB-MINING-TIER'].value - } - - items['item']['kr-gas-power-station'] = { - enabled = settings.startup['PHI-EN'].value, - stage = 2, - type = 'generator', - name = 'kr-gas-power-station', - ref_name = 'kr-gas-power-station', - tech = 'compound-energy', - min = 2, - max = settings.startup['PHI-EN-STEAM-TIER'].value - } - - items['item']['kr-crusher'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'furnace', - name = 'kr-crusher', - ref_name = 'kr-crusher', - tech = 'kr-crusher', - min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value - } - - items['item']['kr-fluid-burner'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'furnace', - name = 'kr-fluid-burner', - ref_name = 'kr-fluid-burner', - tech = 'kr-fluid-excess-handling', - min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value - } - - items['item']['kr-air-purifier'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'furnace', - name = 'kr-air-purifier', - ref_name = 'kr-air-purifier', - tech = 'kr-air-purification', - min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value - } - - items['item']['kr-advanced-furnace'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'assembling-machine', - name = 'kr-advanced-furnace', - ref_name = 'kr-advanced-furnace', - tech = 'kr-advanced-furnace', - min = 2, - max = settings.startup['PHI-MB-FURNACE-TIER'].value - } - - items['item']['kr-advanced-chemical-plant'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'assembling-machine', - name = 'kr-advanced-chemical-plant', - ref_name = 'kr-advanced-chemical-plant', - tech = 'kr-advanced-chemical-plant', - min = 2, - max = settings.startup['PHI-MB-OIL-TIER'].value - } - - items['item']['kr-advanced-assembling-machine'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'assembling-machine', - name = 'kr-advanced-assembling-machine', - ref_name = 'kr-advanced-assembling-machine', - tech = 'kr-automation', - min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value - } - - items['item']['kr-greenhouse'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'assembling-machine', - name = 'kr-greenhouse', - ref_name = 'kr-greenhouse', - tech = 'kr-greenhouse', - min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value - } - - items['item']['kr-bio-lab'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'assembling-machine', - name = 'kr-bio-lab', - ref_name = 'kr-bio-lab', - tech = 'kr-bio-processing', - min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value - } - - items['item']['kr-electrolysis-plant'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'assembling-machine', - name = 'kr-electrolysis-plant', - ref_name = 'kr-electrolysis-plant', - tech = 'kr-fluids-chemistry', - min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value - } - - items['item']['kr-filtration-plant'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'assembling-machine', - name = 'kr-filtration-plant', - ref_name = 'kr-filtration-plant', - tech = 'kr-fluids-chemistry', - min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value - } - - items['item']['kr-fuel-refinery'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'assembling-machine', - name = 'kr-fuel-refinery', - ref_name = 'kr-fuel-refinery', - tech = 'kr-fuel', - min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value - } - - items['item']['kr-atmospheric-condenser'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'assembling-machine', - name = 'kr-atmospheric-condenser', - ref_name = 'kr-atmospheric-condenser', - tech = 'kr-atmosphere-condensation', - min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value - } - - items['item']['kr-advanced-lab'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'lab', - name = 'biusart-lab', - ref_name = 'biusart-lab', - tech = 'kr-advanced-lab', - min = 2, - max = settings.startup['PHI-MB-LAB-TIER'].value - } - - items['item']['kr-singularity-lab'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'lab', - name = 'kr-singularity-lab', - ref_name = 'kr-singularity-lab', - tech = 'kr-singularity-lab', - min = 2, - max = settings.startup['PHI-MB-LAB-TIER'].value - } - - items['item']['kr-research-server'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'assembling-machine', - name = 'kr-research-server', - ref_name = 'kr-research-server', - tech = 'kr-research-server', - min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value - } - - items['item']['kr-quantum-computer'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'assembling-machine', - name = 'kr-quantum-computer', - ref_name = 'kr-quantum-computer', - tech = 'kr-quantum-computer', - min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value - } - - items['item']['kr-matter-plant'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'assembling-machine', - name = 'kr-matter-plant', - ref_name = 'kr-matter-plant', - tech = 'kr-matter-processing', - min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value - } - - items['item']['kr-matter-assembler'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'assembling-machine', - name = 'kr-matter-assembler', - ref_name = 'kr-matter-assembler', - tech = 'kr-matter-processing', - min = 2, - max = settings.startup['PHI-MB-ASSEMBLING-TIER'].value - } - - items['item']['kr-quarry-drill'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'mining-drill', - name = 'kr-quarry-drill', - ref_name = 'kr-quarry-drill', - tech = 'kr-quarry-minerals-extraction', - min = 2, - max = settings.startup['PHI-MB-MINING-TIER'].value - } - end - -** MAIN - if source.name == 'kr-gas-power-station' then - item.fluid_usage_per_tick = item.fluid_usage_per_tick * (tier - source.min + 2) - - elseif (source.ref_name == 'se-space-solar-panel') then - item.production = tostring(tonumber(string.match(item.production, '[%d%.]+')) * (4 ^ (tier - source.min + 2))) .. string.match(item.production, '%a+') - end - - if item.energy_per_shield then - item.energy_per_shield = tostring(math.floor(tonumber(string.match(item.energy_per_shield, '[%d%.]+')) * ((32 - (tier - source.min + 1)) / 32))) .. string.match(item.energy_per_shield, '%a+') - end - - ** DATA FINAL FIXES -data.raw['utility-constants'].default.train_inactivity_wait_condition_default = 60 - -for _,name in pairs({'furnace', 'lab', 'beacon'}) do - local entities = {} - - for _, entity in pairs(data.raw[name]) do - table.insert(entities, entity.name) - end - - for _, entity in pairs(data.raw[name]) do - entity.additional_pastable_entities = entities - end -end - -for _, t in pairs(data.raw['tree']) do - t.collision_box = {{-0.05, -0.05}, {0.05, 0.05}} -end - -** SETTING -localised_description = {'phi-cl.combine', {'phi-cl.default'}, {'mod-setting-description.PHI-MB-ENERGY-SOLAR-TIER'}}, - -{type = 'laser', decrease = 20, percent = 50}, -{type = 'electric', decrease = 20, percent = 50}, -{type = 'impact', decrease = 20, percent = 50}, -{type = 'poison', decrease = 20, percent = 50} -"? Krastorio2 >= 1.3.0", -"(?) angelsrefining >= 0.12.0" -]] diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index 16a8f28..08ef3ae 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -89,12 +89,12 @@ data:extend({ order = 'B01' }, { type = 'int-setting', - name = 'PHI-MI-FLUID', + name = 'PHI-MI-PIPE', setting_type = 'startup', default_value = 10, minimum_value = 1, maximum_value = 160, - localised_name = {'phi-cl.setting-class-color', {'mod-setting-name-prefix.PHI-MI-FLUID'}, {'phi-cl.proportion', {'mod-setting-name.PHI-MI-FLUID'}}}, + localised_name = {'phi-cl.setting-class-color', {'mod-setting-name-prefix.PHI-MI-PIPE'}, {'phi-cl.proportion', {'mod-setting-name.PHI-MI-PIPE'}}}, order = 'B02' }, { type = 'bool-setting',