diff --git a/changelog.txt b/changelog.txt index 4f5e84f..5af07ae 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,13 @@ --------------------------------------------------------------------------------------------------- +Version: 1.0.4 +Date: 30.3.2022 + Features: + - added kovarex like processing for rich water + - added corrosive solution and its use in fuel reprocessing + Changes: + - fu stage burner is now furnace, which no longer outputs power + - added dirty water to water conversion in purifier for early game +--------------------------------------------------------------------------------------------------- Version: 1.0.3 Date: 23.3.2022 Features: diff --git a/locale/en/lang_en.cfg b/locale/en/lang_en.cfg index b995c98..e054c7a 100644 --- a/locale/en/lang_en.cfg +++ b/locale/en/lang_en.cfg @@ -80,6 +80,9 @@ fi_materials_pure_titan=Pure titanium fi_materials_GFK=Fiberglass reinforced plastic fi_materials_NFK=Natural fiber reinforced plastic fi_materials_waste=Nuclear waste +fi_materials_empty_solution=Empty solution container +fi_materials_solution=Corrosive solution +fi_materials_rich_powder=Rich powder @@ -386,6 +389,7 @@ fi_modules_3_tech=Mega 248k modules fi_modules_4_tech=Giga 248k modules fi_modules_5_tech=Tera 248k modules fi_modules_6_tech=Peta 248k modules +fi_advanced_purifier_tech=Highly advanced purifaction @@ -492,8 +496,8 @@ el_stage_eff=Allows you to get into the first stage of the 248k mod. el_energy_eff=Basic energy production el_kerosene_tech_eff=Produce kerosene from oil and desulfurize it el_ki_tech_eff=This machine functions as a module effect spreader. Each core has a distinct channel, which can be changed through the core gui. Note: only one core is allowed per channel. In the middle of the core are module slots - place some modules inside and a working core will broadcast their effects to its channel. Once a beacon is placed down it will automatically get registered in the standard channel. So to keep things simple just supply the core with enough liquid and tune its channel to the standard channel. -x2_ki_tech_eff=Double the module effects of all your KI cores! -x3_ki_tech_eff=Triple the module effects of all your KI cores - stupidly insane if you ask me! +x2_ki_tech_eff=Double the module effects of all your KI cores! (Only works on KI3 beacon) +x3_ki_tech_eff=Triple the module effects of all your KI cores - stupidly insane if you ask me! (Only works on KI3 beacon) sup_1_ki_tech_eff=+150 supported beacons sup_2_ki_tech_eff=+250 supported beacons sup_3_ki_tech_eff=+500 supported beacons diff --git a/prototypes/248k_subgroups.lua b/prototypes/248k_subgroups.lua index 8c10556..aaaca3e 100644 --- a/prototypes/248k_subgroups.lua +++ b/prototypes/248k_subgroups.lua @@ -344,6 +344,10 @@ data:extend({ name = 'fu_boiler_crafting_category', type = 'recipe-category', }, + { + name = 'fu_burner_category', + type = 'recipe-category', + }, --fu_reactors { name = 'fu_stelar_reactor_crafting_category', diff --git a/prototypes/248k_techs.lua b/prototypes/248k_techs.lua index 71e541c..6e89728 100644 --- a/prototypes/248k_techs.lua +++ b/prototypes/248k_techs.lua @@ -195,6 +195,10 @@ data:extend({ { type = 'unlock-recipe', recipe = 'el_purify_uranium_acidic_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'el_dirty_water_vent_2_recipe', } }, unit = { @@ -1048,6 +1052,40 @@ data:extend({ time = 30, }, }, + { + name = 'fi_advanced_purifier_tech', + type = 'technology', + icon = sprite('fi_purifier_2_tech.png'), + icon_size = 128, + prerequisites = {'fi_purifier_tech', 'uranium-processing'}, + effects = { + { + type = 'unlock-recipe', + recipe = 'fi_empty_solution_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_solution_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_rich_powder_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_extract_rich_powder_recipe', + }, + }, + unit = { + count = '600', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1,}, + }, + time = 30, + }, + }, { name = 'fi_purifier_2_tech', type = 'technology', @@ -1122,7 +1160,7 @@ data:extend({ type = 'technology', icon = sprite('fi_refining_tech.png'), icon_size = 128, - prerequisites = {'fi_purifier_2_tech'}, + prerequisites = {'fi_purifier_2_tech', 'fi_advanced_purifier_tech'}, effects = { { type = 'unlock-recipe', @@ -1839,6 +1877,10 @@ data:extend({ type = 'unlock-recipe', recipe = 'fu_boiler_recipe', }, + { + type = 'unlock-recipe', + recipe = 'fu_burn_oxygen_recipe', + }, { type = 'unlock-recipe', recipe = 'fu_burner_recipe', diff --git a/prototypes/el_recipes.lua b/prototypes/el_recipes.lua index 1c76e7f..03caa08 100644 --- a/prototypes/el_recipes.lua +++ b/prototypes/el_recipes.lua @@ -1179,6 +1179,21 @@ data:extend({ energy_required = 0.2, order = 'a-b', }, + { + name = 'el_dirty_water_vent_2_recipe', + type = 'recipe', + enabled = 'false', + subgroup = 'el_item_subgroup_a', + category = 'el_purifier_category', + ingredients = { + {type="fluid", name="el_dirty_water", amount=100}, + }, + results = { + {type="fluid", name="water", amount=100}, + }, + energy_required = 0.2, + order = 'a-b', + }, { name = 'el_dirty_water_landfill_recipe', type = 'recipe', diff --git a/prototypes/fi_recipes.lua b/prototypes/fi_recipes.lua index 7a847c4..7114372 100644 --- a/prototypes/fi_recipes.lua +++ b/prototypes/fi_recipes.lua @@ -192,10 +192,12 @@ data:extend({ main_product = 'fi_plutonium239_item', ingredients = { {'fi_used_basic_fuel_item',6}, + {type="item", name="fi_materials_solution", amount=1}, }, results = { {'fi_plutonium239_item',1}, - {'fi_materials_waste',1} + {'fi_materials_waste',1}, + {type="item", name="fi_materials_empty_solution", amount=1, probability=0.95}, }, result_count = 1, energy_required = 20, @@ -226,10 +228,12 @@ data:extend({ main_product = 'fi_uranium233_item', ingredients = { {'fi_used_basic_thorium_fuel_item',6}, + {type="item", name="fi_materials_solution", amount=1}, }, results = { {'fi_uranium233_item',1}, - {'fi_materials_waste',1} + {'fi_materials_waste',1}, + {type="item", name="fi_materials_empty_solution", amount=1, probability=0.95}, }, result_count = 1, energy_required = 20, @@ -256,10 +260,12 @@ data:extend({ category = 'centrifuging', ingredients = { {'fi_used_advanced_fuel_item',4}, + {type="item", name="fi_materials_solution", amount=1}, }, results = { {'uranium-238',1}, - {'fi_materials_waste',1} + {'fi_materials_waste',1}, + {type="item", name="fi_materials_empty_solution", amount=1, probability=0.95}, }, result_count = 3, energy_required = 20, @@ -275,10 +281,12 @@ data:extend({ main_product = 'uranium-238', ingredients = { {'fi_used_advanced_thorium_fuel_item',4}, + {type="item", name="fi_materials_solution", amount=1}, }, results = { {'uranium-238',1}, - {'fi_materials_waste',1} + {'fi_materials_waste',1}, + {type="item", name="fi_materials_empty_solution", amount=1, probability=0.95}, }, result_count = 3, energy_required = 20, @@ -294,10 +302,12 @@ data:extend({ main_product = 'uranium-238', ingredients = { {'fi_used_pure_fuel_item',4}, + {type="item", name="fi_materials_solution", amount=1}, }, results = { {'uranium-238',1}, - {'fi_materials_waste',1} + {'fi_materials_waste',1}, + {type="item", name="fi_materials_empty_solution", amount=1, probability=0.95}, }, result_count = 3, energy_required = 20, @@ -1114,5 +1124,84 @@ data:extend({ results = {}, energy_required = 150, order = 'a-b', + always_show_made_in = true, + }, + { + name = 'fi_empty_solution_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + main_product = 'fi_materials_empty_solution', + ingredients = { + {type="item", name="fi_materials_GFK", amount=6}, + {type="item", name="empty-barrel", amount=1}, + }, + results = { + {type="item", name="fi_materials_empty_solution", amount=1}, + }, + energy_required = 1, + order = 'a-b', + --always_show_made_in = true, + }, + { + name = 'fi_solution_recipe', + type = 'recipe', + enabled = 'false', + category = 'chemistry', + main_product = 'fi_materials_solution', + ingredients = { + {type="fluid", name="fi_strong_acid", amount=240}, + {type="fluid", name="sulfuric-acid", amount=120}, + {type="item", name="fi_materials_empty_solution", amount=1}, + {type="item", name="el_lithium_item", amount=3}, + }, + results = { + {type="fluid", name="el_acidic_water", amount=20}, + {type="item", name="fi_materials_solution", amount=1, probability=0.95}, + {type="item", name="fi_materials_empty_solution", amount=1, probability=0.05}, + }, + energy_required = 6, + order = 'a-b', + always_show_made_in = true, + }, + --purifier 10 stone + 100 strong acid = 50 rich water + --enrichment 10/2 stone + 120 strong acid = 150 rich water + { + name = 'fi_rich_powder_recipe', + type = 'recipe', + enabled = 'false', + category = 'centrifuging', + main_product = 'fi_materials_rich_powder', + ingredients = { + {type="item", name="fi_materials_solution", amount=1}, + {type="item", name="fi_crushed_stone_item", amount=10}, + {type="item", name="fi_crushed_coal_item", amount=20}, + }, + results = { + {type="item", name="fi_crushed_coal_item", amount=17}, + {type="item", name="fi_materials_rich_powder", amount=3}, + {type="item", name="fi_materials_empty_solution", amount=1}, + }, + energy_required = 6, + order = 'a-b', + always_show_made_in = true, + }, + { + name = 'fi_extract_rich_powder_recipe', + type = 'recipe', + enabled = 'false', + category = 'chemistry', + main_product = 'fi_dirty_water', + ingredients = { + {type="item", name="fi_materials_rich_powder", amount=1}, + {type="fluid", name="water", amount=300}, + }, + results = { + {type="fluid", name="fi_dirty_water", amount=250}, + {type="fluid", name="el_dirty_water", amount=50}, + }, + energy_required = 1, + order = 'a-b', + always_show_made_in = true, }, }) \ No newline at end of file diff --git a/prototypes/fission/fi_materials.lua b/prototypes/fission/fi_materials.lua index 807be0c..aac4337 100644 --- a/prototypes/fission/fi_materials.lua +++ b/prototypes/fission/fi_materials.lua @@ -144,5 +144,41 @@ data:extend({ subgroup = 'fi_item_subgroup_a', order = 'f-a', }, + { + name = 'fi_materials_solution', + type = 'item', + icon = sprite('waste.png'), + icon_size = 64, + stack_size = 1, + subgroup = 'fi_item_subgroup_a-c', + order = 'f-a', + }, + { + name = 'fi_materials_empty_solution', + type = 'item', + icon = sprite('empty_solution.png'), + icon_size = 64, + stack_size = 20, + subgroup = 'fi_item_subgroup_b', + order = 'f-a', + }, + { + name = 'fi_materials_solution', + type = 'item', + icon = sprite('solution.png'), + icon_size = 64, + stack_size = 20, + subgroup = 'fi_item_subgroup_b', + order = 'f-b', + }, + { + name = 'fi_materials_rich_powder', + type = 'item', + icon = sprite('rich_powder.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fi_item_subgroup_a-b', + order = 'b-a', + }, }) diff --git a/prototypes/fission/fi_modules.lua b/prototypes/fission/fi_modules.lua index d10da3e..392a5ad 100644 --- a/prototypes/fission/fi_modules.lua +++ b/prototypes/fission/fi_modules.lua @@ -43,7 +43,9 @@ local limitation_list = { 'gr_gold_wire_recipe', 'gr_circuit_recipe', 'gr_materials_stack_up_item_recipe', - 'gr_materials_stack_down_item_recipe' + 'gr_materials_stack_down_item_recipe', + 'fi_rich_powder_recipe', + 'fi_strong_acid_recipe' } --item diff --git a/prototypes/fu_recipes.lua b/prototypes/fu_recipes.lua index b0914bb..1eb4227 100644 --- a/prototypes/fu_recipes.lua +++ b/prototypes/fu_recipes.lua @@ -1534,7 +1534,23 @@ data:extend({ result_count = 1, energy_required = 4, }, - + --Burner recipe + { + name = 'fu_burn_oxygen_recipe', + type = 'recipe', + category = 'fu_burner_category', + icon = '__248k__/ressources/elements/fu_oxygen.png', + icon_size = 64, + enabled = 'false', + ingredients = { + {type="fluid", name="fu_oxygen", amount=60}, + }, + results = {}, + result_count = 1, + energy_required = 1, + always_show_made_in = true, + subgroup = 'fu_item_subgroup_f', + }, }) \ No newline at end of file diff --git a/prototypes/fusion/fu_burner.lua b/prototypes/fusion/fu_burner.lua index 3b95242..450378f 100644 --- a/prototypes/fusion/fu_burner.lua +++ b/prototypes/fusion/fu_burner.lua @@ -25,10 +25,10 @@ data:extend({ data:extend({ { name = 'fu_burner_entity', - type = 'generator', + type = 'furnace', icon = sprite('entity_icon.png'), icon_size = 64, - flags = {"player-creation","placeable-neutral", "not-rotatable"}, + flags = {"player-creation","placeable-neutral"}, --minable minable = { mining_time = 1, @@ -36,54 +36,55 @@ data:extend({ }, max_health = 150, corpse = 'small-remnants', + crafting_categories = {'fu_burner_category'}, collision_box = {{-1.4,-1.4},{1.4,1.4}}, selection_box = {{-1.5,-1.5},{1.5,1.5}}, + result_inventory_size = 2, + source_inventory_size = 1, --energy effectivity = 1, energy_source = { type = 'electric', - usage_priority = 'primary-output', - input_flow_limit = '0W', - output_flow_limit = tostring(config('power_output'))..'W', + usage_priority = 'secondary-input', + buffer_capacity = '5MJ', }, - max_power_output = tostring(config('power_output'))..'W', - maximum_temperature = 40, - fluid_usage_per_tick = 1, - fluid_box = { - base_area = 1, - height = 2, - base_level = -1, - filter = 'fu_oxygen', - minimum_temperature = 0, - maximum_temperature = 40, - production_type = 'input-output', - pipe_connections = { - {type = "input-output", position = {2, 0}}, - {type = "input-output", position = {-2, 0}}, + crafting_speed = 1, + energy_usage = '500KW', + fluid_boxes = { + { + base_area = 1, + height = 2, + base_level = -1, + production_type = 'input', + --pipe_picture = assembler2pipepictures(), + pipe_covers = pipecoverspictures(), + pipe_connections = { + {type = "input", position = {2, 0}}, + --{type = "output", position = {-2, 0}}, + }, }, - }, - fluid_input = { - name = 'fu_oxygen', - minimum_temperature = 0, + { + base_area = 1, + height = 2, + base_level = 1, + production_type = 'output', + --pipe_picture = assembler2pipepictures(), + pipe_covers = pipecoverspictures(), + pipe_connections = { + {type = "output", position = {-2, 0}}, + --{type = "output", position = {-2, 0}}, + }, + } }, --animation - vertical_animation = { + animation = { filename = sprite('entity_animation.png'), size = {420,448}, - scale = 0.26, + scale = 0.265, line_length = 1, frame_count = 1, animation_speed = 0.5, - shift = {0,-0.2} - }, - horizontal_animation = { - filename = sprite('entity_animation.png'), - size = {420,448}, - scale = 0.26, - line_length = 1, - frame_count = 1, - animation_speed = 0.5, - shift = {0,-0.2} + shift = {0,-0.4} }, map_color = {r=0, g=0, b=1, a=1}, working_sound = diff --git a/prototypes/gravitation/gr_black_hole.lua b/prototypes/gravitation/gr_black_hole.lua index f105d17..93e3a0f 100644 --- a/prototypes/gravitation/gr_black_hole.lua +++ b/prototypes/gravitation/gr_black_hole.lua @@ -54,6 +54,7 @@ data:extend({ buffer_capacity = "1TJ", usage_priority = "primary-output", max_input_flow = "0W", + max_output_flow = "1TW", --drain = "1GW" }, light = { diff --git a/ressources/fission/fi_materials/fi_materials_empty_solution.png b/ressources/fission/fi_materials/fi_materials_empty_solution.png new file mode 100644 index 0000000..d3c1f14 Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_empty_solution.png differ diff --git a/ressources/fission/fi_materials/fi_materials_rich_powder.png b/ressources/fission/fi_materials/fi_materials_rich_powder.png new file mode 100644 index 0000000..93e39fb Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_rich_powder.png differ diff --git a/ressources/fission/fi_materials/fi_materials_solution.png b/ressources/fission/fi_materials/fi_materials_solution.png new file mode 100644 index 0000000..590c23a Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_solution.png differ diff --git a/ressources/techs/fi_purifier_2_tech.png b/ressources/techs/fi_purifier_2_tech.png new file mode 100644 index 0000000..9b96772 Binary files /dev/null and b/ressources/techs/fi_purifier_2_tech.png differ diff --git a/scripts/overhaul.lua b/scripts/overhaul.lua index defb68a..88d7515 100644 --- a/scripts/overhaul.lua +++ b/scripts/overhaul.lua @@ -117,6 +117,7 @@ item_table = { --[TECHS] tech_table = { + {"el_grower_tech", "el_kerosene_tech"}, {"automation-2", "el_ALK_tech"}, {"chemical-science-pack", "el_grower_tech"}, {"engine", "el_ALK_tech"}, diff --git a/settings.lua b/settings.lua index d854717..eaa6ca6 100644 --- a/settings.lua +++ b/settings.lua @@ -37,15 +37,6 @@ data:extend({ maximum_value = 10^10, order = 'a', }, - { - name = 'fu_burner_power_output', - type = 'int-setting', - setting_type = 'startup', - default_value = 3500000, - minimum_value = 1, - maximum_value = 10^10, - order = 'a', - }, --el KI1 { name = 'el_ki_beacon_effectivity',