From 094afd91b3d8868c82a10b128105ae337db581fe Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Mon, 6 Feb 2017 16:42:28 -0600
Subject: [PATCH 01/28] Remove TeamView ToolTip Delay

---
 PROShine/Views/TeamView.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PROShine/Views/TeamView.xaml b/PROShine/Views/TeamView.xaml
index f997b3a..7418bde 100644
--- a/PROShine/Views/TeamView.xaml
+++ b/PROShine/Views/TeamView.xaml
@@ -17,6 +17,7 @@
                 <ListView.ItemContainerStyle>
                     <Style>
                         <Setter Property="ToolTipService.ShowDuration" Value="60000"/>
+                        <Setter Property="ToolTipService.InitialShowDelay" Value="0"/>
                         <Setter Property="Control.ToolTip">
                             <Setter.Value>
                                 <Canvas Height="300" Width="430" Background="#403F45">

From 8a919f123da8e2069f706aca0ed76e66ee8f753f Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Mon, 6 Feb 2017 18:02:39 -0600
Subject: [PATCH 02/28] Add functions to LuaScript

---
 PROBot/Scripting/LuaScript.cs | 86 +++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/PROBot/Scripting/LuaScript.cs b/PROBot/Scripting/LuaScript.cs
index c51f693..8e0b085 100644
--- a/PROBot/Scripting/LuaScript.cs
+++ b/PROBot/Scripting/LuaScript.cs
@@ -320,6 +320,10 @@ private void CreateLuaInstance()
             // File editing actions
             _lua.Globals["logToFile"] = new Action<string, DynValue, bool>(LogToFile);
             _lua.Globals["readLinesFromFile"] = new Func<string, string[]>(ReadLinesFromFile);
+	    
+            _lua.Globals["login"] = new Action<string, string, string>(Login);
+            _lua.Globals["invoke"] = new Action<DynValue, float, DynValue[]>(Invoke);
+            _lua.Globals["startScript"] = new Func<bool>(StartScript);
 
             foreach (string content in _libsContent)
             {
@@ -2766,5 +2770,87 @@ private void SetTextOptionDescription(int index, string content)
 
             Bot.TextOptions[index].Description = content;
         }
+
+        private void Login(string accountName, string password, string server, int socks = 0, string host = "", int port = 0, string socksUser = "", string socksPass = "")
+        {
+            server = server.ToUpperInvariant();
+
+            if (Bot.Game != null)
+            {
+                Fatal("error: login: tried to login while already logged in");
+                return;
+            }
+
+            if (server != "BLUE" && server != "RED" && server != "YELLOW")
+            {
+                Fatal("error: login: tried to connect to an invalid server: \"" + server + "\"");
+                return;
+            }
+
+            LogMessage("Connecting to the server...");
+            Account account = new Account(accountName);
+            account.Password = password;
+            account.Server = server;
+
+            if (socks == 4 || socks == 5)
+            {
+                account.Socks.Version = (SocksVersion)socks;
+                account.Socks.Host = host;
+                account.Socks.Port = port;
+                account.Socks.Username = socksUser;
+                account.Socks.Password = socksPass;
+            }
+
+            Bot.Login(account);
+        }
+
+        public void Invoke(DynValue function, float time, params DynValue[] args)
+        {
+            if (function.Type != DataType.Function && function.Type != DataType.ClrFunction)
+            {
+                Fatal("error: invoke: tried to call an invalid function");
+                return;
+            }
+
+            if (time == 0)
+            {
+                _lua.Call(function, args);
+                return;
+            }
+
+            Invoker invoker = new Invoker()
+            {
+                Function = function,
+                Time = DateTime.UtcNow.AddSeconds(time),
+                Script = this,
+                Args = args
+            };
+
+            Invokes.Add(invoker);
+        }
+
+        private bool StartScript()
+        {
+            if (Bot.Running == BotClient.State.Stopped && Bot.Game != null)
+            {
+                Bot.Start();
+                return true;
+            }
+
+            return false;
+        }
+    }
+
+    public class Invoker
+    {
+        public DynValue Function;
+        public DateTime Time;
+        public LuaScript Script;
+        public DynValue[] Args;
+
+        public void Call()
+        {
+            Script.Invoke(Function, 0, Args);
+        }
     }
 }

From 3c4aef9bdd427454204dd84e27e1e9486d863af7 Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Mon, 6 Feb 2017 18:03:17 -0600
Subject: [PATCH 03/28] Add Invokes List

---
 PROBot/Scripting/BaseScript.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/PROBot/Scripting/BaseScript.cs b/PROBot/Scripting/BaseScript.cs
