Fixes to redeem method, no longer uses sendkeys (too unreliable), not…

… CTRL+Vs codes into box instead of typing. Notifications fixes. User guide added to help menu. AFK Killswitch fixed.
Lumbridge · Mar 29, 2018 · cf2f8f2 · cf2f8f2
1 parent 3b2e6b0
commit cf2f8f2
Show file tree

Hide file tree

Showing 69 changed files with 72 additions and 21 deletions.
diff --git a/.vs/MixerSmiteCodeRedeemer/v14/.suo b/.vs/MixerSmiteCodeRedeemer/v14/.suo
diff --git a/Dolphin Script/Classes/ScriptEventClasses/PasteClipboard.cs b/Dolphin Script/Classes/ScriptEventClasses/PasteClipboard.cs
@@ -0,0 +1,39 @@
+using DolphinScript.Lib.ScriptEventClasses;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using static DolphinScript.Lib.Backend.WinAPI;
+
+namespace DolphinScript.Classes.ScriptEventClasses
+{
+    [Serializable]
+    public class PasteClipboard : ScriptEvent
+    {
+        public override void DoEvent()
+        {
+            // placeholder for CTRL+V //
+            // down CTRL
+            keybd_event((byte)VirtualKeyStates.VK_LCONTROL, 0, 0, 0);
+            // down V key
+            keybd_event(0x56, 0, 0, 0);
+            Thread.Sleep(100);
+            keybd_event((byte)VirtualKeyStates.VK_LCONTROL, 0, KEYEVENTF_KEYUP, 0);
+            keybd_event(0x56, 0, KEYEVENTF_KEYUP, 0);
+        }
+
+        public override string GetEventListBoxString()
+        {
+            throw new NotImplementedException();
+        }
+
+        [DllImport("user32.dll")]
+        static extern void keybd_event(byte bVk, byte bScan, uint dwFlags,
+            int dwExtraInfo);
+
+        const uint KEYEVENTF_KEYUP = 0x0002;
+    }
+}
diff --git a/Dolphin Script/Dolphin Script.csproj b/Dolphin Script/Dolphin Script.csproj
@@ -82,6 +82,7 @@
     <Compile Include="Classes\ScriptEventClasses\MouseMoveToAreaOnWindow.cs" />
     <Compile Include="Classes\ScriptEventClasses\MouseMoveToColourOnWindow.cs" />
     <Compile Include="Classes\ScriptEventClasses\MouseMoveToPointOnWindow.cs" />
+    <Compile Include="Classes\ScriptEventClasses\PasteClipboard.cs" />
     <Compile Include="Classes\ScriptEventClasses\PauseWhileColourDoesntExistInAreaOnWindow.cs" />
     <Compile Include="Classes\ScriptEventClasses\PauseWhileColourExistsInAreaOnWindow.cs" />
     <Compile Include="Classes\ScriptEventClasses\ScriptEvent.cs" />

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
@@ -23,7 +23,6 @@ C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\obj\Debug\Dolp
 C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\obj\Debug\DolphinScript.pdb
 C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\bin\Debug\DolphinScript.dll.config
 C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\bin\Debug\DolphinScript.dll
-C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\obj\Debug\Dolphin Script.csprojResolveAssemblyReference.cache
 C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\obj\Debug\DolphinScript.dll
 C:\Users\Ry208444\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\bin\Debug\DolphinScript.dll.config
 C:\Users\Ry208444\Source\Repos\SmiteMixerCodeRedeemer\Dolphin Script\bin\Debug\DolphinScript.dll

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/Dolphin Script.csprojResolveAssemblyReference.cache b/Dolphin Script/obj/Debug/Dolphin Script.csprojResolveAssemblyReference.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/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/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/Debug/MixerChatAPI.csprojResolveAssemblyReference.cache b/MixerChatAPI/obj/Debug/MixerChatAPI.csprojResolveAssemblyReference.cache
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/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/Classes/DynamicResolution.cs b/SmiteMixerCodeGrabberGUI/Classes/DynamicResolution.cs
@@ -16,24 +16,20 @@ static class DynamicResolution
     {        
         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 },
                 GetPause(1.0, 1.5),
                 GetEnterKeyClick(),
                 GetPause(1.0, 1.5),
