Move raid system to globalevents

data/lib/compat/compat.lua

@@ -237,6 +237,7 @@ do
 			self:onThink(value)
 			return
 		elseif key == "onTime" then
+			self:type("timer")
 			self:onTime(value)
 			return
 		elseif key == "onStartup" then
@@ -1333,8 +1334,10 @@ function doSetGameState(state)
 end
 
 function doExecuteRaid(raidName)
-	return Game.startRaid(raidName)
+	debugPrint("Deprecated function, use Game.startEvent('" .. raidName .. "') instead.")
+	return Game.startEvent(raidName)
 end
+Game.startRaid = doExecuteRaid
 
 function Game.convertIpToString(ip)
 	print("[Warning - " .. debug.getinfo(2).source:match("@?(.*)") .. "] Function Game.convertIpToString is deprecated and will be removed in the future. Use the return value of player:getIp() instead.")

data/lib/core/raids.lua

@@ -0,0 +1,43 @@
+local raids = {}
+
+Raid = setmetatable({
+    getRaids = function() return raids end
+}, {
+    __call = function(self, name)
+        local events = {}
+
+        local obj = {
+            margin = 0,
+            name = name,
+            repeats = false,
+        }
+
+        function obj:__newindex(key, value)
+            if key == "interval" or key == "margin" or key == "repeats" then
+                rawset(self, key, value)
+            else
+                io.write("[Warning] Invalid attribute for raid: " .. key .. ". Ignoring...\n")
+            end
+        end
+
+        function obj:addEvent(delay, fn)
+            events[#events] = { delay = delay, fn = fn }
+        end
+
+        function obj:execute()
+            for _, event in ipairs(events) do
+                addEvent(event.delay, event.fn)
+            end
+        end
+
+        function obj:register()
+            raids[self.name] = self
+        end
+
+        function obj:unregister()
+            raids[self.name] = nil
+        end
+
+        return obj
+    end
+})

data/scripts/globalevents/#testraid.lua

@@ -0,0 +1,51 @@
+local raid = GlobalEvent("Testraid")
+raid:interval(1800)
+
+local function event0()
+    Game.broadcastMessage("Rats are attacking near Trekolt Temple!", MESSAGE_STATUS_WARNING)
+end
+
+local function event1()
+    local center, radius, z = {x=94, y=126}, 5, 7
+    for _ = 1, 3 do
+        local x, y = math.random(center.x - radius, center.x + radius), math.random(center.y - radius, center.y + radius)
+        Game.createMonster("Rat", Position(x, y, z))
+    end
+end
+
+local function event2()
+    Game.createMonster("Cave Rat", Position(93, 123, 7))
+end
+
+local function event3()
+    Game.broadcastMessage("Rats attack continues!", MESSAGE_STATUS_WARNING)
+end
+
+local function event4()
+    local from, to, z = {x=89, y=122}, {x=99, y=130}, 7
+    for _ = 1, math.random(4, 10) do
+        local x, y = math.random(from.x, to.x), math.random(from.y, to.y)
+        Game.createMonster("Rat", Position(x, y, z))
+    end
+end
+
+local function event5()
+    Game.createMonster("Cave Rat", Position(98, 125, 7))
+end
+
+local function event6()
+    Game.createMonster("Cave Rat", Position(94, 128, 7))
+end
+
+function raid.onTime(interval)
+    addEvent(event0, 1000)
+    addEvent(event1, 2000)
+    addEvent(event2, 15000)
+    addEvent(event3, 25000)
+    addEvent(event4, 30000)
+    addEvent(event5, 30000)
+    addEvent(event6, 30000)
+    return true
+end
+
+raid:register()

data/scripts/globalevents/raids.lua

@@ -0,0 +1,36 @@
+local event = GlobalEvent("raids")
+
+local CHECK_RAIDS_INTERVAL = 60
+local MAX_RAND_RANGE = 10000000
+
+event:interval(CHECK_RAIDS_INTERVAL)
+
+local running = nil
+local lastRaidEnd = 0
+
+function event.onTime(interval)
+    io.write("Executing raids event...\n")
+    if running then
+        return
+    end
+
+    local now = os.mtime()
+
+    local raids = Raid.getRaids()
+    for key, raid in pairs(raids) do
+        local chance = (MAX_RAND_RANGE * CHECK_RAIDS_INTERVAL) / raid.interval
+        if now >= lastRaidEnd + raid.margin and chance >= math.random(0, MAX_RAND_RANGE) then
+            running = key
+
+            io.write("Executing raid: " .. raid.name .. "\n")
+            raid:execute()
+
+            if not raid.repeats then
+                raids[key] = nil
+            end
+            break
+        end
+    end
+end
+
+event:register()