Bot V8 basic fixes

Adapt load() calls to lua 5.1

mods/game_bot/default_configs/cavebot_1.3/cavebot/actions.lua

@@ -97,7 +97,11 @@ CaveBot.registerAction("function", "red", function(value, retries, prev)
     prefix = prefix .. "local " .. extension .. " = CaveBot.Extensions." .. extension .. "\n"
   end
   local status, result = pcall(function()
-    return assert(load(prefix .. value, "cavebot_function"))()
+    if _VERSION == "Lua 5.1" and type(jit) ~= "table" then
+      return assert(loadstring(prefix .. value))()
+    else
+      return assert(load(prefix .. value, "cavebot_function"))()
+    end
   end)
   if not status then
     error("Error in cavebot function:\n" .. result)

mods/game_bot/default_configs/cavebot_1.3/tools.lua

@@ -18,9 +18,13 @@ end)
 UI.Separator()
 
 for _, scripts in ipairs({storage.ingame_macros, storage.ingame_hotkeys}) do
-  if type(scripts) == "string" and scripts:len() > 3 then
+  if type(scripts) == "string" and scripts:len() > 3 then    
     local status, result = pcall(function()
-      assert(load(scripts, "ingame_editor"))()
+      if _VERSION == "Lua 5.1" and type(jit) ~= "table" then
+        assert(loadstring(scripts))()
+      else
+        assert(load(scripts, "ingame_editor"))()
+      end
     end)
     if not status then
       error("Ingame edior error:\n" .. result)

mods/game_bot/default_configs/vBot_4.8/cavebot/actions.lua

@@ -267,7 +267,11 @@ CaveBot.registerAction("function", "red", function(value, retries, prev)
     prefix = prefix .. "local " .. extension .. " = CaveBot.Extensions." .. extension .. "\n"
   end
   local status, result = pcall(function()
-    return assert(load(prefix .. value, "cavebot_function"))()
+    if _VERSION == "Lua 5.1" and type(jit) ~= "table" then
+      return assert(loadstring(prefix .. value))()
+    else
+      return assert(load(prefix .. value, "cavebot_function"))()
+    end
   end)
   if not status then
     warn("warn in cavebot function:\n" .. result)

mods/game_bot/default_configs/vBot_4.8/vBot/ingame_editor.lua

@@ -12,7 +12,11 @@ UI.Button("Ingame script editor", function(newText)
   for _, scripts in pairs({storage.ingame_hotkeys}) do
     if type(scripts) == "string" and scripts:len() > 3 then
       local status, result = pcall(function()
-        assert(load(scripts, "ingame_editor"))()
+        if _VERSION == "Lua 5.1" and type(jit) ~= "table" then
+          return assert(loadstring(scripts))()
+        else        
+          assert(load(scripts, "ingame_editor"))()
+        end
       end)
       if not status then
         error("Ingame edior error:\n" .. result)

mods/game_bot/executor.lua

@@ -96,10 +96,23 @@ function executeBot(config, storage, tabs, msgCallback, saveConfigCallback, relo
     date = os.date,
     clock = os.clock
   }
-  context.load = function(str) return assert(load(str, nil, nil, context)) end
+  if _VERSION == "Lua 5.1" and type(jit) ~= "table" then
+    context.load = function(str)
+      local func = assert(loadstring(str))
+      setfenv(func, context)
+      return func
+    end
+    context.dofile = function(file) 
+      local func = assert(loadstring(g_resources.readFileContents("/bot/" .. config .. "/" .. file)))
+      setfenv(func, context)
+      func()
+    end
+  else
+    context.load = function(str) return assert(load(str, nil, nil, context)) end
+    context.dofile = function(file) assert(load(g_resources.readFileContents("/bot/" .. config .. "/" .. file), file, nil, context))() end
+  end
   context.loadstring = context.load
   context.assert = assert
-  context.dofile = function(file) assert(load(g_resources.readFileContents("/bot/" .. config .. "/" .. file), file, nil, context))() end
   context.gcinfo = gcinfo
   context.tr = tr
   context.json = json
@@ -164,7 +177,13 @@ function executeBot(config, storage, tabs, msgCallback, saveConfigCallback, relo
 
   -- run lua script
   for i, file in ipairs(luaFiles) do
-    assert(load(g_resources.readFileContents(file), file, nil, context))()
+      if _VERSION == "Lua 5.1" and type(jit) ~= "table" then
+        local func = assert(loadstring(g_resources.readFileContents(file)))
+        setfenv(func, context)
+        func()
+      else
+        assert(load(g_resources.readFileContents(file), file, nil, context))()
+      end
     context.panel = context.mainTab -- reset default tab
   end
 

mods/game_bot/functions/script_loader.lua

@@ -10,9 +10,14 @@ context.loadScript = function(path, onLoadCallback)
   if not g_resources.fileExists(path) then
     return context.error("File " .. path .. " doesn't exist")
   end
-
   local status, result = pcall(function()
-    assert(load(g_resources.readFileContents(path), path, nil, context))()
+    if _VERSION == "Lua 5.1" and type(jit) ~= "table" then
+      local func = assert(loadstring(g_resources.readFileContents(path)))
+      setfenv(func, context)
+      func()
+    else        
+      assert(load(g_resources.readFileContents(path), path, nil, context))()
+    end
   end)
   if not status then
     return context.error("Error while loading script from: " .. path .. ":\n" .. result)
@@ -42,7 +47,13 @@ context.loadRemoteScript = function(url, onLoadCallback)
     end
 
     local status, result = pcall(function()
-      assert(load(data, url, nil, context))()
+      if _VERSION == "Lua 5.1" and type(jit) ~= "table" then
+        local func = assert(loadstring(data))
+        setfenv(func, context)
+        func()
+      else        
+        assert(load(data, url, nil, context))()
+      end
     end)
     if not status then
       return context.error("Error while loading script from: " .. url .. ":\n" .. result)

mods/game_bot/panels/waypoints.lua

@@ -746,7 +746,13 @@ Panel
     elseif command.command == "function" and lastGotoSuccesful then
       usedGotoLabel = false
       local status, result = pcall(function()
-        return assert(load("return " .. command.text, nil, nil, context))()(functions)
+        if _VERSION == "Lua 5.1" and type(jit) ~= "table" then
+          local func = assert(loadstring("return " .. command.text))
+          setfenv(func, context)
+          return func()(functions)
+        else        
+          return assert(load("return " .. command.text, nil, nil, context))()(functions)
+        end
       end)
       if not status then
         context.error("Waypoints function execution error:\n" .. result)