index 6be4742..2eb18d0 100644
--- a/PROBot/Scripting/BaseScript.cs
+++ b/PROBot/Scripting/BaseScript.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace PROBot.Scripting
 {
@@ -24,6 +25,8 @@ public virtual void OnLearningMove(string moveName, int pokemonIndex) { }
 
         public abstract bool ExecuteNextAction();
 
+        public List<Invoker> Invokes = new List<Invoker>();
+
         protected void LogMessage(string message)
         {
             ScriptMessage?.Invoke(message);

From 091b74432498487a43b47450753a74b3419a74d6 Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Mon, 6 Feb 2017 18:05:59 -0600
Subject: [PATCH 04/28] Add CallInvokes to BotClient

---
 PROBot/BotClient.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/PROBot/BotClient.cs b/PROBot/BotClient.cs
index 7808872..06cf202 100644
--- a/PROBot/BotClient.cs
+++ b/PROBot/BotClient.cs
@@ -58,6 +58,18 @@ public BotClient()
             SliderOptions = new Dictionary<int, OptionSlider>();
             TextOptions = new Dictionary<int, TextOption>();
         }
+        
+        public void CallInvokes()
+        {
+            for (int i = Script.Invokes.Count - 1; i >= 0; i--)
+            {
+                if (Script.Invokes[i].Time < DateTime.UtcNow)
+                {
+                    Script.Invokes[i].Call();
+                    Script.Invokes.RemoveAt(i);
+                }
+            }
+        }
 
         public void CreateText(int index, string content)
         {
@@ -152,6 +164,9 @@ public void Logout(bool allowAutoReconnect)
 
         public void Update()
         {
+            if (Script != null)
+                CallInvokes();
+            
             AutoReconnector.Update();
 
             if (_loginRequested)

From 24c7cd993a3b9984602d031855103891b23c7d24 Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Mon, 6 Feb 2017 18:07:12 -0600
Subject: [PATCH 05/28] Add CallInvokes to GameClient

---
 PROProtocol/GameClient.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/PROProtocol/GameClient.cs b/PROProtocol/GameClient.cs
index c8a9929..e540a5b 100644
--- a/PROProtocol/GameClient.cs
+++ b/PROProtocol/GameClient.cs
@@ -91,6 +91,7 @@ public class GameClient
         public event Action<string, string> PokeTimeUpdated;
         public event Action<Shop> ShopOpened;
         public event Action<List<Pokemon>> PCBoxUpdated;
+        public event Action CallInvokes;
 
         private const string Version = "0.961";
 
@@ -212,6 +213,7 @@ public void Update()
             UpdateScript();
             UpdatePlayers();
             UpdatePCBox();
+            CallInvokes?.Invoke();
         }
 
         public void CloseChannel(string channelName)

From 9542cd852cb0e51f8bfb2e8e19baebd8b14053da Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Mon, 6 Feb 2017 18:10:07 -0600
Subject: [PATCH 06/28] CallInvokes and script Login support

---
 PROShine/Views/MainWindow.xaml.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/PROShine/Views/MainWindow.xaml.cs b/PROShine/Views/MainWindow.xaml.cs
index 2e18ffe..7b25c8a 100644
--- a/PROShine/Views/MainWindow.xaml.cs
+++ b/PROShine/Views/MainWindow.xaml.cs
@@ -104,6 +104,11 @@ public MainWindow()
             TextOptions.ItemsSource = _textOptions = new ObservableCollection<TextOption>();
         }
 
+        private void Client_CallInvokes()
+        {
+            Bot.CallInvokes();
+        }
+
         private void Options_Click(object sender, RoutedEventArgs e)
         {
             if (OptionSliders.Visibility == Visibility.Collapsed)
@@ -403,6 +408,7 @@ private void Bot_ConnectionOpened()
                         SetTitle(Bot.Account.Name + " - " + Bot.Game.Server);
                         UpdateBotMenu();
                         LogoutMenuItem.IsEnabled = true;
+                        LoginMenuItem.IsEnabled = false;
                         LoginButton.IsEnabled = true;
                         LoginButtonIcon.Icon = FontAwesome.WPF.FontAwesomeIcon.SignOut;
                         LogMessage("Connected, authenticating...");
@@ -572,6 +578,7 @@ private void Bot_ClientChanged()
                     Bot.Game.PlayerRemoved += Map.Client_PlayerLeftMap;
                     Bot.Game.PlayerUpdated += Map.Client_PlayerMoved;
                     Bot.Game.NpcReceived += Map.Client_NpcReceived;
+                    Bot.Game.CallInvokes += Client_CallInvokes;
                 }
             }
             Dispatcher.InvokeAsync(delegate

From 104e8fe9d7535e1a924e30cff73edcaee5dca02b Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Mon, 6 Feb 2017 18:22:30 -0600
Subject: [PATCH 07/28] Add obligatory API comments

---
 PROBot/Scripting/LuaScript.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/PROBot/Scripting/LuaScript.cs b/PROBot/Scripting/LuaScript.cs
index 8e0b085..ff6e550 100644
--- a/PROBot/Scripting/LuaScript.cs
+++ b/PROBot/Scripting/LuaScript.cs
@@ -2770,7 +2770,8 @@ private void SetTextOptionDescription(int index, string content)
 
             Bot.TextOptions[index].Description = content;
         }
