diff --git a/changelog.txt b/changelog.txt index 66c4e83..4f5e84f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,11 @@ --------------------------------------------------------------------------------------------------- +Version: 1.0.3 +Date: 23.3.2022 + Features: + - integrated some of k2 equipment into overhul mode including personal batteries, shields and power generating equipment + Bugfixes: + - fixed ore purifaction needing logistic science as prerequisite +--------------------------------------------------------------------------------------------------- Version: 1.0.2 Date: 23.3.2022 Features: diff --git a/control.lua b/control.lua index 9254d2f..4b242f8 100644 --- a/control.lua +++ b/control.lua @@ -17,7 +17,7 @@ function print_start_message() game.print("If you wish to play 248k as an overhaul mod with tech and item integration, especially in Krastorio2 turn on the mod setting", {r=0.5, g=0, b=0.5}) elseif settings.startup['overhaul_mode'].value == true then game.print("You are currently playing 248k on overhaul Mode.", {r=0.5, g=0, b=0.5}) - game.print("If you wish to play 248k as an overhaul mod without tech and item integration turn off the mod setting", {r=0.5, g=0, b=0.5}) + game.print("If you wish to play 248k as an standalone mod without tech and item integration turn off the mod setting", {r=0.5, g=0, b=0.5}) end end diff --git a/info.json b/info.json index d79aa38..610461b 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "248k", - "version": "1.0.2", + "version": "1.0.3", "title": "248k Mod", "author": "PreLeyZero", "factorio_version": "1.1", diff --git a/migrations/248k-1.0.0.lua b/migrations/248k-1.0.0.lua index c873901..5c997c9 100644 --- a/migrations/248k-1.0.0.lua +++ b/migrations/248k-1.0.0.lua @@ -3,5 +3,5 @@ if settings.startup['overhaul_mode'].value == false then game.print("If you wish to play 248k as an overhaul mod with tech and item integration, especially in Krastorio2 turn on the mod setting", {r=0.5, g=0, b=0.5}) elseif settings.startup['overhaul_mode'].value == true then game.print("You are currently playing 248k on overhaul Mode.", {r=0.5, g=0, b=0.5}) - game.print("If you wish to play 248k as an overhaul mod without tech and item integration turn off the mod setting", {r=0.5, g=0, b=0.5}) + game.print("If you wish to play 248k as an standalone mod without tech and item integration turn off the mod setting", {r=0.5, g=0, b=0.5}) end \ No newline at end of file diff --git a/migrations/248k-1.0.3.lua b/migrations/248k-1.0.3.lua new file mode 100644 index 0000000..7d65c32 --- /dev/null +++ b/migrations/248k-1.0.3.lua @@ -0,0 +1,13 @@ +if settings.startup['overhaul_mode'].value == false then + game.print("You are currently playing 248k on standalone Mode.", {r=0.5, g=0, b=0.5}) + game.print("If you wish to play 248k as an overhaul mod with tech and item integration, especially in Krastorio2 turn on the mod setting", {r=0.5, g=0, b=0.5}) +elseif settings.startup['overhaul_mode'].value == true then + game.print("You are currently playing 248k on overhaul Mode.", {r=0.5, g=0, b=0.5}) + game.print("If you wish to play 248k as an standalone mod without tech and item integration turn off the mod setting", {r=0.5, g=0, b=0.5}) +end + +for _, force in pairs(game.forces) do + force.reset_recipes() + force.reset_technologies() + force.reset_technology_effects() +end \ No newline at end of file diff --git a/scripts/krastorio2/overhaul.lua b/scripts/krastorio2/overhaul.lua index 4ccadd9..bceedf9 100644 --- a/scripts/krastorio2/overhaul.lua +++ b/scripts/krastorio2/overhaul.lua @@ -89,7 +89,7 @@ local function remove_pre_tech(tech, pre_tech) for i,v in ipairs(data.raw.technology[tech].prerequisites) do if v == pre_tech then - v = nil + data.raw.technology[tech].prerequisites[i] = nil end end end @@ -299,6 +299,12 @@ item_table = { {"energy-control-unit", "fu_materials_energy_crystal", 1}, {"matter-stabilizer", "fu_materials_empty_container", 1}, + --military + {"energy-shield-equipment", "el_energy_crystal_item", 5}, + {"energy-shield-mk2-equipment","fi_energy_crystal_item", 5}, + {"energy-shield-mk3-equipment","fu_materials_energy_crystal", 5}, + {"battery-equipment", "el_lithium_battery", 1}, + --science {"chemical-science-pack", "el_energy_crystal_item",3}, {"production-science-pack", "fi_materials_titan", 1}, @@ -351,6 +357,19 @@ tech_table = { {"gr_compact_fusion_tech", "kr-singularity-tech-card"}, {"kr-intergalactic-transceiver","gr_magnet_tech"}, {"kr-intergalactic-transceiver","gr_compact_fusion_tech"}, + {"el_lithium_tech", "logistic-science-pack"}, + {"energy-shield-equipment", "el_gower_tech"}, + {"energy-shield-equipment", "el_energy_tech"}, + {"energy-shield-mk2-equipment", "fi_energy_tech"}, + {"energy-shield-mk2-equipment", "fi_crystal_tech"}, + {"kr-energy-shield-mk3-equipment", "fu_energy_tech"}, + {"kr-energy-shield-mk3-equipment", "fu_crystal_tech"}, + {"solar-panel-equipment", "el_energy_tech"}, + {"battery-equipment", "el_energy_tech"}, + {"kr-imersite-solar-panel-equipment","fu_energy_tech"}, + {"kr-tesla-coil", "fi_energy_tech"}, + {"kr-portable-generator", "fi_energy_tech"}, + {"battery-mk2-equipment", "fi_energy_tech"}, --energy tech {"kr-fuel", "el_energy_tech"},