Created class to manage all properties (Globals.cs),

Hotfixed Minimise bug where if minimise after redemption was enabled then you couldn't bring SMITE to the foreground.
Lumbridge · Apr 8, 2018 · 43a735b · 43a735b
1 parent 123198a
commit 43a735b
Show file tree

Hide file tree

Showing 81 changed files with 247 additions and 98 deletions.
diff --git a/.vs/MixerSmiteCodeRedeemer/v14/.suo b/.vs/MixerSmiteCodeRedeemer/v14/.suo
diff --git a/Dolphin Script/bin/Debug/DolphinScript.dll b/Dolphin Script/bin/Debug/DolphinScript.dll
diff --git a/Dolphin Script/bin/Debug/DolphinScript.pdb b/Dolphin Script/bin/Debug/DolphinScript.pdb
diff --git a/Dolphin Script/bin/Release/DolphinScript.dll b/Dolphin Script/bin/Release/DolphinScript.dll
diff --git a/Dolphin Script/bin/Release/DolphinScript.pdb b/Dolphin Script/bin/Release/DolphinScript.pdb
diff --git a/Dolphin Script/obj/Debug/Dolphin Script.csproj.FileListAbsolute.txt b/Dolphin Script/obj/Debug/Dolphin Script.csproj.FileListAbsolute.txt
@@ -33,3 +33,4 @@ C:\Users\Ry208444\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\obj\Debug\D
 C:\Users\Ry208444\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\obj\Debug\Dolphin Script.csproj.CoreCompileInputs.cache
 C:\Users\Ry208444\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\obj\Debug\DolphinScript.dll
 C:\Users\Ry208444\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\obj\Debug\DolphinScript.pdb
+C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\obj\Debug\Dolphin Script.csprojResolveAssemblyReference.cache
diff --git a/Dolphin Script/obj/Debug/Dolphin Script.csproj.GenerateResource.Cache b/Dolphin Script/obj/Debug/Dolphin Script.csproj.GenerateResource.Cache
diff --git a/Dolphin Script/obj/Debug/DolphinScript.dll b/Dolphin Script/obj/Debug/DolphinScript.dll
diff --git a/Dolphin Script/obj/Debug/DolphinScript.pdb b/Dolphin Script/obj/Debug/DolphinScript.pdb
diff --git a/Dolphin Script/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/Dolphin Script/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
diff --git a/Dolphin Script/obj/Release/Dolphin Script.csproj.FileListAbsolute.txt b/Dolphin Script/obj/Release/Dolphin Script.csproj.FileListAbsolute.txt
@@ -23,3 +23,4 @@ C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\obj\Release\Do
 C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\obj\Release\Dolphin Script.csproj.GenerateResource.Cache
 C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\obj\Release\DolphinScript.dll
 C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\obj\Release\DolphinScript.pdb