-
+        
+	// API: Logs in using specified credentials
         private void Login(string accountName, string password, string server, int socks = 0, string host = "", int port = 0, string socksUser = "", string socksPass = "")
         {
             server = server.ToUpperInvariant();
@@ -2803,7 +2804,8 @@ private void Login(string accountName, string password, string server, int socks
 
             Bot.Login(account);
         }
-
+        
+	// API: Calls the specified function after the specified number of seconds
         public void Invoke(DynValue function, float time, params DynValue[] args)
         {
             if (function.Type != DataType.Function && function.Type != DataType.ClrFunction)
@@ -2828,10 +2830,11 @@ public void Invoke(DynValue function, float time, params DynValue[] args)
 
             Invokes.Add(invoker);
         }
-
+        
+	// API: Starts the loaded script (usable in the outer scope or with invoke)
         private bool StartScript()
         {
-            if (Bot.Running == BotClient.State.Stopped && Bot.Game != null)
+            if (Bot.Game != null && (Bot.Running == BotClient.State.Stopped || Bot.Running == BotClient.State.Paused))
             {
                 Bot.Start();
                 return true;

From 51a7c7d9be1dd7c494754b0466ee6ab8de1226eb Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Mon, 6 Feb 2017 18:26:33 -0600
Subject: [PATCH 08/28] Fix login with socks

---
 PROBot/Scripting/LuaScript.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PROBot/Scripting/LuaScript.cs b/PROBot/Scripting/LuaScript.cs
index ff6e550..c77944c 100644
--- a/PROBot/Scripting/LuaScript.cs
+++ b/PROBot/Scripting/LuaScript.cs
@@ -321,7 +321,7 @@ private void CreateLuaInstance()
             _lua.Globals["logToFile"] = new Action<string, DynValue, bool>(LogToFile);
             _lua.Globals["readLinesFromFile"] = new Func<string, string[]>(ReadLinesFromFile);
 	    
-            _lua.Globals["login"] = new Action<string, string, string>(Login);
+            _lua.Globals["login"] = new Action<string, string, string, int, string, int, string, string>(Login);
             _lua.Globals["invoke"] = new Action<DynValue, float, DynValue[]>(Invoke);
             _lua.Globals["startScript"] = new Func<bool>(StartScript);
 

From f344c5aa0a2356a9bb2bb0a48d5745fc7cfbc215 Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Mon, 6 Feb 2017 19:22:35 -0600
Subject: [PATCH 09/28] Add check to make sure a script is loaded

---
 PROProtocol/GameClient.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/PROProtocol/GameClient.cs b/PROProtocol/GameClient.cs
index e540a5b..81c3c65 100644
--- a/PROProtocol/GameClient.cs
+++ b/PROProtocol/GameClient.cs
@@ -213,7 +213,9 @@ public void Update()
             UpdateScript();
             UpdatePlayers();
             UpdatePCBox();
-            CallInvokes?.Invoke();
+
+            if (IsScriptActive)
+                CallInvokes?.Invoke();
         }
 
         public void CloseChannel(string channelName)

From b99b456b9e039cb812dcb55742f93648525373ec Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Mon, 6 Feb 2017 19:36:57 -0600
Subject: [PATCH 10/28] Fix ScriptLoaded Condition

---
 PROProtocol/GameClient.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/PROProtocol/GameClient.cs b/PROProtocol/GameClient.cs
index 81c3c65..970bf69 100644
--- a/PROProtocol/GameClient.cs
+++ b/PROProtocol/GameClient.cs
@@ -44,6 +44,7 @@ public class GameClient
         public string ScriptId { get; private set; }
         public int ScriptStatus { get; private set; }
         public string[] DialogContent { get; private set; }
+        public bool IsScriptLoaded = false;
 
         public Battle ActiveBattle { get; private set; }
         public Shop OpenedShop { get; private set; }
@@ -214,7 +215,7 @@ public void Update()
             UpdatePlayers();
             UpdatePCBox();
 
-            if (IsScriptActive)
+            if (IsScriptLoaded)
                 CallInvokes?.Invoke();
         }
 

From 24175c8107f31106de877d930b99c6facbcf193f Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Mon, 6 Feb 2017 19:37:44 -0600
Subject: [PATCH 11/28] Fix ScriptLoaded Condition

---
 PROBot/BotClient.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/PROBot/BotClient.cs b/PROBot/BotClient.cs
index 06cf202..eabe82f 100644
--- a/PROBot/BotClient.cs
+++ b/PROBot/BotClient.cs
@@ -151,6 +151,9 @@ private void LoginUpdate()
             }
             SetClient(client);
             client.Open();
