From 3feee4ea301d10e69667237f8828daa5bfdcc14e Mon Sep 17 00:00:00 2001
From: Brevven <brevingame@gmail.com>
Date: Mon, 13 Mar 2023 01:51:40 -0700
Subject: [PATCH] warptorio fix

---
 aluminum-burner-phase.lua | 4 ++++
 aluminum-recipe-se.lua    | 1 +
 changelog.txt             | 5 +++++
 data-util.lua             | 4 +++-
 info.json                 | 2 +-
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/aluminum-burner-phase.lua b/aluminum-burner-phase.lua
index 67570ed..91653c7 100644
--- a/aluminum-burner-phase.lua
+++ b/aluminum-burner-phase.lua
@@ -41,6 +41,10 @@ if mods.Krastorio2 then
     util.set_tech_recipe("basic-automation", {{"basic-tech-card", 1}})
   end
   util.remove_prerequisite("automation", "smelting") -- Bitumen mod
+
+  -- For warptorio2 expansion with K2
+  util.remove_prerequisite("laboratory", "automation-science-pack")
+  util.set_tech_recipe("laboratory", {{"basic-tech-card", 1}})
 end
 
 if mods["aai-industry"] then
diff --git a/aluminum-recipe-se.lua b/aluminum-recipe-se.lua
index 5a35853..bbf5f85 100644
--- a/aluminum-recipe-se.lua
+++ b/aluminum-recipe-se.lua
@@ -34,6 +34,7 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then
     order = "a-h-z-a",
   }
   })
+  util.set_item_subgroup("aluminum-ore", "aluminum")
   util.set_item_subgroup("alumina", "aluminum")
   util.set_item_subgroup("aluminum-plate", "aluminum")
   data:extend({
diff --git a/changelog.txt b/changelog.txt
index d518863..aa146d8 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.4.23
+Date: 2023-02-21
+  Fixes:
+    - Fix startup when used with both Warptorio2 Expansion and Krastorio2
+---------------------------------------------------------------------------------------------------
 Version: 0.4.22
 Date: 2023-02-12
   Fixes:
diff --git a/data-util.lua b/data-util.lua
index 89e08f9..3e5f0b5 100644
--- a/data-util.lua
+++ b/data-util.lua
@@ -716,6 +716,8 @@ function multiply_recipe(recipe, multiple)
   if recipe then
     if recipe.energy_required then
       recipe.energy_required = recipe.energy_required * multiple
+    else
+      recipe.energy_required = 0.5 * multiple  -- 0.5 is factorio default
     end
     if recipe.result_count then
       recipe.result_count = recipe.result_count * multiple
@@ -1161,7 +1163,7 @@ function remove_prior_unlocks(tech, recipe)
     util.remove_recipe_effect(tech, recipe)
     if technology.prerequisites then
       for i, prerequisite in pairs(technology.prerequisites) do
-        -- log("BZZZ removing prior unlocks for " .. tech ..", checking " .. prerequisite) -- Handy Debug :|
+        log("BZZZ removing prior unlocks for " .. recipe .. " from " .. tech ..", checking " .. prerequisite) -- Handy Debug :|
         remove_prior_unlocks(prerequisite, recipe)
       end
     end
diff --git a/info.json b/info.json
index bcc237a..5e2d06d 100644
--- a/info.json
+++ b/info.json
@@ -1,6 +1,6 @@
 {
     "name": "bzaluminum",
-    "version": "0.4.22",
+    "version": "0.4.23",
     "factorio_version": "1.1",
     "title": "Aluminum",
     "author": "Brevven",