+C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\obj\Release\Dolphin Script.csprojResolveAssemblyReference.cache
diff --git a/Dolphin Script/obj/Release/Dolphin Script.csproj.GenerateResource.Cache b/Dolphin Script/obj/Release/Dolphin Script.csproj.GenerateResource.Cache
diff --git a/Dolphin Script/obj/Release/DolphinScript.dll b/Dolphin Script/obj/Release/DolphinScript.dll
diff --git a/Dolphin Script/obj/Release/DolphinScript.pdb b/Dolphin Script/obj/Release/DolphinScript.pdb
diff --git a/Dolphin Script/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/Dolphin Script/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
diff --git a/MixerChatAPI/bin/Debug/MixerChat.dll b/MixerChatAPI/bin/Debug/MixerChat.dll
diff --git a/MixerChatAPI/bin/Debug/MixerChat.pdb b/MixerChatAPI/bin/Debug/MixerChat.pdb
diff --git a/MixerChatAPI/bin/Release/MixerChat.dll b/MixerChatAPI/bin/Release/MixerChat.dll
diff --git a/MixerChatAPI/bin/Release/MixerChat.pdb b/MixerChatAPI/bin/Release/MixerChat.pdb
diff --git a/MixerChatAPI/obj/Debug/MixerChat.dll b/MixerChatAPI/obj/Debug/MixerChat.dll
diff --git a/MixerChatAPI/obj/Debug/MixerChat.pdb b/MixerChatAPI/obj/Debug/MixerChat.pdb
diff --git a/MixerChatAPI/obj/Release/MixerChat.dll b/MixerChatAPI/obj/Release/MixerChat.dll
diff --git a/MixerChatAPI/obj/Release/MixerChat.pdb b/MixerChatAPI/obj/Release/MixerChat.pdb
diff --git a/MixerChatAPI/obj/Release/MixerChatAPI.csproj.FileListAbsolute.txt b/MixerChatAPI/obj/Release/MixerChatAPI.csproj.FileListAbsolute.txt
@@ -25,4 +25,3 @@ C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\MixerChatAPI\bin\Release\WebS
 C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\MixerChatAPI\bin\Release\Newtonsoft.Json.xml
 C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\MixerChatAPI\obj\Release\MixerChat.dll
 C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\MixerChatAPI\obj\Release\MixerChat.pdb
-C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\MixerChatAPI\obj\Release\MixerChatAPI.csprojResolveAssemblyReference.cache
diff --git a/SmiteMixerCodeGrabberCLI/bin/Debug/DolphinScript.dll b/SmiteMixerCodeGrabberCLI/bin/Debug/DolphinScript.dll
diff --git a/SmiteMixerCodeGrabberCLI/bin/Debug/DolphinScript.pdb b/SmiteMixerCodeGrabberCLI/bin/Debug/DolphinScript.pdb
diff --git a/SmiteMixerCodeGrabberCLI/bin/Debug/MixerChat.dll b/SmiteMixerCodeGrabberCLI/bin/Debug/MixerChat.dll
diff --git a/SmiteMixerCodeGrabberCLI/bin/Debug/MixerChat.pdb b/SmiteMixerCodeGrabberCLI/bin/Debug/MixerChat.pdb
diff --git a/SmiteMixerCodeGrabberCLI/bin/Debug/SmiteMixerListener.dll b/SmiteMixerCodeGrabberCLI/bin/Debug/SmiteMixerListener.dll
diff --git a/SmiteMixerCodeGrabberCLI/bin/Debug/SmiteMixerListener.pdb b/SmiteMixerCodeGrabberCLI/bin/Debug/SmiteMixerListener.pdb
diff --git a/SmiteMixerCodeGrabberCLI/bin/Release/DolphinScript.dll b/SmiteMixerCodeGrabberCLI/bin/Release/DolphinScript.dll
diff --git a/SmiteMixerCodeGrabberCLI/bin/Release/DolphinScript.pdb b/SmiteMixerCodeGrabberCLI/bin/Release/DolphinScript.pdb
diff --git a/SmiteMixerCodeGrabberCLI/bin/Release/MixerChat.dll b/SmiteMixerCodeGrabberCLI/bin/Release/MixerChat.dll
diff --git a/SmiteMixerCodeGrabberCLI/bin/Release/MixerChat.pdb b/SmiteMixerCodeGrabberCLI/bin/Release/MixerChat.pdb
diff --git a/SmiteMixerCodeGrabberCLI/bin/Release/SmiteMixerListener.dll b/SmiteMixerCodeGrabberCLI/bin/Release/SmiteMixerListener.dll
diff --git a/SmiteMixerCodeGrabberCLI/bin/Release/SmiteMixerListener.pdb b/SmiteMixerCodeGrabberCLI/bin/Release/SmiteMixerListener.pdb
diff --git a/...xerCodeGrabberCLI/obj/Debug/SmiteMixerCodeGrabberCLI.csprojResolveAssemblyReference.cache b/...xerCodeGrabberCLI/obj/Debug/SmiteMixerCodeGrabberCLI.csprojResolveAssemblyReference.cache
diff --git a/SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerListener.dll b/SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerListener.dll
diff --git a/SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerListener.pdb b/SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerListener.pdb
diff --git a/...rCodeGrabberCLI/obj/Release/SmiteMixerCodeGrabberCLI.csprojResolveAssemblyReference.cache b/...rCodeGrabberCLI/obj/Release/SmiteMixerCodeGrabberCLI.csprojResolveAssemblyReference.cache
diff --git a/SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerListener.dll b/SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerListener.dll
diff --git a/SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerListener.pdb b/SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerListener.pdb
diff --git a/SmiteMixerCodeGrabberGUI/App.config b/SmiteMixerCodeGrabberGUI/App.config
@@ -55,6 +55,9 @@
             <setting name="minimiseAfterRedeeming" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="shouldMinimise" serializeAs="String">