-                GetForwardSlashOEM(),
+                GetPaste(),
+                GetPause(1.0, 1.5),
+                GetEnterKeyClick(),
+                GetPause(1.0, 1.5),
+                GetESCKeyClick(),
+                GetPause(1.0, 1.5)
             };
-            var fullcode = "claimpromotion " + code;
-            foreach (var letter in fullcode)
-            {
-                SlowTypingScript.Add(new KeyboardKeyPress() { KeyboardKeys = letter.ToString() });
-                SlowTypingScript.Add(GetPause(0.1, 0.3));
-            }
-            SlowTypingScript.Add(GetPause(0.3, 0.5));
-            SlowTypingScript.Add(GetEnterKeyClick());
-            SlowTypingScript.Add(GetPause(0.8, 1.0));
-            SlowTypingScript.Add(GetESCKeyClick());
             return SlowTypingScript;
         }
 
@@ -57,6 +53,11 @@ static MouseClick GetLeftMouseClick()
             return new MouseClick() { MouseButton = VirtualMouseStates.Left_Click };
         }
 
+        static DolphinScript.Classes.ScriptEventClasses.PasteClipboard GetPaste()
+        {
+            return new DolphinScript.Classes.ScriptEventClasses.PasteClipboard();
+        }
+
         static DolphinScript.Classes.ScriptEventClasses.KeybdEvent GetEnterKeyClick()
         {
             return new DolphinScript.Classes.ScriptEventClasses.KeybdEvent() { KeybdEventBtn = VirtualKeyStates.VK_RETURN };

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.2";
+        public static string Version = "v1.0.4";
 
         public static string GetMetaInfoConsole()
         {

diff --git a/SmiteMixerCodeGrabberGUI/MainForm.Designer.cs b/SmiteMixerCodeGrabberGUI/MainForm.Designer.cs
diff --git a/SmiteMixerCodeGrabberGUI/MainForm.cs b/SmiteMixerCodeGrabberGUI/MainForm.cs
@@ -182,7 +182,6 @@ private void checkbox_AFKMode_CheckedChanged(object sender, EventArgs e)
         {
             if (checkbox_AFKMode.Checked)
             {
-                Task.Run(() => CheckForTerminationKey());
                 Properties.Settings.Default.AFKMode = true;
                 Properties.Settings.Default.Save();
                 IsRunning = true;
@@ -331,6 +330,10 @@ private void reportBugToolStripMenuItem_Click(object sender, EventArgs e)
         {
             System.Diagnostics.Process.Start("https://github.com/Lumbridge/SmiteMixerCodeRedeemer/issues");
         }
+        private void userGuideToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://github.com/Lumbridge/SmiteMixerCodeRedeemer/blob/master/README.md");
+        }
         #endregion
 
         #region Helper Methods
@@ -424,8 +427,6 @@ public static void CheckForTerminationKey()
                     Properties.Settings.Default.Save();
 
                     DisplayNotification("F5 Key Detected: AFK Mode disabled.");
-
-                    return;
                 }
                 Thread.Sleep(15);
             }

diff --git a/SmiteMixerCodeGrabberGUI/bin/Debug/DolphinScript.dll b/SmiteMixerCodeGrabberGUI/bin/Debug/DolphinScript.dll
diff --git a/SmiteMixerCodeGrabberGUI/bin/Debug/DolphinScript.pdb b/SmiteMixerCodeGrabberGUI/bin/Debug/DolphinScript.pdb
diff --git a/SmiteMixerCodeGrabberGUI/bin/Debug/MixerChat.dll b/SmiteMixerCodeGrabberGUI/bin/Debug/MixerChat.dll
diff --git a/SmiteMixerCodeGrabberGUI/bin/Debug/MixerChat.pdb b/SmiteMixerCodeGrabberGUI/bin/Debug/MixerChat.pdb
diff --git a/SmiteMixerCodeGrabberGUI/bin/Debug/Smite Mixer Code Grabber.exe b/SmiteMixerCodeGrabberGUI/bin/Debug/Smite Mixer Code Grabber.exe
diff --git a/SmiteMixerCodeGrabberGUI/bin/Debug/Smite Mixer Code Grabber.pdb b/SmiteMixerCodeGrabberGUI/bin/Debug/Smite Mixer Code Grabber.pdb
diff --git a/SmiteMixerCodeGrabberGUI/bin/Debug/SmiteMixerListener.dll b/SmiteMixerCodeGrabberGUI/bin/Debug/SmiteMixerListener.dll
diff --git a/SmiteMixerCodeGrabberGUI/bin/Debug/SmiteMixerListener.pdb b/SmiteMixerCodeGrabberGUI/bin/Debug/SmiteMixerListener.pdb
diff --git a/SmiteMixerCodeGrabberGUI/bin/Release/DolphinScript.dll b/SmiteMixerCodeGrabberGUI/bin/Release/DolphinScript.dll
diff --git a/SmiteMixerCodeGrabberGUI/bin/Release/DolphinScript.pdb b/SmiteMixerCodeGrabberGUI/bin/Release/DolphinScript.pdb
diff --git a/SmiteMixerCodeGrabberGUI/bin/Release/MixerChat.dll b/SmiteMixerCodeGrabberGUI/bin/Release/MixerChat.dll
diff --git a/SmiteMixerCodeGrabberGUI/bin/Release/MixerChat.pdb b/SmiteMixerCodeGrabberGUI/bin/Release/MixerChat.pdb
diff --git a/SmiteMixerCodeGrabberGUI/bin/Release/Smite Mixer Code Grabber.exe b/SmiteMixerCodeGrabberGUI/bin/Release/Smite Mixer Code Grabber.exe
diff --git a/SmiteMixerCodeGrabberGUI/bin/Release/Smite Mixer Code Grabber.pdb b/SmiteMixerCodeGrabberGUI/bin/Release/Smite Mixer Code Grabber.pdb
diff --git a/SmiteMixerCodeGrabberGUI/bin/Release/SmiteMixerListener.dll b/SmiteMixerCodeGrabberGUI/bin/Release/SmiteMixerListener.dll
diff --git a/SmiteMixerCodeGrabberGUI/bin/Release/SmiteMixerListener.pdb b/SmiteMixerCodeGrabberGUI/bin/Release/SmiteMixerListener.pdb
diff --git a/SmiteMixerCodeGrabberGUI/obj/Debug/Smite Mixer Code Grabber.exe b/SmiteMixerCodeGrabberGUI/obj/Debug/Smite Mixer Code Grabber.exe
diff --git a/SmiteMixerCodeGrabberGUI/obj/Debug/Smite Mixer Code Grabber.pdb b/SmiteMixerCodeGrabberGUI/obj/Debug/Smite Mixer Code Grabber.pdb
diff --git a/SmiteMixerCodeGrabberGUI/obj/Debug/SmiteMixerCodeGrabberGUI.csproj.GenerateResource.Cache b/SmiteMixerCodeGrabberGUI/obj/Debug/SmiteMixerCodeGrabberGUI.csproj.GenerateResource.Cache
diff --git a/...xerCodeGrabberGUI/obj/Debug/SmiteMixerCodeGrabberGUI.csprojResolveAssemblyReference.cache b/...xerCodeGrabberGUI/obj/Debug/SmiteMixerCodeGrabberGUI.csprojResolveAssemblyReference.cache
diff --git a/SmiteMixerCodeGrabberGUI/obj/Release/Smite Mixer Code Grabber.exe b/SmiteMixerCodeGrabberGUI/obj/Release/Smite Mixer Code Grabber.exe
diff --git a/SmiteMixerCodeGrabberGUI/obj/Release/Smite Mixer Code Grabber.pdb b/SmiteMixerCodeGrabberGUI/obj/Release/Smite Mixer Code Grabber.pdb
diff --git a/SmiteMixerCodeGrabberGUI/obj/Release/SmiteMixerCodeGrabberGUI.csproj.GenerateResource.Cache b/SmiteMixerCodeGrabberGUI/obj/Release/SmiteMixerCodeGrabberGUI.csproj.GenerateResource.Cache
diff --git a/...rCodeGrabberGUI/obj/Release/SmiteMixerCodeGrabberGUI.csprojResolveAssemblyReference.cache b/...rCodeGrabberGUI/obj/Release/SmiteMixerCodeGrabberGUI.csprojResolveAssemblyReference.cache