From 7144afaea6804a008a7d5663c759951a811ac8ba Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 4 Jan 2022 15:14:41 +0100 Subject: [PATCH] fixed crash with krastorio 2 and omnifluid --- changelog.txt | 5 ++++ info.json | 2 +- prototypes/el_recipes.lua | 35 ++++++++++++------------- scripts/krastorio2/data-final-fixes.lua | 2 ++ 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/changelog.txt b/changelog.txt index 55b6f5e..bd3417d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.9.4 +Date: 4.1.2022 + Bugfixes: + - fixed crash with krastorio 2 and omnifluid +--------------------------------------------------------------------------------------------------- Version: 0.9.3 Date: 12.10.2021 Changes: diff --git a/info.json b/info.json index a7e9869..a28c2ab 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "248k", - "version": "0.9.3", + "version": "0.9.4", "title": "248k Mod", "author": "PreLeyZero", "factorio_version": "1.1", diff --git a/prototypes/el_recipes.lua b/prototypes/el_recipes.lua index c0f1f40..7789161 100644 --- a/prototypes/el_recipes.lua +++ b/prototypes/el_recipes.lua @@ -10,7 +10,6 @@ end --settings check --if config('recipe_enabled') then --end - --recipe data:extend({ --el_solar @@ -141,7 +140,7 @@ data:extend({ {type="fluid", name="steam", amount=240, temperature=165}, }, results = { - {type="fluid", name="el_pressurized_water", amount=240, temperature = '500'}, + {type="fluid", name="el_pressurized_water", amount=240, temperature =500}, {type="fluid", name="water", amount=240}, }, energy_required = 2, @@ -508,7 +507,7 @@ data:extend({ {type="item", name="el_energy_crystal_item", amount=2}, }, results = { - {type="fluid", name="el_ki_memory_fluid", amount=200, temperature = '500'}, + {type="fluid", name="el_ki_memory_fluid", amount=200, temperature =500}, }, energy_required = 20, }, @@ -525,7 +524,7 @@ data:extend({ {type="item", name="el_energy_crystal_item", amount=2}, }, results = { - {type="fluid", name="el_ki_memory_fluid", amount=200, temperature = '500'}, + {type="fluid", name="el_ki_memory_fluid", amount=200, temperature =500}, }, energy_required = 20, }, @@ -542,7 +541,7 @@ data:extend({ {type="item", name="el_energy_crystal_item", amount=1}, }, results = { - {type="fluid", name="el_ki_memory_fluid", amount=200, temperature = '500'}, + {type="fluid", name="el_ki_memory_fluid", amount=200, temperature =500}, }, energy_required = 20, }, @@ -558,7 +557,7 @@ data:extend({ {type="item", name="red-wire", amount=8}, }, results = { - {type="fluid", name="el_ki_memory_fluid", amount=200, temperature = '500'}, + {type="fluid", name="el_ki_memory_fluid", amount=200, temperature =500}, }, energy_required = 20, }, @@ -574,7 +573,7 @@ data:extend({ {type="item", name="fu_space_probe_science_item", amount=2}, }, results = { - {type="fluid", name="fu_ki_circuit_fluid", amount=200, temperature = '500'}, + {type="fluid", name="fu_ki_circuit_fluid", amount=200, temperature =500}, }, energy_required = 20, }, @@ -590,7 +589,7 @@ data:extend({ {type="item", name="fu_space_probe_science_item", amount=1}, }, results = { - {type="fluid", name="fu_ki_circuit_fluid", amount=200, temperature = '500'}, + {type="fluid", name="fu_ki_circuit_fluid", amount=200, temperature =500}, }, energy_required = 20, }, @@ -605,7 +604,7 @@ data:extend({ {type="item", name="advanced-circuit", amount=16}, }, results = { - {type="fluid", name="fu_ki_circuit_fluid", amount=200, temperature = '500'}, + {type="fluid", name="fu_ki_circuit_fluid", amount=200, temperature =500}, }, energy_required = 20, }, @@ -620,7 +619,7 @@ data:extend({ {type="item", name="advanced-circuit", amount=12}, }, results = { - {type="fluid", name="fu_ki_circuit_fluid", amount=200, temperature = '500'}, + {type="fluid", name="fu_ki_circuit_fluid", amount=200, temperature =500}, }, energy_required = 20, }, @@ -636,7 +635,7 @@ data:extend({ {type="item", name="battery", amount=10}, }, results = { - {type="fluid", name="fi_ki_circuit_fluid", amount=200, temperature = '500'}, + {type="fluid", name="fi_ki_circuit_fluid", amount=200, temperature =500}, }, energy_required = 20, }, @@ -652,7 +651,7 @@ data:extend({ {type="item", name="battery", amount=8}, }, results = { - {type="fluid", name="fi_ki_circuit_fluid", amount=200, temperature = '500'}, + {type="fluid", name="fi_ki_circuit_fluid", amount=200, temperature =500}, }, energy_required = 20, }, @@ -667,7 +666,7 @@ data:extend({ {type="item", name="battery", amount=8}, }, results = { - {type="fluid", name="fi_ki_circuit_fluid", amount=200, temperature = '500'}, + {type="fluid", name="fi_ki_circuit_fluid", amount=200, temperature =500}, }, energy_required = 20, }, @@ -682,7 +681,7 @@ data:extend({ {type="item", name="battery", amount=4}, }, results = { - {type="fluid", name="fi_ki_circuit_fluid", amount=200, temperature = '500'}, + {type="fluid", name="fi_ki_circuit_fluid", amount=200, temperature =500}, {type="item", name="uranium-235", amount=1}, }, energy_required = 20, @@ -719,7 +718,7 @@ data:extend({ {type="item", name="el_energy_crystal_item", amount=2}, }, results = { - {type="fluid", name="el_ki_cpu_fluid", amount=200, temperature = '500'}, + {type="fluid", name="el_ki_cpu_fluid", amount=200, temperature =500}, }, energy_required = 20, }, @@ -736,7 +735,7 @@ data:extend({ {type="item", name="el_energy_crystal_item", amount=2}, }, results = { - {type="fluid", name="el_ki_cpu_fluid", amount=200, temperature = '500'}, + {type="fluid", name="el_ki_cpu_fluid", amount=200, temperature =500}, }, energy_required = 20, }, @@ -753,7 +752,7 @@ data:extend({ {type="item", name="el_energy_crystal_item", amount=1}, }, results = { - {type="fluid", name="el_ki_cpu_fluid", amount=200, temperature = '500'}, + {type="fluid", name="el_ki_cpu_fluid", amount=200, temperature =500}, }, energy_required = 20, }, @@ -769,7 +768,7 @@ data:extend({ {type="item", name="green-wire", amount=8}, }, results = { - {type="fluid", name="el_ki_cpu_fluid", amount=200, temperature = '500'}, + {type="fluid", name="el_ki_cpu_fluid", amount=200, temperature =500}, }, energy_required = 20, }, diff --git a/scripts/krastorio2/data-final-fixes.lua b/scripts/krastorio2/data-final-fixes.lua index 6f3e75f..73465ec 100644 --- a/scripts/krastorio2/data-final-fixes.lua +++ b/scripts/krastorio2/data-final-fixes.lua @@ -228,6 +228,7 @@ if (not mods["RealisticFusionPower"]) then end data.raw.recipe["fu_burner_recipe"].hidden = true +--[[ table.insert(data.raw.technology["gr_stage_tech"].unit.ingredients, {"fu_space_probe_science_item", 1}) table.insert(data.raw.technology["gr_train_tech"].unit.ingredients, {"fu_space_probe_science_item", 1}) table.insert(data.raw.technology["gr_train_plus_tech"].unit.ingredients, {"fu_space_probe_science_item", 1}) @@ -247,6 +248,7 @@ table.insert(data.raw.technology["fu_ki_plus_1_tech"].unit.ingredients, {"fi_ki_ table.insert(data.raw.technology["fu_ki_plus_1_tech"].unit.ingredients, {"fu_ki_science", 1}) table.insert(data.raw.technology["fu_ki_plus_2_tech"].unit.ingredients, {"fi_ki_science", 1}) table.insert(data.raw.technology["fu_ki_plus_2_tech"].unit.ingredients, {"fu_ki_science", 1}) +--]] table.insert(data.raw["generator-equipment"]["fi_train_equipment_generator_item"].categories,"vehicle-equipment")