+                <value>False</value>
+            </setting>
         </SmiteMixerCodeGrabberGUI.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/SmiteMixerCodeGrabberGUI/Classes/Automation.cs b/SmiteMixerCodeGrabberGUI/Classes/Automation.cs
@@ -7,23 +7,33 @@
 using static DolphinScript.Lib.Backend.WindowControl;
 
 using static SmiteMixerCodeGrabberGUI.Classes.AllCodes;
+using static SmiteMixerCodeGrabberGUI.Classes.Globals;
 
 namespace SmiteMixerCodeGrabberGUI.Classes
 {
     class Automation
     {
-        public static void RedeemSingle(SmiteCode sc)
+        public static void RedeemSingle(SmiteCode code)
         {
             // get the event list and pass it the code we want it to type
             //
-            var loop = GetRedeemLoop(sc.GetCode());
+            var loop = GetRedeemLoop(code.GetCode());
 
             foreach (var ev in loop)
                 if(IsRunning)
                     ev.DoEvent();
 
-            if(IsRunning)
-                sc.SetIsRedeemed(true);
+            if (IsRunning)
+            {
+                code.SetIsRedeemed(true);
+                shouldMinimise = true;
+            }
+
+            if (minimiseAfterRedeeming && shouldMinimise)
+            {
+                MinimiseSMITEClient();
+                shouldMinimise = false;
+            }
         }
 
         public static void RedeemAllActive()
@@ -40,10 +50,18 @@ public static void RedeemAllActive()
                         if(IsRunning)
                             ev.DoEvent();
 
-                    if(IsRunning)
+                    if (IsRunning)
+                    {
                         code.SetIsRedeemed(true);
+                        shouldMinimise = true;
+                    }
                 }
             }
+            if (minimiseAfterRedeeming && shouldMinimise)
+            {
+                MinimiseSMITEClient();
+                shouldMinimise = false;
+            }
         }
 
         [STAThread]
