Merge branch 'testing'

Addons/Admin/auto-chat.lua

@@ -42,6 +42,14 @@ local commands = {
     ['aids']={'chat-bot.aids'},
     ['riot']={'chat-bot.riot'},
     ['lenny']={'chat-bot.lenny'},
+    ['orderpizza']=function(player) Server.new_thread{
+        timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true
+    }:on_event('timeout',function(self)
+        if self.data[2]==0 then game.print{'chat-bot.message',{'chat-bot.order-pizza-2',self.data[1]}}                
+        elseif self.data[2]==1 then game.print{'chat-bot.message',{'chat-bot.order-pizza-3',self.data[1]}} self.reopen = false
+        end
+        self.data[2]=self.data[2]+1
+    end):open() return {'chat-bot.order-pizza-1'} end,
     ['maketea']=function(player) Server.new_thread{
         timeout=math.floor(180*(math.random()+0.5)),data=player.name
     }:on_event('timeout',function(self)

ExpCore/server.lua

@@ -294,9 +294,11 @@ function Server._thread:close()
             end
         end)
     end
-    if is_type(self.name,'string') then threads.paused[self.name]=self.uuid self.opened=nil
+    self.opened=nil
-        if self.reopen == true then self:open() end
+    if self.reopen == true then self:open() else
-    else threads.all[uuid] = nil threads.all._n = threads.all._n-1 end
+        if is_type(self.name,'string') then threads.paused[self.name]=self.uuid
+        else threads.all[uuid] = nil threads.all._n = threads.all._n-1 end
+    end
     return _return
 end
 

locale/en/chat-bot.cfg

@@ -22,3 +22,6 @@ loops=NO LOOPS; LOOPS ARE BAD; JUST NO LOOPS!!!!!; IF YOU MAKE A LOOP.... IT WIL
 lenny=( ͡° ͜ʖ ͡°)
 make-tea-1= ☕ Boiling the water... ☕
 make-tea-2= ☕ __1__ your tea is done! ☕
+order-pizza-1= 🍕 Finding nearest pizza supplier... 🍕
+order-pizza-2= 🍕 Figuring out the favourite pizza of __1__ 🍕
+order-pizza-3= 🍕 __1__ your pizza is here! 🍕