diff --git a/locale/en/lang_en.cfg b/locale/en/lang_en.cfg index 6943d09..40e5402 100644 --- a/locale/en/lang_en.cfg +++ b/locale/en/lang_en.cfg @@ -541,12 +541,11 @@ el_ki_beacon_supply_area=KI1 beacon area el_ki_beacon_blueprintable=Make the KI beacons blueprintable el_ki_core_energy_usage=KI1 core power usage el_ki_core_energy_usage_input=KI1 core power input maximum -el_ki_core_productivity=Enable productivity modules in KI core and amplifier +el_ki_core_productivity=Enable [color=orange]productivity [/color]modules in KI core and amplifier el_burner_kerosene_power_output=Kerosene generator power output -fu_burner_power_output=Fusion Stage burner power output -override_krastorio_endgame=Adjust Krastorio2 recipes for Anti-matter reactor, Intergalactic transreciever -overhaul_mode=Overaul vanilla/Krastorio2 by inserting 248k in progression, aswell as in techs and recipes. NOTE: When 248k is added in already existing save this may cause problems. For best gameplay use this on new world. -overhaul_realistic_reactors=Integrate Realistic Reactors in 248k. Only possible in Overaul mode. +override_krastorio_endgame=Adjust Krastorio2 recipes for Anti-matter reactor, Intergalactic transreciever. +overhaul_mode=Enable Overaul mode. +overhaul_realistic_reactors=Integrate Realistic Reactors in 248k. el_ki_beacon_effectivity_2=KI2 beacon effectivity el_ki_beacon_supply_area_2=KI2 beacon area @@ -557,6 +556,11 @@ el_ki_core_energy_usage_3=KI3 core power usage el_ki_core_energy_usage_input_2=KI2 core power input maximum el_ki_core_energy_usage_input_3=KI3 core power input maximum +[mod-setting-description] +el_ki_core_productivity=Allows to achieve very high productivity values in f.e. crafting machines, so use with caution. +overhaul_mode=Overaul vanilla/Krastorio2 by inserting 248k in progression, aswell as in techs and recipes. \n[color=red]NOTE: When 248k is added in already existing save this may cause problems. For best gameplay use this on new world.[/color] +overhaul_realistic_reactors=248ks nuclear reactor will become a reasearch reactor to guide towards the realistic reactors. \nNuclear Fuel and other are integrated in 248k progression.[color=red] Only possible in Overaul mode.[/color] + [item-limitation] limitation_message=This module can not be used here. diff --git a/prototypes/el_recipes.lua b/prototypes/el_recipes.lua index 7be1dcb..5865cfc 100644 --- a/prototypes/el_recipes.lua +++ b/prototypes/el_recipes.lua @@ -1,8 +1,3 @@ ---local functions -local function config(name) - return settings.startup['el_solar_'..name].value -end - local function sprite(name) return '__248k__/ressources/'..name end diff --git a/prototypes/electronic/el_burner.lua b/prototypes/electronic/el_burner.lua index 2a1eb48..0fdec2b 100644 --- a/prototypes/electronic/el_burner.lua +++ b/prototypes/electronic/el_burner.lua @@ -7,6 +7,22 @@ local function sprite(name) return '__248k__/ressources/electronic/el_burner/el_burner_'..name end +local function burner_output() + if config("power_output") == "2.4MW (normal)" then + return "2.4MW" + end + + if config("power_output") == "3MW (high)" then + return "3MW" + end + + if config("power_output") == "1.2MW (low)" then + return "1.2MW" + end + + return "2.4MW" +end + --item data:extend({ { @@ -72,9 +88,8 @@ data:extend({ type = 'electric', usage_priority = 'primary-output', input_flow_limit = '0W', - output_flow_limit = tostring(config('power_output'))..'W', }, - max_power_output = tostring(config('power_output'))..'W', + max_power_output = burner_output(), --animation animation = { filename = sprite('entity_animation.png'), @@ -114,10 +129,9 @@ data:extend({ type = 'electric', usage_priority = 'primary-output', input_flow_limit = '0W', - output_flow_limit = tostring(config('kerosene_power_output'))..'W', emissions_per_minute = 20, }, - max_power_output = tostring(config('kerosene_power_output'))..'W', + max_power_output = burner_output(), maximum_temperature = 40, fluid_usage_per_tick = 1, fluid_box = { diff --git a/prototypes/electronic/el_ki/el_ki_core.lua b/prototypes/electronic/el_ki/el_ki_core.lua index cdbc877..a0b92db 100644 --- a/prototypes/electronic/el_ki/el_ki_core.lua +++ b/prototypes/electronic/el_ki/el_ki_core.lua @@ -7,6 +7,29 @@ local function sprite(name) return '__248k__/ressources/electronic/el_ki/el_ki_core/el_ki_core_'..name end +local function core_input(core_number) + if core_number == 1 then + if config("energy_usage") == "normal" then return "20MW" end + if config("energy_usage") == "high" then return "40MW" end + if config("energy_usage") == "very high" then return "100MW" end + if config("energy_usage") == "low" then return "10MW" end + end + + if core_number == 2 then + if config("energy_usage") == "normal" then return "200MW" end + if config("energy_usage") == "high" then return "400MW" end + if config("energy_usage") == "very high" then return "1000MW" end + if config("energy_usage") == "low" then return "100MW" end + end + + if core_number == 3 then + if config("energy_usage") == "normal" then return "2000MW" end + if config("energy_usage") == "high" then return "4000MW" end + if config("energy_usage") == "very high" then return "10000MW" end + if config("energy_usage") == "low" then return "1000MW" end + end +end + local allowed_modules = {} if config("productivity") then allowed_modules = {"speed", "productivity", "consumption", "pollution"} @@ -72,9 +95,8 @@ data:extend({ energy_source = { type = 'electric', usage_priority = 'primary-input', - input_flow_limit = config('energy_usage_input')..'W', }, - energy_usage = config('energy_usage')..'W', + energy_usage = core_input(1), fluid_boxes = { { filter = 'el_ki_cpu_fluid', @@ -207,9 +229,8 @@ data:extend({ energy_source = { type = 'electric', usage_priority = 'primary-input', - input_flow_limit = config('energy_usage_input_2')..'W', }, - energy_usage = config('energy_usage_2')..'W', + energy_usage = core_input(2), fluid_boxes = { { filter = 'el_ki_cpu_fluid', @@ -368,9 +389,8 @@ data:extend({ energy_source = { type = 'electric', usage_priority = 'primary-input', - input_flow_limit = config('energy_usage_input_3')..'W', }, - energy_usage = config('energy_usage_3')..'W', + energy_usage = core_input(3), fluid_boxes = { { filter = 'el_ki_cpu_fluid', diff --git a/prototypes/electronic/el_solar.lua b/prototypes/electronic/el_solar.lua index ad635dc..a1ba222 100644 --- a/prototypes/electronic/el_solar.lua +++ b/prototypes/electronic/el_solar.lua @@ -7,6 +7,22 @@ local function sprite(name) return '__248k__/ressources/electronic/el_solar/el_solar_'..name end +local function solar_output() + if config("power_output") == "80kW (normal)" then + return "80KW" + end + + if config("power_output") == "100kW (high)" then + return "100KW" + end + + if config("power_output") == "160kW (very high)" then + return "160KW" + end + + return "80kW" +end + --item data:extend({ { @@ -45,9 +61,8 @@ data:extend({ type = 'electric', usage_priority = 'solar', input_flow_limit = '0W', - output_flow_limit = tostring(config('power_output'))..'W', }, - production = tostring(config('power_output'))..'W', + production = solar_output(), --picture picture = { filename = sprite('entity_picture_1.png'), diff --git a/prototypes/electronic/el_water_generator.lua b/prototypes/electronic/el_water_generator.lua index c27bf1e..bde11a9 100644 --- a/prototypes/electronic/el_water_generator.lua +++ b/prototypes/electronic/el_water_generator.lua @@ -7,6 +7,22 @@ local function sprite(name) return '__248k__/ressources/electronic/el_water_generator/el_water_generator_'..name end +local function water_output() + if config("power_output") == "4MW (normal)" then + return "4MW" + end + + if config("power_output") == "5MW (high)" then + return "5MW" + end + + if config("power_output") == "3MW (low)" then + return "3MW" + end + + return "3MW" +end + --item data:extend({ { @@ -43,7 +59,7 @@ data:extend({ --energy maximum_temperature = 500, fluid_usage_per_tick = 1, - max_power_output = tostring(config('power_output'))..'W', + max_power_output = water_output(), effectivity = 0.9, fluid_box = { base_area = 1, @@ -69,7 +85,6 @@ data:extend({ type = 'electric', usage_priority = 'primary-output', input_flow_limit = '0W', - output_flow_limit = tostring(config('power_output'))..'W', }, --animation vertical_animation = { diff --git a/settings.lua b/settings.lua index 3604088..34de038 100644 --- a/settings.lua +++ b/settings.lua @@ -3,39 +3,27 @@ data:extend({ --Power Output in W { name = 'el_solar_power_output', - type = 'int-setting', + type = 'string-setting', setting_type = 'startup', - default_value = 80000, - minimum_value = 1, - maximum_value = 10^10, - order = 'a', + default_value = "80kW (normal)", + allowed_values = {"80kW (normal)", "100kW (high)", "160kW (very high)"}, + order = 'b', }, { name = 'el_burner_power_output', - type = 'int-setting', + type = 'string-setting', setting_type = 'startup', - default_value = 2400000, - minimum_value = 1, - maximum_value = 10^10, + default_value = "2.4MW (normal)", + allowed_values = {"2.4MW (normal)", "3MW (high)", "1.2MW (low)"}, order = 'a', }, { name = 'el_water_generator_power_output', - type = 'int-setting', + type = 'string-setting', setting_type = 'startup', - default_value = 4000000, - minimum_value = 1, - maximum_value = 10^10, - order = 'a', - }, - { - name = 'el_burner_kerosene_power_output', - type = 'int-setting', - setting_type = 'startup', - default_value = 2400000, - minimum_value = 1, - maximum_value = 10^10, - order = 'a', + default_value = "4MW (normal)", + allowed_values = {"4MW (normal)", "5MW (high)", "3MW (low)"}, + order = 'c', }, --el KI1 { @@ -45,7 +33,7 @@ data:extend({ default_value = 0.5, minimum_value = 0.1, maximum_value = 10, - order = 'a', + order = 'e-a', }, { name = 'el_ki_beacon_effectivity_2', @@ -54,7 +42,7 @@ data:extend({ default_value = 0.5, minimum_value = 0.1, maximum_value = 10, - order = 'a', + order = 'e-b', }, { name = 'el_ki_beacon_effectivity_3', @@ -63,7 +51,7 @@ data:extend({ default_value = 0.5, minimum_value = 0.1, maximum_value = 10, - order = 'a', + order = 'e-c', }, { name = 'el_ki_beacon_supply_area', @@ -72,7 +60,7 @@ data:extend({ default_value = 3, minimum_value = 1, maximum_value = 10, - order = 'a', + order = 'f-a', }, { name = 'el_ki_beacon_supply_area_2', @@ -81,7 +69,7 @@ data:extend({ default_value = 4, minimum_value = 1, maximum_value = 10, - order = 'a', + order = 'f-b', }, { name = 'el_ki_beacon_supply_area_3', @@ -90,83 +78,29 @@ data:extend({ default_value = 5, minimum_value = 1, maximum_value = 10, - order = 'a', + order = 'f-c', }, { name = 'el_ki_beacon_blueprintable', type = 'bool-setting', setting_type = 'startup', default_value = true, - order = 'a', + order = 'g', }, { name = 'el_ki_core_productivity', type = 'bool-setting', setting_type = 'startup', - default_value = true, - order = 'a', + default_value = false, + order = 'h', }, { name = 'el_ki_core_energy_usage', - type = 'int-setting', + type = 'string-setting', setting_type = 'startup', - default_value = 20*10^6, - minimum_value = 1, - maximum_value = 100000000, - order = 'a', - }, - { - name = 'el_ki_core_energy_usage_2', - type = 'int-setting', - setting_type = 'startup', - default_value = 20*10^7, - minimum_value = 1, - maximum_value = 10^10, - order = 'a', - }, - { - name = 'el_ki_core_energy_usage_3', - type = 'int-setting', - setting_type = 'startup', - default_value = 20*10^8, - minimum_value = 1, - maximum_value = 10^11, - order = 'a', - }, - { - name = 'el_ki_core_energy_usage_input', - type = 'int-setting', - setting_type = 'startup', - default_value = 30*10^6, - minimum_value = 1, - maximum_value = 100000000, - order = 'a', - }, - { - name = 'el_ki_core_energy_usage_input_2', - type = 'int-setting', - setting_type = 'startup', - default_value = 30*10^7, - minimum_value = 1, - maximum_value = 10^10, - order = 'a', - }, - { - name = 'el_ki_core_energy_usage_input_3', - type = 'int-setting', - setting_type = 'startup', - default_value = 30*10^8, - minimum_value = 1, - maximum_value = 10^11, - order = 'a', - }, - --Recipe enabled - { - name = 'el_solar_recipe_enabled', - type = 'bool-setting', - setting_type = 'startup', - default_value = true, - order = 'b', + default_value = "normal", + allowed_values = {"normal", "high", "very high", "low"}, + order = 'd', }, --final fixes { @@ -174,20 +108,20 @@ data:extend({ type = 'bool-setting', setting_type = 'startup', default_value = true, - order = 'b', + order = 'i-b', }, { name = 'overhaul_mode', type = 'bool-setting', setting_type = 'startup', default_value = true, - order = 'b', + order = 'i-a', }, { name = 'overhaul_realistic_reactors', type = 'bool-setting', setting_type = 'startup', default_value = true, - order = 'b', + order = 'i-c', }, }) \ No newline at end of file