@@ -52,7 +70,7 @@ public static List<ScriptEvent> GetRedeemLoop(string code)
             System.Windows.Forms.Clipboard.SetText("/claimpromotion " + code);
             List<ScriptEvent> SlowTypingScript = new List<ScriptEvent>()
             {
-                new MouseMoveToAreaOnWindow() { ClickArea = new RECT(), WindowToClickTitle = Properties.Settings.Default.smiteWindowTitle },
+                new MouseMoveToAreaOnWindow() { ClickArea = new RECT(), WindowToClickTitle = smiteWindowTitle },
                 GetPause(1.0, 1.5),
                 GetEnterKeyClick(),
                 GetPause(1.0, 1.5),
@@ -68,7 +86,7 @@ public static List<ScriptEvent> GetRedeemLoop(string code)
 
         static MoveWindowToFront GetMoveWindowToFront()
         {
-            return new MoveWindowToFront() { WindowToClickTitle = Properties.Settings.Default.smiteWindowTitle };
+            return new MoveWindowToFront() { WindowToClickTitle = smiteWindowTitle };
         }
 
         static RandomPauseInRange GetPause(double min, double max)
@@ -78,7 +96,7 @@ static RandomPauseInRange GetPause(double min, double max)
 
         static MouseMoveToAreaOnWindow GetMouseMoveToWindow(RECT clickArea)
         {
-            return new MouseMoveToAreaOnWindow() { ClickArea = clickArea, WindowToClickTitle = Properties.Settings.Default.smiteWindowTitle };
+            return new MouseMoveToAreaOnWindow() { ClickArea = clickArea, WindowToClickTitle = smiteWindowTitle };
         }
 
         static MouseClick GetLeftMouseClick()

diff --git a/SmiteMixerCodeGrabberGUI/Classes/Globals.cs b/SmiteMixerCodeGrabberGUI/Classes/Globals.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SmiteMixerCodeGrabberGUI.Classes
+{
+    class Globals
+    {
+        public static bool AFKMode { get; set; }
+        public static bool shouldMinimise { get; set; }
+        public static string smiteWindowTitle { get; set; }
+
+        public static bool notificationSetting
+        {
+            get { return Properties.Settings.Default.notificationSetting; }
+            set
+            {
+                Properties.Settings.Default.notificationSetting = value;
+                SaveSettings();
+            }
+        }
+        public static bool whitelistOnly
+        {
+            get { return Properties.Settings.Default.whitelistOnly; }
+            set
+            {
+                Properties.Settings.Default.whitelistOnly = value;
+                SaveSettings();
+            }
+        }
+        public static int codeLength
+        {
+            get { return Properties.Settings.Default.codeLength; }
+            set
+            {
+                Properties.Settings.Default.codeLength = value;
+                SaveSettings();
+            }
+        }
+        public static string codesStartWith
+        {
+            get { return Properties.Settings.Default.codesStartWith; }
+            set
+            {
+                Properties.Settings.Default.codesStartWith = value;
+                SaveSettings();
+            }
+        }
+        public static System.Collections.Specialized.StringCollection whitelistedUsernames
+        {
+            get { return Properties.Settings.Default.whitelistedUsernames; }
+            set
+            {
+                Properties.Settings.Default.whitelistedUsernames = value;
+                SaveSettings();
+            }
+        }
+        public static string notificationSoundFilePath
+        {
+            get { return Properties.Settings.Default.notificationSoundFilePath; }
+            set
+            {
+                Properties.Settings.Default.notificationSoundFilePath = value;
+                SaveSettings();
+            }
+        }
+        public static bool notificationSound
+        {
+            get { return Properties.Settings.Default.notificationSound; }
+            set
+            {
+                Properties.Settings.Default.notificationSound = value;
+                SaveSettings();
+            }
+        }
+        public static bool minimiseAfterRedeeming
+        {
+            get { return Properties.Settings.Default.minimiseAfterRedeeming; }
+            set
+            {
+                Properties.Settings.Default.minimiseAfterRedeeming = value;
+                SaveSettings();
+            }
+        }
+
+        private static void SaveSettings()
+        {
+            Properties.Settings.Default.Save();
+        }
+    }
+}
diff --git a/SmiteMixerCodeGrabberGUI/Classes/MetaInfo.cs b/SmiteMixerCodeGrabberGUI/Classes/MetaInfo.cs
@@ -8,7 +8,7 @@ namespace SmiteMixerCodeGrabberGUI.Classes
 {
     public static class MetaInfo
     {
-        public static string Version = "v1.0.7";
+        public static string Version = "v1.0.7.1";
 
         public static string GetMetaInfoConsole()
         {

diff --git a/SmiteMixerCodeGrabberGUI/MainForm.Designer.cs b/SmiteMixerCodeGrabberGUI/MainForm.Designer.cs