From 23f9b82e1259b7e1597a89fe852ba2c957127f56 Mon Sep 17 00:00:00 2001
From: Brevven <brevingame@gmail.com>
Date: Fri, 16 Feb 2024 22:57:39 -0800
Subject: [PATCH] warp2e fix

---
 changelog.txt          |  2 ++
 control.lua            | 40 +---------------------------------------
 locale/en/aluminum.cfg |  3 +++
 3 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index f29e017..170f481 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,6 +1,8 @@
 ---------------------------------------------------------------------------------------------------
 Version: 0.4.27
 Date: 2024-02-17
+  Fixes:
+    - Prevent possible soft lock with Warptorio 2 Expansion
   Changes:
     - Some improved recipe compatibility for Xenos mods
 ---------------------------------------------------------------------------------------------------
diff --git a/control.lua b/control.lua
index d0d9335..9197c52 100644
--- a/control.lua
+++ b/control.lua
@@ -30,44 +30,6 @@ script.on_init(
   end
 )
 
-if script.active_mods["warptorio2_expansion"] then
-
-  function check_container_for_items(container,items)
-    local has_all =true
-    for k=1,#items do 
-      if container.get_item_count(items[k].name)<items[k].count then has_all=false break end
-    end
-    return has_all 		
-  end
-
-  function remove_items_from_container(container,items)
-    for k=1,#items do 
-      container.remove_item(items[k])
-    end	
-  end
-
-  script.on_nth_tick(60, function (event)
-    if global.done then return end
-    local fix_items={
-      {name='iron-plate',count=100},
-      {name='iron-gear-wheel',count=100},
-      {name='repair-pack',count=20},
-    }
-    local entities = game.surfaces[1].find_entities_filtered{area = {{-100, -100}, {100, 100}}, name = "wpe_broken_lab"}
-    if #entities == 0 then
-      -- The lab has already been fixed
-      global.done = true
-      return
-    end
-    if check_container_for_items(entities[1],fix_items) then
-      remove_items_from_container(entities[1],fix_items)
-      local lab = entities[1].surface.create_entity({name='wpe_repaired_lab', position=entities[1].position, force = game.forces.player})
-      lab.destructible=false
-      lab.minable=false
-      entities[1].destroy()
-      global.done = true
-    end
-  end)
-end
 
+util.warptorio2_expansion_helper()
 
diff --git a/locale/en/aluminum.cfg b/locale/en/aluminum.cfg
index 8cd0579..b060b93 100644
--- a/locale/en/aluminum.cfg
+++ b/locale/en/aluminum.cfg
@@ -1,6 +1,9 @@
 [entity-name]
 aluminum-ore=__ITEM__aluminum_upper__ ore
 
+[entity-description]
+wpe_broken_lab=To repair, insert 100[item=iron-plate], 100[item=iron-gear-wheel], 50[item=repair-pack]
+
 # VTK Deep Core Mining
 aluminum-ore-patch=__ITEM__aluminum_upper__ ore patch
 aluminum-ore-patch-chunk=__ENTITY__aluminum-ore-patch__ chunk