+
+            if (Script != null)
+                client.IsScriptLoaded = true;
         }
 
         public void Logout(bool allowAutoReconnect)
@@ -258,6 +261,9 @@ public void LoadScript(string filename)
             {
                 Script.ScriptMessage += Script_ScriptMessage;
                 Script.Initialize();
+                
+                if (Game != null)
+                    Game.IsScriptLoaded = true;
             }
             catch (Exception ex)
             {

From 996dd42bc2494c5556e48a4db444e5d881ff043c Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Mon, 6 Feb 2017 20:23:09 -0600
Subject: [PATCH 12/28] Fix spacing and add CancelInvokes

---
 PROBot/Scripting/LuaScript.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/PROBot/Scripting/LuaScript.cs b/PROBot/Scripting/LuaScript.cs
index c77944c..ba85cc8 100644
--- a/PROBot/Scripting/LuaScript.cs
+++ b/PROBot/Scripting/LuaScript.cs
@@ -324,6 +324,7 @@ private void CreateLuaInstance()
             _lua.Globals["login"] = new Action<string, string, string, int, string, int, string, string>(Login);
             _lua.Globals["invoke"] = new Action<DynValue, float, DynValue[]>(Invoke);
             _lua.Globals["startScript"] = new Func<bool>(StartScript);
+            _lua.Globals["cancelInvokes"] = new Action(CancelInvokes);
 
             foreach (string content in _libsContent)
             {
@@ -2771,7 +2772,7 @@ private void SetTextOptionDescription(int index, string content)
             Bot.TextOptions[index].Description = content;
         }
         
-	// API: Logs in using specified credentials
+        // API: Logs in using specified credentials
         private void Login(string accountName, string password, string server, int socks = 0, string host = "", int port = 0, string socksUser = "", string socksPass = "")
         {
             server = server.ToUpperInvariant();
@@ -2805,7 +2806,7 @@ private void Login(string accountName, string password, string server, int socks
             Bot.Login(account);
         }
         
-	// API: Calls the specified function after the specified number of seconds
+        // API: Calls the specified function after the specified number of seconds
         public void Invoke(DynValue function, float time, params DynValue[] args)
         {
             if (function.Type != DataType.Function && function.Type != DataType.ClrFunction)
@@ -2831,7 +2832,7 @@ public void Invoke(DynValue function, float time, params DynValue[] args)
             Invokes.Add(invoker);
         }
         
-	// API: Starts the loaded script (usable in the outer scope or with invoke)
+        // API: Starts the loaded script (usable in the outer scope or with invoke)
         private bool StartScript()
         {
             if (Bot.Game != null && (Bot.Running == BotClient.State.Stopped || Bot.Running == BotClient.State.Paused))
@@ -2842,6 +2843,12 @@ private bool StartScript()
 
             return false;
         }
+        
+        // API: Cancels all queued Invokes
+        private void CancelInvokes()
+        {
+            Invokes.Clear();
+        }
     }
 
     public class Invoker

From 41ecef208b86534e23990bde3a8581a8cf4bb2fe Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Mon, 6 Feb 2017 22:34:49 -0600
Subject: [PATCH 13/28] Removed cancelInvoke; it was too crashy.

---
 PROBot/Scripting/LuaScript.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/PROBot/Scripting/LuaScript.cs b/PROBot/Scripting/LuaScript.cs
index ba85cc8..0c84148 100644
--- a/PROBot/Scripting/LuaScript.cs
+++ b/PROBot/Scripting/LuaScript.cs
@@ -324,7 +324,6 @@ private void CreateLuaInstance()
             _lua.Globals["login"] = new Action<string, string, string, int, string, int, string, string>(Login);
             _lua.Globals["invoke"] = new Action<DynValue, float, DynValue[]>(Invoke);
             _lua.Globals["startScript"] = new Func<bool>(StartScript);
-            _lua.Globals["cancelInvokes"] = new Action(CancelInvokes);
 
             foreach (string content in _libsContent)
             {
@@ -2843,12 +2842,6 @@ private bool StartScript()
 
             return false;
         }
-        
-        // API: Cancels all queued Invokes
-        private void CancelInvokes()
-        {
-            Invokes.Clear();
-        }
     }
 
     public class Invoker

From 804b715424ce72a01b59ef0c89e60687ec6e2f5b Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Tue, 7 Feb 2017 09:27:43 -0600
Subject: [PATCH 14/28] Simplify GameClient

---
 PROProtocol/GameClient.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/PROProtocol/GameClient.cs b/PROProtocol/GameClient.cs
