diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua index ed4dc38..27d0023 100644 --- a/PHI-CL/config.lua +++ b/PHI-CL/config.lua @@ -728,6 +728,12 @@ if mods then if mods['Krastorio2'] then items['item']['lab'].stage = 2 + items['item']['boiler'].stage = 2 + items['item']['steam-engine'].stage = 2 + items['item']['nuclear-reactor'].stage = 2 + items['item']['heat-pipe'].stage = 2 + items['item']['heat-exchanger'].stage = 2 + items['item']['steam-turbine'].stage = 2 items['item']['kr-mineral-water-pumpjack'] = { enabled = settings.startup['PHI-MB'].value, diff --git a/PHI-CL/data-final-fixes.lua b/PHI-CL/data-final-fixes.lua index b0c0fc0..0340523 100644 --- a/PHI-CL/data-final-fixes.lua +++ b/PHI-CL/data-final-fixes.lua @@ -80,6 +80,14 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TILE'].value th } end +if settings.startup['PHI-RS'].value then + data.raw['assembling-machine']['electric-filter-furnace'].crafting_categories = {} + + for i=1, #data.raw['furnace']['electric-furnace'].crafting_categories do + table.insert(data.raw['assembling-machine']['electric-filter-furnace'].crafting_categories, data.raw['furnace']['electric-furnace'].crafting_categories[i]) + end +end + for _, v in pairs(items['item']) do if (v.stage <= file_stage) and v.enabled and (v.max >= v.min) then v.category = 'item' diff --git a/PHI-CL/data-updates.lua b/PHI-CL/data-updates.lua index 2eeb606..2627dac 100644 --- a/PHI-CL/data-updates.lua +++ b/PHI-CL/data-updates.lua @@ -87,12 +87,23 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].value th for _, t in pairs({data.raw['pipe'], data.raw['pipe-to-ground']}) do for _, v in pairs(t) do - v.fluid_box.height = v.fluid_box.height * s + if v.fluid_box.height then + v.fluid_box.height = v.fluid_box.height * s + + else + v.fluid_box.height = s + end end end for _, v in pairs(data.raw['pump']) do - v.fluid_box.height = v.fluid_box.height * s + if v.fluid_box.height then + v.fluid_box.height = v.fluid_box.height * s + + else + v.fluid_box.height = s + end + v.pumping_speed = v.pumping_speed * s end end diff --git a/PHI-CL/info.json b/PHI-CL/info.json index d5fa58f..abcca8a 100644 --- a/PHI-CL/info.json +++ b/PHI-CL/info.json @@ -1,8 +1,8 @@ { "name": "PHI-CL", - "version": "2.0.47", + "version": "2.0.50", "factorio_version": "1.1", - "date": "2024-10-05", + "date": "2024-10-08", "title": "Phidias Collection", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-CL/main.lua b/PHI-CL/main.lua index b054e3a..939c6fa 100644 --- a/PHI-CL/main.lua +++ b/PHI-CL/main.lua @@ -126,8 +126,12 @@ function main.EEE(source, tier) end elseif (source.type == 'generator') then - if source.name == 'kr-gas-power-station' then + if item.max_power_output then item.max_power_output = (tonumber(string.match(item.max_power_output, '[%d%.]+')) * (tier - source.min + 2)) .. string.match(item.max_power_output, '%a+') + end + + if source.name == 'kr-gas-power-station' then + item.fluid_usage_per_tick = item.fluid_usage_per_tick * (tier - source.min + 2) else item.maximum_temperature = 15 + ((item.maximum_temperature - 15) * tier) @@ -207,7 +211,7 @@ function main.EEE(source, tier) if item.energy_source then if item.energy_source.emissions_per_minute then if source.tech == 'compound-energy' then - if (source.type == 'boiler') then + if (source.type == 'boiler') or (source.name == 'kr-gas-power-station') then item.energy_source.emissions_per_minute = item.energy_source.emissions_per_minute * (tier - source.min + 2) else