From ac21f072c41390b0ad2d1a9f92de79dcc990f0d6 Mon Sep 17 00:00:00 2001 From: PreLeyZero Date: Thu, 5 May 2022 17:36:12 +0200 Subject: [PATCH] electrolysis update + K2 fix --- prototypes/248k_techs.lua | 10 +++- prototypes/el_recipes.lua | 4 +- prototypes/electronic/el_charger.lua | 7 ++- prototypes/fi_recipes.lua | 2 +- prototypes/fu_recipes.lua | 30 ++++++++-- scripts/krastorio2/data-final-fixes.lua | 77 +++++++++++++++++++++++++ 6 files changed, 115 insertions(+), 15 deletions(-) diff --git a/prototypes/248k_techs.lua b/prototypes/248k_techs.lua index 34927c6..974cb3a 100644 --- a/prototypes/248k_techs.lua +++ b/prototypes/248k_techs.lua @@ -2030,6 +2030,10 @@ data:extend({ type = 'unlock-recipe', recipe = 'fu_boiler_hydrogen_oxygen_recipe', }, + { + type = 'unlock-recipe', + recipe = 'fu_charger_hydrogen_oxygen_recipe', + }, { type = 'unlock-recipe', recipe = 'fu_boiler_recipe', @@ -2073,7 +2077,7 @@ data:extend({ }, { type = 'unlock-recipe', - recipe = 'fu_charger_hydrogen_oxygen_recipe', + recipe = 'fu_charger_hydrogen_oxygen_1_recipe', }, }, unit = { @@ -2103,7 +2107,7 @@ data:extend({ }, { type = 'unlock-recipe', - recipe = 'fu_charger_hydrogen_oxygen_1_recipe', + recipe = 'fu_charger_hydrogen_oxygen_2_recipe', }, }, unit = { @@ -2134,7 +2138,7 @@ data:extend({ }, { type = 'unlock-recipe', - recipe = 'fu_charger_hydrogen_oxygen_2_recipe', + recipe = 'fu_charger_hydrogen_oxygen_3_recipe', }, }, unit = { diff --git a/prototypes/el_recipes.lua b/prototypes/el_recipes.lua index ce7ae9c..9e3c6f1 100644 --- a/prototypes/el_recipes.lua +++ b/prototypes/el_recipes.lua @@ -171,7 +171,7 @@ data:extend({ results = { {type="fluid", name="el_kerosene", amount=120}, {type="fluid", name="light-oil", amount=90}, - {type="fluid", name="water", amount=90}, + {type="fluid", name="water", amount=70}, }, result_count = 1, energy_required = 5, @@ -1258,7 +1258,7 @@ data:extend({ enabled = 'false', category = 'el_charger_category', ingredients = { - {type='item', name='el_energy_crystal_item', amount=1, propability=0.95}, + {type='item', name='el_energy_crystal_item', amount=1}, }, result = 'el_energy_crystal_charged_item', result_count = 1, diff --git a/prototypes/electronic/el_charger.lua b/prototypes/electronic/el_charger.lua index 012a438..9ce31b8 100644 --- a/prototypes/electronic/el_charger.lua +++ b/prototypes/electronic/el_charger.lua @@ -27,7 +27,8 @@ data:extend({ --prototype { name = 'el_charger_entity', - type = 'furnace', + --type = 'furnace', + type = 'assembling-machine', icon = sprite('icon.png'), icon_size = 64, flags = {"player-creation","placeable-neutral"}, @@ -41,8 +42,8 @@ data:extend({ result = 'el_charger_item', }, crafting_categories = {'el_charger_category'}, - result_inventory_size = 1, - source_inventory_size = 1, + --result_inventory_size = 1, + --source_inventory_size = 1, crafting_speed = 1, --fixed_recipe = 'el_water_pressure_recipe', energy_source = { diff --git a/prototypes/fi_recipes.lua b/prototypes/fi_recipes.lua index ac8d183..37dfd1d 100644 --- a/prototypes/fi_recipes.lua +++ b/prototypes/fi_recipes.lua @@ -1375,7 +1375,7 @@ data:extend({ enabled = 'false', category = 'el_charger_category', ingredients = { - {type='item', name='fi_energy_crystal_item', amount=1, propability=0.95}, + {type='item', name='fi_energy_crystal_item', amount=1}, }, result = 'fi_energy_crystal_charged_item', result_count = 1, diff --git a/prototypes/fu_recipes.lua b/prototypes/fu_recipes.lua index eddd594..a700227 100644 --- a/prototypes/fu_recipes.lua +++ b/prototypes/fu_recipes.lua @@ -1648,7 +1648,7 @@ data:extend({ enabled = 'false', category = 'el_charger_category', ingredients = { - {type='item', name='fu_materials_energy_crystal', amount=1, propability=0.95}, + {type='item', name='fu_materials_energy_crystal', amount=1}, }, result = 'fu_materials_energy_charged_crystal', result_count = 1, @@ -1662,12 +1662,13 @@ data:extend({ main_product = 'fu_hydrogen', enabled = 'false', ingredients = { - {type="item", name="fi_crushed_coal_item", amount=1}, + {type="item", name="fi_materials_gold", amount=1}, {type="fluid", name="water", amount=150}, }, results = { {type="fluid", name="fu_hydrogen", amount=100}, - {type="fluid", name="fu_oxygen", amount=50} + {type="fluid", name="fu_oxygen", amount=50}, + {type="item", name="fi_materials_gold", amount=1, probability=0.25}, }, result_count = 1, energy_required = 5, @@ -1684,7 +1685,8 @@ data:extend({ }, results = { {type="fluid", name="fu_hydrogen", amount=200}, - {type="fluid", name="fu_oxygen", amount=100} + {type="fluid", name="fu_oxygen", amount=100}, + {type="item", name="fi_materials_gold", amount=1, probability=0.55}, }, result_count = 1, energy_required = 5, @@ -1696,12 +1698,28 @@ data:extend({ main_product = 'fu_hydrogen', enabled = 'false', ingredients = { - {type="item", name="fi_materials_titan", amount=1}, + {type="item", name="fi_materials_gold", amount=1}, {type="fluid", name="water", amount=650}, }, results = { {type="fluid", name="fu_hydrogen", amount=500}, - {type="fluid", name="fu_oxygen", amount=150} + {type="fluid", name="fu_oxygen", amount=150}, + {type="item", name="fi_materials_gold", amount=1, probability=0.85}, + }, + result_count = 1, + energy_required = 5, + }, + { + name = 'fu_charger_hydrogen_oxygen_3_recipe', + type = 'recipe', + category = 'el_charger_category', + main_product = 'fu_hydrogen', + enabled = 'false', + ingredients = { + {type="fluid", name="water", amount=1100}, + }, + results = { + {type="fluid", name="fu_hydrogen", amount=1000}, }, result_count = 1, energy_required = 5, diff --git a/scripts/krastorio2/data-final-fixes.lua b/scripts/krastorio2/data-final-fixes.lua index 05276ac..873fa40 100644 --- a/scripts/krastorio2/data-final-fixes.lua +++ b/scripts/krastorio2/data-final-fixes.lua @@ -18,6 +18,83 @@ data:extend({ result_count = 10, category = "chemistry" }, + { + name = 'fu_charger_hydrogen_oxygen_recipe', + type = 'recipe', + category = 'el_charger_category', + main_product = 'hydrogen', + enabled = 'false', + ingredients = { + {type="item", name="fi_materials_gold", amount=1}, + {type="fluid", name="water", amount=150}, + }, + results = { + {type="fluid", name="hydrogen", amount=100}, + {type="fluid", name="oxygen", amount=50}, + {type="item", name="fi_materials_gold", amount=1, probability=0.25}, + }, + result_count = 1, + energy_required = 5, + subgroup = 'fu_item_subgroup_e', + order = 'a-a', + }, + { + name = 'fu_charger_hydrogen_oxygen_1_recipe', + type = 'recipe', + category = 'el_charger_category', + main_product = 'hydrogen', + enabled = 'false', + ingredients = { + {type="item", name="fi_materials_gold", amount=1}, + {type="fluid", name="water", amount=300}, + }, + results = { + {type="fluid", name="hydrogen", amount=200}, + {type="fluid", name="oxygen", amount=100}, + {type="item", name="fi_materials_gold", amount=1, probability=0.55}, + }, + result_count = 1, + energy_required = 5, + subgroup = 'fu_item_subgroup_e', + order = 'a-a', + }, + { + name = 'fu_charger_hydrogen_oxygen_2_recipe', + type = 'recipe', + category = 'el_charger_category', + main_product = 'hydrogen', + enabled = 'false', + ingredients = { + {type="item", name="fi_materials_gold", amount=1}, + {type="fluid", name="water", amount=650}, + }, + results = { + {type="fluid", name="hydrogen", amount=500}, + {type="fluid", name="oxygen", amount=150}, + {type="item", name="fi_materials_gold", amount=1, probability=0.85}, + }, + result_count = 1, + energy_required = 5, + subgroup = 'fu_item_subgroup_e', + order = 'a-a', + }, + { + name = 'fu_charger_hydrogen_oxygen_3_recipe', + type = 'recipe', + category = 'el_charger_category', + main_product = 'hydrogen', + enabled = 'false', + ingredients = { + {type="fluid", name="water", amount=1100}, + }, + results = { + {type="fluid", name="hydrogen", amount=1000}, + }, + result_count = 1, + energy_required = 5, + subgroup = 'fu_item_subgroup_e', + order = 'a-a', + }, { name = 'fu_boiler_hydrogen_oxygen_3_recipe', type = 'recipe',