index 970bf69..f50b835 100644
--- a/PROProtocol/GameClient.cs
+++ b/PROProtocol/GameClient.cs
@@ -44,7 +44,6 @@ public class GameClient
         public string ScriptId { get; private set; }
         public int ScriptStatus { get; private set; }
         public string[] DialogContent { get; private set; }
-        public bool IsScriptLoaded = false;
 
         public Battle ActiveBattle { get; private set; }
         public Shop OpenedShop { get; private set; }
@@ -193,6 +192,8 @@ public void Close(Exception error = null)
 
         public void Update()
         {
+            CallInvokes?.Invoke();
+            
             _mapClient.Update();
             _connection.Update();
             if (!IsAuthenticated)
@@ -214,9 +215,6 @@ public void Update()
             UpdateScript();
             UpdatePlayers();
             UpdatePCBox();
-
-            if (IsScriptLoaded)
-                CallInvokes?.Invoke();
         }
 
         public void CloseChannel(string channelName)

From f67e27bb5c43f41b48fddca8918b5ae560558dea Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Tue, 7 Feb 2017 09:30:32 -0600
Subject: [PATCH 15/28] Simplify BotClient

---
 PROBot/BotClient.cs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/PROBot/BotClient.cs b/PROBot/BotClient.cs
index eabe82f..6a89081 100644
--- a/PROBot/BotClient.cs
+++ b/PROBot/BotClient.cs
@@ -61,12 +61,15 @@ public BotClient()
         
         public void CallInvokes()
         {
-            for (int i = Script.Invokes.Count - 1; i >= 0; i--)
+            if (Script != null)
             {
-                if (Script.Invokes[i].Time < DateTime.UtcNow)
+                for (int i = Script.Invokes.Count - 1; i >= 0; i--)
                 {
-                    Script.Invokes[i].Call();
-                    Script.Invokes.RemoveAt(i);
+                    if (Script.Invokes[i].Time < DateTime.UtcNow)
+                    {
+                        Script.Invokes[i].Call();
+                        Script.Invokes.RemoveAt(i);
+                    }
                 }
             }
         }
@@ -151,9 +154,6 @@ private void LoginUpdate()
             }
             SetClient(client);
             client.Open();
-
-            if (Script != null)
-                client.IsScriptLoaded = true;
         }
 
         public void Logout(bool allowAutoReconnect)
@@ -261,9 +261,6 @@ public void LoadScript(string filename)
             {
                 Script.ScriptMessage += Script_ScriptMessage;
                 Script.Initialize();
-                
-                if (Game != null)
-                    Game.IsScriptLoaded = true;
             }
             catch (Exception ex)
             {

From d82c7ef44c47f12af8112d66dfe7c10a134da610 Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Tue, 7 Feb 2017 09:31:39 -0600
Subject: [PATCH 16/28] Remove unnecessary condition

---
 PROBot/BotClient.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/PROBot/BotClient.cs b/PROBot/BotClient.cs
index 6a89081..3c98691 100644
--- a/PROBot/BotClient.cs
+++ b/PROBot/BotClient.cs
@@ -167,8 +167,7 @@ public void Logout(bool allowAutoReconnect)
 
         public void Update()
         {
-            if (Script != null)
-                CallInvokes();
+            CallInvokes();
             
             AutoReconnector.Update();
 

From 1f9d2b429215298455685431b8b1416486ee0249 Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Tue, 7 Feb 2017 13:04:28 -0600
Subject: [PATCH 17/28] Re-add CancelInvokes

---
 PROBot/BotClient.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/PROBot/BotClient.cs b/PROBot/BotClient.cs
index 3c98691..a2e561f 100644
--- a/PROBot/BotClient.cs
+++ b/PROBot/BotClient.cs
@@ -65,10 +65,15 @@ public void CallInvokes()
             {
                 for (int i = Script.Invokes.Count - 1; i >= 0; i--)
                 {
-                    if (Script.Invokes[i].Time < DateTime.UtcNow)
+                    if (!InvokesCanceled)
                     {
-                        Script.Invokes[i].Call();
-                        Script.Invokes.RemoveAt(i);
+                        if (Script.Invokes[i].Time < DateTime.UtcNow)
+                        {
+                            if (Script.Invokes[i].Called)
+                                Script.Invokes.RemoveAt(i);
+                            else
+                                Script.Invokes[i].Call();
+                        }
                     }
                 }
             }

From 04f9bc571e2bc6ccf69aac45105c86bfd44960cc Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Tue, 7 Feb 2017 13:06:15 -0600
Subject: [PATCH 18/28] Re-add CancelInvokes

---
 PROBot/Scripting/LuaScript.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/PROBot/Scripting/LuaScript.cs b/PROBot/Scripting/LuaScript.cs
index 0c84148..c0af7da 100644
--- a/PROBot/Scripting/LuaScript.cs
+++ b/PROBot/Scripting/LuaScript.cs
@@ -2842,6 +2842,13 @@ private bool StartScript()
 
             return false;
         }
+        
+        // API: Cancels all queued Invokes
+        private void CancelInvokes()
+        {
+            foreach (Invoker invoker in Invokes)
+                invoker.Called = true;
+        }
     }
 
     public class Invoker
