diff --git a/.vs/MixerSmiteCodeRedeemer/v14/.suo b/.vs/MixerSmiteCodeRedeemer/v14/.suo index 27856f5..18e6b71 100644 Binary files a/.vs/MixerSmiteCodeRedeemer/v14/.suo and b/.vs/MixerSmiteCodeRedeemer/v14/.suo differ diff --git a/Dolphin Script/Classes/ScriptEventClasses/PasteClipboard.cs b/Dolphin Script/Classes/ScriptEventClasses/PasteClipboard.cs new file mode 100644 index 0000000..d939cd5 --- /dev/null +++ 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 index 0eeaa02..04c3abe 100644 --- a/Dolphin Script/Dolphin Script.csproj +++ b/Dolphin Script/Dolphin Script.csproj @@ -82,6 +82,7 @@ + diff --git a/Dolphin Script/bin/Debug/DolphinScript.dll b/Dolphin Script/bin/Debug/DolphinScript.dll index 7a225f2..8408890 100644 Binary files a/Dolphin Script/bin/Debug/DolphinScript.dll and b/Dolphin Script/bin/Debug/DolphinScript.dll differ diff --git a/Dolphin Script/bin/Debug/DolphinScript.pdb b/Dolphin Script/bin/Debug/DolphinScript.pdb index 8c47212..87a2b1a 100644 Binary files a/Dolphin Script/bin/Debug/DolphinScript.pdb and b/Dolphin Script/bin/Debug/DolphinScript.pdb differ diff --git a/Dolphin Script/bin/Release/DolphinScript.dll b/Dolphin Script/bin/Release/DolphinScript.dll index 599e442..d05c9b9 100644 Binary files a/Dolphin Script/bin/Release/DolphinScript.dll and b/Dolphin Script/bin/Release/DolphinScript.dll differ diff --git a/Dolphin Script/bin/Release/DolphinScript.pdb b/Dolphin Script/bin/Release/DolphinScript.pdb index 62763ce..d8855ef 100644 Binary files a/Dolphin Script/bin/Release/DolphinScript.pdb and b/Dolphin Script/bin/Release/DolphinScript.pdb differ diff --git a/Dolphin Script/obj/Debug/Dolphin Script.csproj.FileListAbsolute.txt b/Dolphin Script/obj/Debug/Dolphin Script.csproj.FileListAbsolute.txt index 4adf823..35357bd 100644 --- 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 index a6bbb8d..8265aca 100644 Binary files a/Dolphin Script/obj/Debug/Dolphin Script.csproj.GenerateResource.Cache and b/Dolphin Script/obj/Debug/Dolphin Script.csproj.GenerateResource.Cache differ diff --git a/Dolphin Script/obj/Debug/Dolphin Script.csprojResolveAssemblyReference.cache b/Dolphin Script/obj/Debug/Dolphin Script.csprojResolveAssemblyReference.cache deleted file mode 100644 index bff9d0f..0000000 Binary files a/Dolphin Script/obj/Debug/Dolphin Script.csprojResolveAssemblyReference.cache and /dev/null differ diff --git a/Dolphin Script/obj/Debug/DolphinScript.dll b/Dolphin Script/obj/Debug/DolphinScript.dll index 7a225f2..8408890 100644 Binary files a/Dolphin Script/obj/Debug/DolphinScript.dll and b/Dolphin Script/obj/Debug/DolphinScript.dll differ diff --git a/Dolphin Script/obj/Debug/DolphinScript.pdb b/Dolphin Script/obj/Debug/DolphinScript.pdb index 8c47212..87a2b1a 100644 Binary files a/Dolphin Script/obj/Debug/DolphinScript.pdb and b/Dolphin Script/obj/Debug/DolphinScript.pdb differ diff --git a/Dolphin Script/obj/Release/DolphinScript.dll b/Dolphin Script/obj/Release/DolphinScript.dll index 599e442..d05c9b9 100644 Binary files a/Dolphin Script/obj/Release/DolphinScript.dll and b/Dolphin Script/obj/Release/DolphinScript.dll differ diff --git a/Dolphin Script/obj/Release/DolphinScript.pdb b/Dolphin Script/obj/Release/DolphinScript.pdb index 62763ce..d8855ef 100644 Binary files a/Dolphin Script/obj/Release/DolphinScript.pdb and b/Dolphin Script/obj/Release/DolphinScript.pdb differ diff --git a/MixerChatAPI/bin/Debug/MixerChat.dll b/MixerChatAPI/bin/Debug/MixerChat.dll index 1cd75ef..46d01ab 100644 Binary files a/MixerChatAPI/bin/Debug/MixerChat.dll and b/MixerChatAPI/bin/Debug/MixerChat.dll differ diff --git a/MixerChatAPI/bin/Debug/MixerChat.pdb b/MixerChatAPI/bin/Debug/MixerChat.pdb index 1b77544..07ae546 100644 Binary files a/MixerChatAPI/bin/Debug/MixerChat.pdb and b/MixerChatAPI/bin/Debug/MixerChat.pdb differ diff --git a/MixerChatAPI/bin/Release/MixerChat.dll b/MixerChatAPI/bin/Release/MixerChat.dll index cfebee0..b1cd8ef 100644 Binary files a/MixerChatAPI/bin/Release/MixerChat.dll and b/MixerChatAPI/bin/Release/MixerChat.dll differ diff --git a/MixerChatAPI/bin/Release/MixerChat.pdb b/MixerChatAPI/bin/Release/MixerChat.pdb index 2de0bf2..9206003 100644 Binary files a/MixerChatAPI/bin/Release/MixerChat.pdb and b/MixerChatAPI/bin/Release/MixerChat.pdb differ diff --git a/MixerChatAPI/obj/Debug/MixerChat.dll b/MixerChatAPI/obj/Debug/MixerChat.dll index 1cd75ef..46d01ab 100644 Binary files a/MixerChatAPI/obj/Debug/MixerChat.dll and b/MixerChatAPI/obj/Debug/MixerChat.dll differ diff --git a/MixerChatAPI/obj/Debug/MixerChat.pdb b/MixerChatAPI/obj/Debug/MixerChat.pdb index 1b77544..07ae546 100644 Binary files a/MixerChatAPI/obj/Debug/MixerChat.pdb and b/MixerChatAPI/obj/Debug/MixerChat.pdb differ diff --git a/MixerChatAPI/obj/Debug/MixerChatAPI.csprojResolveAssemblyReference.cache b/MixerChatAPI/obj/Debug/MixerChatAPI.csprojResolveAssemblyReference.cache index 18ea47c..a6da2bb 100644 Binary files a/MixerChatAPI/obj/Debug/MixerChatAPI.csprojResolveAssemblyReference.cache and b/MixerChatAPI/obj/Debug/MixerChatAPI.csprojResolveAssemblyReference.cache differ diff --git a/MixerChatAPI/obj/Release/MixerChat.dll b/MixerChatAPI/obj/Release/MixerChat.dll index cfebee0..b1cd8ef 100644 Binary files a/MixerChatAPI/obj/Release/MixerChat.dll and b/MixerChatAPI/obj/Release/MixerChat.dll differ diff --git a/MixerChatAPI/obj/Release/MixerChat.pdb b/MixerChatAPI/obj/Release/MixerChat.pdb index 2de0bf2..9206003 100644 Binary files a/MixerChatAPI/obj/Release/MixerChat.pdb and b/MixerChatAPI/obj/Release/MixerChat.pdb differ diff --git a/SmiteMixerCodeGrabberCLI/bin/Debug/DolphinScript.dll b/SmiteMixerCodeGrabberCLI/bin/Debug/DolphinScript.dll index 7a225f2..8408890 100644 Binary files a/SmiteMixerCodeGrabberCLI/bin/Debug/DolphinScript.dll and b/SmiteMixerCodeGrabberCLI/bin/Debug/DolphinScript.dll differ diff --git a/SmiteMixerCodeGrabberCLI/bin/Debug/DolphinScript.pdb b/SmiteMixerCodeGrabberCLI/bin/Debug/DolphinScript.pdb index 8c47212..87a2b1a 100644 Binary files a/SmiteMixerCodeGrabberCLI/bin/Debug/DolphinScript.pdb and b/SmiteMixerCodeGrabberCLI/bin/Debug/DolphinScript.pdb differ diff --git a/SmiteMixerCodeGrabberCLI/bin/Debug/MixerChat.dll b/SmiteMixerCodeGrabberCLI/bin/Debug/MixerChat.dll index 1cd75ef..46d01ab 100644 Binary files a/SmiteMixerCodeGrabberCLI/bin/Debug/MixerChat.dll and b/SmiteMixerCodeGrabberCLI/bin/Debug/MixerChat.dll differ diff --git a/SmiteMixerCodeGrabberCLI/bin/Debug/MixerChat.pdb b/SmiteMixerCodeGrabberCLI/bin/Debug/MixerChat.pdb index 1b77544..07ae546 100644 Binary files a/SmiteMixerCodeGrabberCLI/bin/Debug/MixerChat.pdb and b/SmiteMixerCodeGrabberCLI/bin/Debug/MixerChat.pdb differ diff --git a/SmiteMixerCodeGrabberCLI/bin/Debug/SmiteMixerListener.dll b/SmiteMixerCodeGrabberCLI/bin/Debug/SmiteMixerListener.dll index 28bb601..6c73f42 100644 Binary files a/SmiteMixerCodeGrabberCLI/bin/Debug/SmiteMixerListener.dll and b/SmiteMixerCodeGrabberCLI/bin/Debug/SmiteMixerListener.dll differ diff --git a/SmiteMixerCodeGrabberCLI/bin/Debug/SmiteMixerListener.pdb b/SmiteMixerCodeGrabberCLI/bin/Debug/SmiteMixerListener.pdb index 243ca12..61b266a 100644 Binary files a/SmiteMixerCodeGrabberCLI/bin/Debug/SmiteMixerListener.pdb and b/SmiteMixerCodeGrabberCLI/bin/Debug/SmiteMixerListener.pdb differ diff --git a/SmiteMixerCodeGrabberCLI/bin/Release/DolphinScript.dll b/SmiteMixerCodeGrabberCLI/bin/Release/DolphinScript.dll index 599e442..d05c9b9 100644 Binary files a/SmiteMixerCodeGrabberCLI/bin/Release/DolphinScript.dll and b/SmiteMixerCodeGrabberCLI/bin/Release/DolphinScript.dll differ diff --git a/SmiteMixerCodeGrabberCLI/bin/Release/DolphinScript.pdb b/SmiteMixerCodeGrabberCLI/bin/Release/DolphinScript.pdb index 62763ce..d8855ef 100644 Binary files a/SmiteMixerCodeGrabberCLI/bin/Release/DolphinScript.pdb and b/SmiteMixerCodeGrabberCLI/bin/Release/DolphinScript.pdb differ diff --git a/SmiteMixerCodeGrabberCLI/bin/Release/MixerChat.dll b/SmiteMixerCodeGrabberCLI/bin/Release/MixerChat.dll index cfebee0..b1cd8ef 100644 Binary files a/SmiteMixerCodeGrabberCLI/bin/Release/MixerChat.dll and b/SmiteMixerCodeGrabberCLI/bin/Release/MixerChat.dll differ diff --git a/SmiteMixerCodeGrabberCLI/bin/Release/MixerChat.pdb b/SmiteMixerCodeGrabberCLI/bin/Release/MixerChat.pdb index 2de0bf2..9206003 100644 Binary files a/SmiteMixerCodeGrabberCLI/bin/Release/MixerChat.pdb and b/SmiteMixerCodeGrabberCLI/bin/Release/MixerChat.pdb differ diff --git a/SmiteMixerCodeGrabberCLI/bin/Release/SmiteMixerListener.dll b/SmiteMixerCodeGrabberCLI/bin/Release/SmiteMixerListener.dll index 46eef31..8740b14 100644 Binary files a/SmiteMixerCodeGrabberCLI/bin/Release/SmiteMixerListener.dll and b/SmiteMixerCodeGrabberCLI/bin/Release/SmiteMixerListener.dll differ diff --git a/SmiteMixerCodeGrabberCLI/bin/Release/SmiteMixerListener.pdb b/SmiteMixerCodeGrabberCLI/bin/Release/SmiteMixerListener.pdb index 35c10d2..ba07b03 100644 Binary files a/SmiteMixerCodeGrabberCLI/bin/Release/SmiteMixerListener.pdb and b/SmiteMixerCodeGrabberCLI/bin/Release/SmiteMixerListener.pdb differ diff --git a/SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerCodeGrabberCLI.csprojResolveAssemblyReference.cache b/SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerCodeGrabberCLI.csprojResolveAssemblyReference.cache index ac8723f..d3f6325 100644 Binary files a/SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerCodeGrabberCLI.csprojResolveAssemblyReference.cache and b/SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerCodeGrabberCLI.csprojResolveAssemblyReference.cache differ diff --git a/SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerListener.dll b/SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerListener.dll index 28bb601..6c73f42 100644 Binary files a/SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerListener.dll and b/SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerListener.dll differ diff --git a/SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerListener.pdb b/SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerListener.pdb index 243ca12..61b266a 100644 Binary files a/SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerListener.pdb and b/SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerListener.pdb differ diff --git a/SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerCodeGrabberCLI.csprojResolveAssemblyReference.cache b/SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerCodeGrabberCLI.csprojResolveAssemblyReference.cache index 7bee89d..627036f 100644 Binary files a/SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerCodeGrabberCLI.csprojResolveAssemblyReference.cache and b/SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerCodeGrabberCLI.csprojResolveAssemblyReference.cache differ diff --git a/SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerListener.dll b/SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerListener.dll index 46eef31..8740b14 100644 Binary files a/SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerListener.dll and b/SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerListener.dll differ diff --git a/SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerListener.pdb b/SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerListener.pdb index 35c10d2..ba07b03 100644 Binary files a/SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerListener.pdb and b/SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerListener.pdb differ diff --git a/SmiteMixerCodeGrabberGUI/Classes/DynamicResolution.cs b/SmiteMixerCodeGrabberGUI/Classes/DynamicResolution.cs index 0307cbc..0a4e93c 100644 --- a/SmiteMixerCodeGrabberGUI/Classes/DynamicResolution.cs +++ b/SmiteMixerCodeGrabberGUI/Classes/DynamicResolution.cs @@ -16,24 +16,20 @@ static class DynamicResolution { public static List GetRedeemLoop(string code) { + System.Windows.Forms.Clipboard.SetText("/claimpromotion " + code); List SlowTypingScript = new List() { 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 index fa40b20..0383ef4 100644 --- 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 index cc3dc56..af2a494 100644 --- a/SmiteMixerCodeGrabberGUI/MainForm.Designer.cs +++ b/SmiteMixerCodeGrabberGUI/MainForm.Designer.cs @@ -71,6 +71,7 @@ private void InitializeComponent() this.label5 = new System.Windows.Forms.Label(); this.logbox = new System.Windows.Forms.RichTextBox(); this.checkbox_64bitSmite = new System.Windows.Forms.CheckBox(); + this.userGuideToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menustrip_mainForm.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupbox_whitelistedUsernames.SuspendLayout(); @@ -103,7 +104,8 @@ private void InitializeComponent() this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.wikiToolStripMenuItem, this.creditsToolStripMenuItem, - this.reportBugToolStripMenuItem}); + this.reportBugToolStripMenuItem, + this.userGuideToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); this.helpToolStripMenuItem.Text = "Help"; @@ -111,21 +113,21 @@ private void InitializeComponent() // wikiToolStripMenuItem // this.wikiToolStripMenuItem.Name = "wikiToolStripMenuItem"; - this.wikiToolStripMenuItem.Size = new System.Drawing.Size(133, 22); + this.wikiToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.wikiToolStripMenuItem.Text = "Wiki"; this.wikiToolStripMenuItem.Click += new System.EventHandler(this.wikiToolStripMenuItem_Click); // // creditsToolStripMenuItem // this.creditsToolStripMenuItem.Name = "creditsToolStripMenuItem"; - this.creditsToolStripMenuItem.Size = new System.Drawing.Size(133, 22); + this.creditsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.creditsToolStripMenuItem.Text = "Credits"; this.creditsToolStripMenuItem.Click += new System.EventHandler(this.creditsToolStripMenuItem_Click); // // reportBugToolStripMenuItem // this.reportBugToolStripMenuItem.Name = "reportBugToolStripMenuItem"; - this.reportBugToolStripMenuItem.Size = new System.Drawing.Size(133, 22); + this.reportBugToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.reportBugToolStripMenuItem.Text = "Report Bug"; this.reportBugToolStripMenuItem.Click += new System.EventHandler(this.reportBugToolStripMenuItem_Click); // @@ -470,6 +472,13 @@ private void InitializeComponent() this.checkbox_64bitSmite.UseVisualStyleBackColor = true; this.checkbox_64bitSmite.CheckedChanged += new System.EventHandler(this.checkbox_64bitSmite_CheckedChanged); // + // userGuideToolStripMenuItem + // + this.userGuideToolStripMenuItem.Name = "userGuideToolStripMenuItem"; + this.userGuideToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.userGuideToolStripMenuItem.Text = "User Guide"; + this.userGuideToolStripMenuItem.Click += new System.EventHandler(this.userGuideToolStripMenuItem_Click); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -489,7 +498,7 @@ private void InitializeComponent() this.MaximizeBox = false; this.Name = "MainForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Smite Mixer Code Grabber v1.0.3"; + this.Text = "Smite Mixer Code Grabber v1.0.4"; this.Load += new System.EventHandler(this.MainForm_Load); this.menustrip_mainForm.ResumeLayout(false); this.menustrip_mainForm.PerformLayout(); @@ -549,6 +558,7 @@ private void InitializeComponent() private System.Windows.Forms.Button button_BrowseNotificationSound; private System.Windows.Forms.TextBox textbox_NotificationSound; public System.Windows.Forms.CheckBox checkbox_64bitSmite; + private System.Windows.Forms.ToolStripMenuItem userGuideToolStripMenuItem; } } diff --git a/SmiteMixerCodeGrabberGUI/MainForm.cs b/SmiteMixerCodeGrabberGUI/MainForm.cs index 43eebba..2289349 100644 --- 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 index 7a225f2..8408890 100644 Binary files a/SmiteMixerCodeGrabberGUI/bin/Debug/DolphinScript.dll and b/SmiteMixerCodeGrabberGUI/bin/Debug/DolphinScript.dll differ diff --git a/SmiteMixerCodeGrabberGUI/bin/Debug/DolphinScript.pdb b/SmiteMixerCodeGrabberGUI/bin/Debug/DolphinScript.pdb index 8c47212..87a2b1a 100644 Binary files a/SmiteMixerCodeGrabberGUI/bin/Debug/DolphinScript.pdb and b/SmiteMixerCodeGrabberGUI/bin/Debug/DolphinScript.pdb differ diff --git a/SmiteMixerCodeGrabberGUI/bin/Debug/MixerChat.dll b/SmiteMixerCodeGrabberGUI/bin/Debug/MixerChat.dll index 1cd75ef..46d01ab 100644 Binary files a/SmiteMixerCodeGrabberGUI/bin/Debug/MixerChat.dll and b/SmiteMixerCodeGrabberGUI/bin/Debug/MixerChat.dll differ diff --git a/SmiteMixerCodeGrabberGUI/bin/Debug/MixerChat.pdb b/SmiteMixerCodeGrabberGUI/bin/Debug/MixerChat.pdb index 1b77544..07ae546 100644 Binary files a/SmiteMixerCodeGrabberGUI/bin/Debug/MixerChat.pdb and b/SmiteMixerCodeGrabberGUI/bin/Debug/MixerChat.pdb differ diff --git a/SmiteMixerCodeGrabberGUI/bin/Debug/Smite Mixer Code Grabber.exe b/SmiteMixerCodeGrabberGUI/bin/Debug/Smite Mixer Code Grabber.exe index 746c43c..ca36576 100644 Binary files a/SmiteMixerCodeGrabberGUI/bin/Debug/Smite Mixer Code Grabber.exe and b/SmiteMixerCodeGrabberGUI/bin/Debug/Smite Mixer Code Grabber.exe differ diff --git a/SmiteMixerCodeGrabberGUI/bin/Debug/Smite Mixer Code Grabber.pdb b/SmiteMixerCodeGrabberGUI/bin/Debug/Smite Mixer Code Grabber.pdb index e9218e9..f31e01f 100644 Binary files a/SmiteMixerCodeGrabberGUI/bin/Debug/Smite Mixer Code Grabber.pdb and b/SmiteMixerCodeGrabberGUI/bin/Debug/Smite Mixer Code Grabber.pdb differ diff --git a/SmiteMixerCodeGrabberGUI/bin/Debug/SmiteMixerListener.dll b/SmiteMixerCodeGrabberGUI/bin/Debug/SmiteMixerListener.dll index 28bb601..6c73f42 100644 Binary files a/SmiteMixerCodeGrabberGUI/bin/Debug/SmiteMixerListener.dll and b/SmiteMixerCodeGrabberGUI/bin/Debug/SmiteMixerListener.dll differ diff --git a/SmiteMixerCodeGrabberGUI/bin/Debug/SmiteMixerListener.pdb b/SmiteMixerCodeGrabberGUI/bin/Debug/SmiteMixerListener.pdb index 243ca12..61b266a 100644 Binary files a/SmiteMixerCodeGrabberGUI/bin/Debug/SmiteMixerListener.pdb and b/SmiteMixerCodeGrabberGUI/bin/Debug/SmiteMixerListener.pdb differ diff --git a/SmiteMixerCodeGrabberGUI/bin/Release/DolphinScript.dll b/SmiteMixerCodeGrabberGUI/bin/Release/DolphinScript.dll index 599e442..d05c9b9 100644 Binary files a/SmiteMixerCodeGrabberGUI/bin/Release/DolphinScript.dll and b/SmiteMixerCodeGrabberGUI/bin/Release/DolphinScript.dll differ diff --git a/SmiteMixerCodeGrabberGUI/bin/Release/DolphinScript.pdb b/SmiteMixerCodeGrabberGUI/bin/Release/DolphinScript.pdb index 62763ce..d8855ef 100644 Binary files a/SmiteMixerCodeGrabberGUI/bin/Release/DolphinScript.pdb and b/SmiteMixerCodeGrabberGUI/bin/Release/DolphinScript.pdb differ diff --git a/SmiteMixerCodeGrabberGUI/bin/Release/MixerChat.dll b/SmiteMixerCodeGrabberGUI/bin/Release/MixerChat.dll index cfebee0..b1cd8ef 100644 Binary files a/SmiteMixerCodeGrabberGUI/bin/Release/MixerChat.dll and b/SmiteMixerCodeGrabberGUI/bin/Release/MixerChat.dll differ diff --git a/SmiteMixerCodeGrabberGUI/bin/Release/MixerChat.pdb b/SmiteMixerCodeGrabberGUI/bin/Release/MixerChat.pdb index 2de0bf2..9206003 100644 Binary files a/SmiteMixerCodeGrabberGUI/bin/Release/MixerChat.pdb and b/SmiteMixerCodeGrabberGUI/bin/Release/MixerChat.pdb differ diff --git a/SmiteMixerCodeGrabberGUI/bin/Release/Smite Mixer Code Grabber.exe b/SmiteMixerCodeGrabberGUI/bin/Release/Smite Mixer Code Grabber.exe index 925a00c..2ce1729 100644 Binary files a/SmiteMixerCodeGrabberGUI/bin/Release/Smite Mixer Code Grabber.exe and b/SmiteMixerCodeGrabberGUI/bin/Release/Smite Mixer Code Grabber.exe differ diff --git a/SmiteMixerCodeGrabberGUI/bin/Release/Smite Mixer Code Grabber.pdb b/SmiteMixerCodeGrabberGUI/bin/Release/Smite Mixer Code Grabber.pdb index 7099274..536e99b 100644 Binary files a/SmiteMixerCodeGrabberGUI/bin/Release/Smite Mixer Code Grabber.pdb and b/SmiteMixerCodeGrabberGUI/bin/Release/Smite Mixer Code Grabber.pdb differ diff --git a/SmiteMixerCodeGrabberGUI/bin/Release/SmiteMixerListener.dll b/SmiteMixerCodeGrabberGUI/bin/Release/SmiteMixerListener.dll index 46eef31..8740b14 100644 Binary files a/SmiteMixerCodeGrabberGUI/bin/Release/SmiteMixerListener.dll and b/SmiteMixerCodeGrabberGUI/bin/Release/SmiteMixerListener.dll differ diff --git a/SmiteMixerCodeGrabberGUI/bin/Release/SmiteMixerListener.pdb b/SmiteMixerCodeGrabberGUI/bin/Release/SmiteMixerListener.pdb index 35c10d2..ba07b03 100644 Binary files a/SmiteMixerCodeGrabberGUI/bin/Release/SmiteMixerListener.pdb and b/SmiteMixerCodeGrabberGUI/bin/Release/SmiteMixerListener.pdb differ diff --git a/SmiteMixerCodeGrabberGUI/obj/Debug/Smite Mixer Code Grabber.exe b/SmiteMixerCodeGrabberGUI/obj/Debug/Smite Mixer Code Grabber.exe index 746c43c..ca36576 100644 Binary files a/SmiteMixerCodeGrabberGUI/obj/Debug/Smite Mixer Code Grabber.exe and b/SmiteMixerCodeGrabberGUI/obj/Debug/Smite Mixer Code Grabber.exe differ diff --git a/SmiteMixerCodeGrabberGUI/obj/Debug/Smite Mixer Code Grabber.pdb b/SmiteMixerCodeGrabberGUI/obj/Debug/Smite Mixer Code Grabber.pdb index e9218e9..f31e01f 100644 Binary files a/SmiteMixerCodeGrabberGUI/obj/Debug/Smite Mixer Code Grabber.pdb and b/SmiteMixerCodeGrabberGUI/obj/Debug/Smite Mixer Code Grabber.pdb differ diff --git a/SmiteMixerCodeGrabberGUI/obj/Debug/SmiteMixerCodeGrabberGUI.csproj.GenerateResource.Cache b/SmiteMixerCodeGrabberGUI/obj/Debug/SmiteMixerCodeGrabberGUI.csproj.GenerateResource.Cache index dc32f27..178bf15 100644 Binary files a/SmiteMixerCodeGrabberGUI/obj/Debug/SmiteMixerCodeGrabberGUI.csproj.GenerateResource.Cache and b/SmiteMixerCodeGrabberGUI/obj/Debug/SmiteMixerCodeGrabberGUI.csproj.GenerateResource.Cache differ diff --git a/SmiteMixerCodeGrabberGUI/obj/Debug/SmiteMixerCodeGrabberGUI.csprojResolveAssemblyReference.cache b/SmiteMixerCodeGrabberGUI/obj/Debug/SmiteMixerCodeGrabberGUI.csprojResolveAssemblyReference.cache index 51e9863..a00bff9 100644 Binary files a/SmiteMixerCodeGrabberGUI/obj/Debug/SmiteMixerCodeGrabberGUI.csprojResolveAssemblyReference.cache and b/SmiteMixerCodeGrabberGUI/obj/Debug/SmiteMixerCodeGrabberGUI.csprojResolveAssemblyReference.cache differ diff --git a/SmiteMixerCodeGrabberGUI/obj/Release/Smite Mixer Code Grabber.exe b/SmiteMixerCodeGrabberGUI/obj/Release/Smite Mixer Code Grabber.exe index 925a00c..2ce1729 100644 Binary files a/SmiteMixerCodeGrabberGUI/obj/Release/Smite Mixer Code Grabber.exe and b/SmiteMixerCodeGrabberGUI/obj/Release/Smite Mixer Code Grabber.exe differ diff --git a/SmiteMixerCodeGrabberGUI/obj/Release/Smite Mixer Code Grabber.pdb b/SmiteMixerCodeGrabberGUI/obj/Release/Smite Mixer Code Grabber.pdb index 7099274..536e99b 100644 Binary files a/SmiteMixerCodeGrabberGUI/obj/Release/Smite Mixer Code Grabber.pdb and b/SmiteMixerCodeGrabberGUI/obj/Release/Smite Mixer Code Grabber.pdb differ diff --git a/SmiteMixerCodeGrabberGUI/obj/Release/SmiteMixerCodeGrabberGUI.csproj.GenerateResource.Cache b/SmiteMixerCodeGrabberGUI/obj/Release/SmiteMixerCodeGrabberGUI.csproj.GenerateResource.Cache index a2f8c67..178bf15 100644 Binary files a/SmiteMixerCodeGrabberGUI/obj/Release/SmiteMixerCodeGrabberGUI.csproj.GenerateResource.Cache and b/SmiteMixerCodeGrabberGUI/obj/Release/SmiteMixerCodeGrabberGUI.csproj.GenerateResource.Cache differ diff --git a/SmiteMixerCodeGrabberGUI/obj/Release/SmiteMixerCodeGrabberGUI.csprojResolveAssemblyReference.cache b/SmiteMixerCodeGrabberGUI/obj/Release/SmiteMixerCodeGrabberGUI.csprojResolveAssemblyReference.cache index 9b8708d..97ce2b3 100644 Binary files a/SmiteMixerCodeGrabberGUI/obj/Release/SmiteMixerCodeGrabberGUI.csprojResolveAssemblyReference.cache and b/SmiteMixerCodeGrabberGUI/obj/Release/SmiteMixerCodeGrabberGUI.csprojResolveAssemblyReference.cache differ