Implemented Thread.set_timeout and changed /walkabout behavior

custom_commands.lua

@@ -1,3 +1,5 @@
+local Thread = require "locale.utils.Thread"
+
 function cant_run(name)
     game.player.print("Can't run command (" .. name .. ") - insufficient permission.")
 end
@@ -75,10 +77,28 @@ function walkabout(cmd)
   for param in string.gmatch(cmd.parameter, "%w+") do table.insert(params, param) end
   local player_name = params[1]
   local distance = ""
-  if params[3] == nil then
+  local duraction = 60
+  if #params == 2  then
     distance = params[2]
-  else
+  elseif #params == 3 then
     distance = params[2] .. " " .. params[3]
+    if distance ~= "very far" then
+      distance = params[2]
+      if tonumber(params[3]) == nil then
+        game.player.print(params[3] .. " is not a number.")
+        return
+      else
+        duraction = tonumber(params[3])
+      end
+    end
+  elseif #params == 4 then
+    distance = params[2] .. " " .. params[3]
+    if tonumber(params[4]) == nil then
+      game.player.print(params[4] .. " is not a number.")
+      return
+    else
+      duraction = tonumber(params[4])
+    end
   end
 
   if distance == nil or distance == "" then
@@ -98,44 +118,45 @@ function walkabout(cmd)
   end
 
   local x = 1
-  while game.players[x] ~= nil do
+  local y = 1
-    local player = game.players[x]
+  local player = game.players[player_name]
-    if player_name == player.name then
+  if player == nil then
-      local repeat_attempts = 5
+    game.player.print(player_name .. " could not go on a walkabout.")
-      local r = 1
+    return
-      local surface = game.surfaces[1]
-      local distance_max = distance * 1.05
-      local distance_min = distance * 0.95
-      distance_max = round(distance_max, 0)
-      distance_min = round(distance_min, 0)
-
-      --while r <= repeat_attempts do
-        x = math.random(distance_min, distance_max)
-        if 1 == math.random(1, 2) then
-          x = x * -1
-        end
-
-        y = math.random(distance_min, distance_max)
-        if 1 == math.random(1, 2) then
-          y = y * -1
-        end
-
-        if 1 == math.random(1, 2) then
-          z = distance_max * -1
-          x = math.random(z, distance_max)
-        else
-          z = distance_max * -1
-          y = math.random(z, distance_max)
-        end
-
-          local pos = {x, y}
-          player.teleport(pos)
-          game.print(player_name .. " went on a walkabout, to find himself.")
-          return
-    end
-    x = x + 1
   end
-  game.print(player_name .. " could not go on a walkabout.")
+  local surface = game.surfaces[1]
+  local distance_max = distance * 1.05
+  local distance_min = distance * 0.95
+  distance_max = round(distance_max, 0)
+  distance_min = round(distance_min, 0)
+
+  x = math.random(distance_min, distance_max)
+  if 1 == math.random(1, 2) then
+    x = x * -1
+  end
+  y = math.random(distance_min, distance_max)
+  if 1 == math.random(1, 2) then
+    y = y * -1
+  end
+  if 1 == math.random(1, 2) then
+    z = distance_max * -1
+    x = math.random(z, distance_max)
+  else
+    z = distance_max * -1
+    y = math.random(z, distance_max)
+  end
+
+  local pos = {x, y}
+  Thread.set_timeout(duraction, return_player, {player = player, force = player.force, position = player.position})
+  player.force = "enemy"
+  player.teleport(player.surface.find_non_colliding_position("player", pos, 100, 1))
+  game.print(player_name .. " went on a walkabout, to find himself.")
+end
+
+function return_player(args)
+  args.player.force = args.force
+  args.player.teleport(args.player.surface.find_non_colliding_position("player", args.position, 100, 1))
+  game.print(args.player.name .. " came back from his walkabout.")
 end
 
 function on_set_time(cmd)
@@ -267,7 +288,7 @@ commands.add_command("detrain", "<player> - Kicks the player off a train. (Admin
 commands.add_command("tpplayer", "<player> - Teleports you to the player. (Admins and moderators)", teleport_player)
 commands.add_command("invoke", "<player> - Teleports the player to you. (Admins and moderators)", invoke)
 commands.add_command("tppos", "Teleports you to a selected entity. (Admins only)", teleport_location)
-commands.add_command("walkabout", '<player> <"close", "far", "very far", number> - Send someone on a walk.  (Admins and moderators)', walkabout)
+commands.add_command("walkabout", '<player> <"close", "far", "very far", number> <duration> - Send someone on a walk.  (Admins and moderators)', walkabout)
 commands.add_command("market", 'Places a fish market near you.  (Admins only)', spawn_market)
 commands.add_command("settime", '<day> <month> <hour> <minute> - Sets the clock (Admins, moderators and regulars)', on_set_time)
 commands.add_command("clock", 'Look at the clock.', clock)

locale/utils/Thread.lua

@@ -0,0 +1,51 @@
+-- Threading simulation module
+-- Thread.sleep()
+-- @author Valansch
+-- github: https://github.com/Valansch/RedMew
+-- ======================================================= --
+
+
+local Thread = {}
+
+local function set_new_next_async_callback_time()
+  global.next_async_callback_time = global.callbacks[1].time
+  for index, callback in pairs(global.callbacks) do
+    if callback.time < global.next_async_callback_time then
+      global.next_async_callback_time = callback.time
+    end
+  end
+end
+
+global.callbacks = {}
+global.next_async_callback_time = -1
+
+
+local function on_tick()
+  if game.tick == global.next_async_callback_time then
+    for index, callback in pairs(global.callbacks) do
+      if game.tick == callback.time then
+        pcall(callback.callback, callback.params)
+        table.remove(global.callbacks, index)
+        if #global.callbacks == 0 then
+          global.next_async_callback_time = -1
+        else
+          set_new_next_async_callback_time()
+        end
+      end
+    end
+  end
+end
+
+function Thread.set_timeout(sec, callback, params)
+  local time = game.tick + 60 * sec
+  if global.next_async_callback_time == -1 or global.next_async_callback_time > time then
+    global.next_async_callback_time = time
+  end
+  if #global.callbacks == 0 then
+  end
+  table.insert(global.callbacks, {time = time, callback = callback, params = params})
+end
+
+Event.register(defines.events.on_tick, on_tick)
+
+return Thread