@@ -2850,9 +2857,11 @@ public class Invoker
         public DateTime Time;
         public LuaScript Script;
         public DynValue[] Args;
+        public bool Called = false;
 
         public void Call()
         {
+            Called = true;
             Script.Invoke(Function, 0, Args);
         }
     }

From 5c9166e8bc5032e19377b2aeb67dae8012ea6e4c Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Tue, 7 Feb 2017 13:08:46 -0600
Subject: [PATCH 19/28] Remove Artifact

---
 PROBot/BotClient.cs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/PROBot/BotClient.cs b/PROBot/BotClient.cs
index a2e561f..e79c20a 100644
--- a/PROBot/BotClient.cs
+++ b/PROBot/BotClient.cs
@@ -65,15 +65,12 @@ public void CallInvokes()
             {
                 for (int i = Script.Invokes.Count - 1; i >= 0; i--)
                 {
-                    if (!InvokesCanceled)
+                    if (Script.Invokes[i].Time < DateTime.UtcNow)
                     {
-                        if (Script.Invokes[i].Time < DateTime.UtcNow)
-                        {
-                            if (Script.Invokes[i].Called)
-                                Script.Invokes.RemoveAt(i);
-                            else
-                                Script.Invokes[i].Call();
-                        }
+                        if (Script.Invokes[i].Called)
+                            Script.Invokes.RemoveAt(i);
+                        else
+                            Script.Invokes[i].Call();
                     }
                 }
             }

From 23224729f35510ce7498fe75fc5db32b9b516b85 Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Tue, 7 Feb 2017 14:09:04 -0600
Subject: [PATCH 20/28] Remove unnecessary GameClient Invoke Call

---
 PROProtocol/GameClient.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/PROProtocol/GameClient.cs b/PROProtocol/GameClient.cs
index f50b835..c8a9929 100644
--- a/PROProtocol/GameClient.cs
+++ b/PROProtocol/GameClient.cs
@@ -91,7 +91,6 @@ public class GameClient
         public event Action<string, string> PokeTimeUpdated;
         public event Action<Shop> ShopOpened;
         public event Action<List<Pokemon>> PCBoxUpdated;
-        public event Action CallInvokes;
 
         private const string Version = "0.961";
 
@@ -192,8 +191,6 @@ public void Close(Exception error = null)
 
         public void Update()
         {
-            CallInvokes?.Invoke();
-            
             _mapClient.Update();
             _connection.Update();
             if (!IsAuthenticated)

From b72206697b8107cfb69a311a2dfb93a69dd6d5cc Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Tue, 7 Feb 2017 14:09:32 -0600
Subject: [PATCH 21/28] Remove unnecessary GameClient Invoke Call

---
 PROShine/Views/MainWindow.xaml.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/PROShine/Views/MainWindow.xaml.cs b/PROShine/Views/MainWindow.xaml.cs
index 7b25c8a..bb09edc 100644
--- a/PROShine/Views/MainWindow.xaml.cs
+++ b/PROShine/Views/MainWindow.xaml.cs
@@ -104,11 +104,6 @@ public MainWindow()
             TextOptions.ItemsSource = _textOptions = new ObservableCollection<TextOption>();
         }
 
