From 65271a969f88ee023048e9b94ddf08c3716670ae Mon Sep 17 00:00:00 2001
From: Brevven <brevingame@gmail.com>
Date: Fri, 15 Mar 2024 10:11:11 -0700
Subject: [PATCH] w2e fix

---
 changelog.txt     | 11 +++++++++
 control-util.lua  | 57 +++++++++++++++++++++++++++++++++++++++++++++++
 control.lua       |  2 ++
 info.json         |  3 ++-
 locale/en/gas.cfg |  3 +++
 5 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/changelog.txt b/changelog.txt
index 860c4a5..fb06063 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,15 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.1.16
+Date: 2024-02-10
+  Fixes:
+    - Fix some printspam.
+---------------------------------------------------------------------------------------------------
+Version: 0.1.15
+Date: 2024-02-10
+  Changes:
+    - Compatibility fix for Warptorio Expansion to prevent soft lock when used without Aluminum
+      Note, 0.1.14 deprecated due to possible re-soft-locking bug
+---------------------------------------------------------------------------------------------------
 Version: 0.1.13
 Date: 2024-01-13
   Changes:
diff --git a/control-util.lua b/control-util.lua
index cd2b0f2..9000745 100644
--- a/control-util.lua
+++ b/control-util.lua
@@ -26,4 +26,61 @@ function util.force_enable_recipe(event, recipe_name)
   end
 end
 
+
+function util.warptorio2_expansion_helper() 
+  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=50},
+      }
+      local entities = {}
+      for i=1,100 do
+        if game.surfaces[i] then
+          local lentities= game.surfaces[i].find_entities_filtered{area = {{-100, -100}, {100, 100}}, name = "wpe_broken_lab"}
+          for j, entity in pairs(lentities) do
+            table.insert(entities, entity)
+          end
+        end
+      end
+      if #entities == 0 then
+        if global.checking then
+          -- The lab has already been fixed
+          global.done = true
+        else
+          -- Check that the lab doesn't reappear due to a warp
+          global.checking = true
+        end
+        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
+end
+
+
+
 return util
diff --git a/control.lua b/control.lua
index be9f2b7..107b50e 100644
--- a/control.lua
+++ b/control.lua
@@ -48,3 +48,5 @@ function on_init()
   global.starting_spawn = true
 end
 script.on_init(on_init)
+
+util.warptorio2_expansion_helper()
diff --git a/info.json b/info.json
index ed1ef1b..cff8dc4 100644
--- a/info.json
+++ b/info.json
@@ -1,6 +1,6 @@
 {
     "name": "bzgas",
-    "version": "0.1.13",
+    "version": "0.1.16",
     "factorio_version": "1.1",
     "title": "Natural Gas",
     "author": "Brevven",
@@ -15,6 +15,7 @@
       "? bztungsten >= 0.6.0",
       "? bzcarbon >= 0.3.0",
       "? bztin",
+      "? warptorio2_expansion",
       "? space-exploration >= 0.5.100",
       "? aai-industry",
       "? Krastorio2",
diff --git a/locale/en/gas.cfg b/locale/en/gas.cfg
index 9a6df87..8ea240c 100644
--- a/locale/en/gas.cfg
+++ b/locale/en/gas.cfg
@@ -3,6 +3,9 @@ gas=Natural gas
 basic-chemical-plant=Basic chemical plant
 gas-extractor=Drilling rig
 
+[entity-description]
+wpe_broken_lab=To repair, insert 100[item=iron-plate], 100[item=iron-gear-wheel], 50[item=repair-pack]
+
 [autoplace-control-names]
 gas=[fluid=gas] Natural gas