-        private void Client_CallInvokes()
-        {
-            Bot.CallInvokes();
-        }
-
         private void Options_Click(object sender, RoutedEventArgs e)
         {
             if (OptionSliders.Visibility == Visibility.Collapsed)
@@ -578,7 +573,6 @@ private void Bot_ClientChanged()
                     Bot.Game.PlayerRemoved += Map.Client_PlayerLeftMap;
                     Bot.Game.PlayerUpdated += Map.Client_PlayerMoved;
                     Bot.Game.NpcReceived += Map.Client_NpcReceived;
-                    Bot.Game.CallInvokes += Client_CallInvokes;
                 }
             }
             Dispatcher.InvokeAsync(delegate

From 9b69c6c50b5d9d03361ff22a790a1b003b9dc0cf Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Tue, 7 Feb 2017 14:11:50 -0600
Subject: [PATCH 22/28] Add cancelInvokes to _lua.Globals

---
 PROBot/Scripting/LuaScript.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PROBot/Scripting/LuaScript.cs b/PROBot/Scripting/LuaScript.cs
index c0af7da..77abbc2 100644
--- a/PROBot/Scripting/LuaScript.cs
+++ b/PROBot/Scripting/LuaScript.cs
@@ -324,6 +324,7 @@ private void CreateLuaInstance()
             _lua.Globals["login"] = new Action<string, string, string, int, string, int, string, string>(Login);
             _lua.Globals["invoke"] = new Action<DynValue, float, DynValue[]>(Invoke);
             _lua.Globals["startScript"] = new Func<bool>(StartScript);
+            _lua.Globals["cancelInvokes"] = new Action(CancelInvokes);
 
             foreach (string content in _libsContent)
             {

From 2306da5ae4509621488ad5eb200853989f5fbca9 Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Sat, 11 Feb 2017 09:54:15 -0600
Subject: [PATCH 23/28] Reorder functions and add Relog

---
 PROBot/Scripting/LuaScript.cs | 58 +++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 16 deletions(-)

diff --git a/PROBot/Scripting/LuaScript.cs b/PROBot/Scripting/LuaScript.cs
index 77abbc2..4e5b232 100644
--- a/PROBot/Scripting/LuaScript.cs
+++ b/PROBot/Scripting/LuaScript.cs
@@ -322,8 +322,9 @@ private void CreateLuaInstance()
             _lua.Globals["readLinesFromFile"] = new Func<string, string[]>(ReadLinesFromFile);
 	    
             _lua.Globals["login"] = new Action<string, string, string, int, string, int, string, string>(Login);
-            _lua.Globals["invoke"] = new Action<DynValue, float, DynValue[]>(Invoke);
+            _lua.Globals["relog"] = new Action<float, string>(Relog);
             _lua.Globals["startScript"] = new Func<bool>(StartScript);
+            _lua.Globals["invoke"] = new Action<DynValue, float, DynValue[]>(Invoke);
             _lua.Globals["cancelInvokes"] = new Action(CancelInvokes);
 
             foreach (string content in _libsContent)
@@ -2805,9 +2806,46 @@ private void Login(string accountName, string password, string server, int socks
 
             Bot.Login(account);
         }
+
+        // API: Logs out and logs back in after the specified number of seconds, then starts the script shortly after
+        private void Relog(float seconds, string message)
+        {
+            DynValue name = DynValue.NewString(Bot.Account.Name);
+            DynValue password = DynValue.NewString(Bot.Account.Password);
+            DynValue server = DynValue.NewString(Bot.Account.Server);
+
+            if (Bot.Account.Socks.Version != SocksVersion.None)
+            {
+                DynValue socks = DynValue.NewNumber((int)Bot.Account.Socks.Version);
+                DynValue host = DynValue.NewString(Bot.Account.Socks.Host);
+                DynValue port = DynValue.NewNumber(Bot.Account.Socks.Port);
+                DynValue socksUser = DynValue.NewString(Bot.Account.Socks.Username);
+                DynValue socksPass = DynValue.NewString(Bot.Account.Socks.Password);
+                Invoke(_lua.Globals.Get("login"), seconds, name, password, server, socks, host, port, socksUser, socksPass);
+            }
+            else
+            {
+                Invoke(_lua.Globals.Get("login"), seconds, name, password, server);
+            }
+
+            Invoke(_lua.Globals.Get("startScript"), seconds + 10);
+            Logout(message);
+        }
+        
+        // API: Starts the loaded script (usable in the outer scope or with invoke)
+        private bool StartScript()
+        {
+            if (Bot.Game != null && (Bot.Running == BotClient.State.Stopped || Bot.Running == BotClient.State.Paused))
+            {
+                Bot.Start();
+                return true;
+            }
+
+            return false;
+        }
         
         // API: Calls the specified function after the specified number of seconds
-        public void Invoke(DynValue function, float time, params DynValue[] args)
+        public void Invoke(DynValue function, float seconds, params DynValue[] args)
         {
             if (function.Type != DataType.Function && function.Type != DataType.ClrFunction)
             {
@@ -2815,7 +2853,7 @@ public void Invoke(DynValue function, float time, params DynValue[] args)
                 return;
             }
 
-            if (time == 0)
+            if (seconds == 0)
             {
                 _lua.Call(function, args);
                 return;
@@ -2824,7 +2862,7 @@ public void Invoke(DynValue function, float time, params DynValue[] args)
             Invoker invoker = new Invoker()
             {
                 Function = function,
-                Time = DateTime.UtcNow.AddSeconds(time),
+                Time = DateTime.UtcNow.AddSeconds(seconds),
                 Script = this,
                 Args = args
             };
@@ -2832,18 +2870,6 @@ public void Invoke(DynValue function, float time, params DynValue[] args)
             Invokes.Add(invoker);
         }
         
-        // API: Starts the loaded script (usable in the outer scope or with invoke)
-        private bool StartScript()
-        {
-            if (Bot.Game != null && (Bot.Running == BotClient.State.Stopped || Bot.Running == BotClient.State.Paused))
-            {
-                Bot.Start();
-                return true;
-            }
-
-            return false;
-        }
-        
         // API: Cancels all queued Invokes
         private void CancelInvokes()
         {

From 702cb2eaf884fb8883080db96560c9ead84752dd Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Wed, 9 Aug 2017 16:41:40 -0500
Subject: [PATCH 24/28] Clear Invokes when clicking stop

---
 PROShine/Views/MainWindow.xaml.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/PROShine/Views/MainWindow.xaml.cs b/PROShine/Views/MainWindow.xaml.cs
index bb09edc..7d245cc 100644
--- a/PROShine/Views/MainWindow.xaml.cs
+++ b/PROShine/Views/MainWindow.xaml.cs
@@ -353,6 +353,8 @@ private void BotStopMenuItem_Click(object sender, RoutedEventArgs e)
             lock (Bot)
             {
                 Bot.Stop();
+                if (Bot.Script != null)
+                    Bot.Script.Invokes.Clear();
             }
         }
 

From 237ab3c6044a79a5a81c41ab23e21d42b07074a7 Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Wed, 9 Aug 2017 16:46:04 -0500
Subject: [PATCH 25/28] Fix invoke canceling

---
 PROBot/BotClient.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/PROBot/BotClient.cs b/PROBot/BotClient.cs
index e79c20a..5be2f60 100644
--- a/PROBot/BotClient.cs
+++ b/PROBot/BotClient.cs
@@ -58,6 +58,13 @@ public BotClient()
             SliderOptions = new Dictionary<int, OptionSlider>();
             TextOptions = new Dictionary<int, TextOption>();
         }
+
+        public void CancelInvokes()
+        {
+            if (Script != null)
+                foreach (Invoker invoker in Script.Invokes)
+                    invoker.Called = true;
+        }
         
         public void CallInvokes()
         {

From c6a6479182c3a6d83e61b586b71247883a83b63f Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Wed, 9 Aug 2017 16:47:18 -0500
Subject: [PATCH 26/28] Fix invoke canceling

---
 PROBot/Scripting/LuaScript.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/PROBot/Scripting/LuaScript.cs b/PROBot/Scripting/LuaScript.cs
index 4e5b232..1123399 100644
--- a/PROBot/Scripting/LuaScript.cs
+++ b/PROBot/Scripting/LuaScript.cs
@@ -2873,8 +2873,7 @@ public void Invoke(DynValue function, float seconds, params DynValue[] args)
         // API: Cancels all queued Invokes
         private void CancelInvokes()
         {
-            foreach (Invoker invoker in Invokes)
-                invoker.Called = true;
+		Bot.CancelInvokes();
         }
     }
 

From cbeaa48c34322aefce1f9bd35836949a3c1132b9 Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Wed, 9 Aug 2017 16:47:32 -0500
Subject: [PATCH 27/28] Fix invoke canceling

---
 PROShine/Views/MainWindow.xaml.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/PROShine/Views/MainWindow.xaml.cs b/PROShine/Views/MainWindow.xaml.cs
index 7d245cc..b2761c2 100644
--- a/PROShine/Views/MainWindow.xaml.cs
+++ b/PROShine/Views/MainWindow.xaml.cs
@@ -352,9 +352,7 @@ private void BotStopMenuItem_Click(object sender, RoutedEventArgs e)
         {
             lock (Bot)
             {
-                Bot.Stop();
-                if (Bot.Script != null)
-                    Bot.Script.Invokes.Clear();
+                Bot.Stop();                
             }
         }
 
@@ -826,6 +824,7 @@ private void StopScriptButton_Click(object sender, RoutedEventArgs e)
             lock (Bot)
             {
                 Bot.Stop();
+                Bot.CancelInvokes();
             }
         }
 

From 7f16ea8ff54445b2a2ac207ddf23dce666b8b04a Mon Sep 17 00:00:00 2001
From: Zonz <coldfirexxx@yahoo.com>
Date: Wed, 9 Aug 2017 16:51:20 -0500
Subject: [PATCH 28/28] Cancel invokes on Fatal

---
 PROBot/Scripting/LuaScript.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PROBot/Scripting/LuaScript.cs b/PROBot/Scripting/LuaScript.cs
index 1123399..747aa53 100644
--- a/PROBot/Scripting/LuaScript.cs
+++ b/PROBot/Scripting/LuaScript.cs
@@ -436,6 +436,7 @@ private void Fatal(string message)
         {
             LogMessage(message);
             Bot.Stop();
+            Bot.CancelInvokes();
         }
 
         // API: Displays the specified message to the message log and logs out.