Skip to content
This repository has been archived by the owner on Apr 27, 2023. It is now read-only.

Commit

Permalink
Separated support for 64-Bit Smite and DX11 smite (didn't know you co…
Browse files Browse the repository at this point in the history
…uld have 4 different combinations).

Other fixes to log info etc.
  • Loading branch information
Lumbridge committed Mar 29, 2018
1 parent cf2f8f2 commit 572ac25
Show file tree
Hide file tree
Showing 73 changed files with 96 additions and 32 deletions.
Binary file modified .vs/MixerSmiteCodeRedeemer/v14/.suo
Binary file not shown.
Binary file modified Dolphin Script/bin/Debug/DolphinScript.dll
Binary file not shown.
Binary file modified Dolphin Script/bin/Debug/DolphinScript.pdb
Binary file not shown.
Binary file modified Dolphin Script/bin/Release/DolphinScript.dll
Binary file not shown.
Binary file modified Dolphin Script/bin/Release/DolphinScript.pdb
Binary file not shown.
Binary file modified Dolphin Script/obj/Debug/DolphinScript.dll
Binary file not shown.
Binary file modified Dolphin Script/obj/Debug/DolphinScript.pdb
Binary file not shown.
Binary file modified Dolphin Script/obj/Release/DolphinScript.dll
Binary file not shown.
Binary file modified Dolphin Script/obj/Release/DolphinScript.pdb
Binary file not shown.
Binary file modified MixerChatAPI/bin/Debug/MixerChat.dll
Binary file not shown.
Binary file modified MixerChatAPI/bin/Debug/MixerChat.pdb
Binary file not shown.
Binary file modified MixerChatAPI/bin/Release/MixerChat.dll
Binary file not shown.
Binary file modified MixerChatAPI/bin/Release/MixerChat.pdb
Binary file not shown.
Binary file modified MixerChatAPI/obj/Debug/MixerChat.dll
Binary file not shown.
Binary file modified MixerChatAPI/obj/Debug/MixerChat.pdb
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\MixerChatAPI\bin\Debug\WebSoc
C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\MixerChatAPI\bin\Debug\Newtonsoft.Json.xml
C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\MixerChatAPI\obj\Debug\MixerChat.dll
C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\MixerChatAPI\obj\Debug\MixerChat.pdb
C:\Users\ryans\Source\Repos\SmiteMixerCodeRedeemer\MixerChatAPI\obj\Debug\MixerChatAPI.csprojResolveAssemblyReference.cache
C:\Users\Ry208444\Source\Repos\SmiteMixerCodeRedeemer\MixerChatAPI\bin\Debug\MixerChat.dll.config
C:\Users\Ry208444\Source\Repos\SmiteMixerCodeRedeemer\MixerChatAPI\bin\Debug\MixerChat.dll
C:\Users\Ry208444\Source\Repos\SmiteMixerCodeRedeemer\MixerChatAPI\bin\Debug\MixerChat.pdb
Expand Down
Binary file not shown.
Binary file modified MixerChatAPI/obj/Release/MixerChat.dll
Binary file not shown.
Binary file modified MixerChatAPI/obj/Release/MixerChat.pdb
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberCLI/bin/Debug/DolphinScript.dll
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberCLI/bin/Debug/DolphinScript.pdb
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberCLI/bin/Debug/MixerChat.dll
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberCLI/bin/Debug/MixerChat.pdb
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberCLI/bin/Debug/SmiteMixerListener.dll
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberCLI/bin/Debug/SmiteMixerListener.pdb
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberCLI/bin/Release/DolphinScript.dll
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberCLI/bin/Release/DolphinScript.pdb
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberCLI/bin/Release/MixerChat.dll
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberCLI/bin/Release/MixerChat.pdb
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberCLI/bin/Release/SmiteMixerListener.dll
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberCLI/bin/Release/SmiteMixerListener.pdb
Binary file not shown.
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerListener.dll
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberCLI/obj/Debug/SmiteMixerListener.pdb
Binary file not shown.
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerListener.dll
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberCLI/obj/Release/SmiteMixerListener.pdb
Binary file not shown.
5 changes: 4 additions & 1 deletion SmiteMixerCodeGrabberGUI/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<string>HiRez Hinduman</string>
<string>HiRez Finch</string>
<string>HiRez Vinny</string>
<string>LaTigress</string>
<string>LeTigress</string>
<string>Fdt</string>
</ArrayOfString>
</value>
Expand All @@ -51,6 +51,9 @@
<setting name="use64bitSmite" serializeAs="String">
<value>False</value>
</setting>
<setting name="useDX11Smite" serializeAs="String">
<value>False</value>
</setting>
</SmiteMixerCodeGrabberGUI.Properties.Settings>
</userSettings>
</configuration>
16 changes: 16 additions & 0 deletions SmiteMixerCodeGrabberGUI/Classes/Common.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,21 @@ public static void PlayNotificationSound()
catch { Console.WriteLine("Unable to play notification sound (invalid file format/path)."); }

}

public static string GetSmiteWindowTitle()
{
string bit, dx;
if (Properties.Settings.Default.use64bitSmite)
bit = "64";
else
bit = "32";

if (Properties.Settings.Default.useDX11Smite)
dx = "DX11";
else
dx = "DX9";

return "Smite (" + bit + "-bit, " + dx + ")";
}
}
}
6 changes: 5 additions & 1 deletion SmiteMixerCodeGrabberGUI/Classes/DynamicResolution.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ static class DynamicResolution
{
public static List<ScriptEvent> GetRedeemLoop(string code)
{
System.Windows.Forms.Clipboard.SetText("/claimpromotion " + code);
try
{
System.Windows.Forms.Clipboard.SetText("/claimpromotion " + code);
}
catch { }
List<ScriptEvent> SlowTypingScript = new List<ScriptEvent>()
{
new MouseMoveToAreaOnWindow() { ClickArea = new RECT(), WindowToClickTitle = Properties.Settings.Default.smiteWindowTitle },
Expand Down
2 changes: 1 addition & 1 deletion SmiteMixerCodeGrabberGUI/Classes/MetaInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace SmiteMixerCodeGrabberGUI.Classes
{
public static class MetaInfo
{
public static string Version = "v1.0.4";
public static string Version = "v1.0.5";

public static string GetMetaInfoConsole()
{
Expand Down
16 changes: 15 additions & 1 deletion SmiteMixerCodeGrabberGUI/MainForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 22 additions & 21 deletions SmiteMixerCodeGrabberGUI/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ private void MainForm_Load(object sender, EventArgs e)
Console.SetOut(new LogWriter(logbox));

checkbox_64bitSmite.Checked = Properties.Settings.Default.use64bitSmite;
checkbox_DX11.Checked = Properties.Settings.Default.useDX11Smite;

checkbox_AFKMode.Checked = Properties.Settings.Default.AFKMode;

Expand Down Expand Up @@ -81,7 +82,7 @@ private static void Chat_OnMessageReceived(ChatMessageEventArgs e)
if (GetActiveCodes().Find(x => x.GetCode() == code) == null && GetExpiredCodes().Find(x => x.GetCode() == code) == null && !code.Contains(" "))
{
AddCodeToCodeList(code, true);
Write("Code: " + code + " added to active codes (Grabbed from non-whitelisted user: " + e.User + ".");
Write("Code: " + code + " added to active codes (Grabbed from user: " + e.User + ").");
}
else
{
Expand All @@ -106,11 +107,11 @@ private static void Chat_OnMessageReceived(ChatMessageEventArgs e)
if (GetActiveCodes().Find(x => x.GetCode() == code) == null && GetExpiredCodes().Find(x => x.GetCode() == code) == null && !code.Contains(" "))
{
AddCodeToCodeList(code, true);
Write("Code: " + code + " added to active codes (Grabbed from whitelisted user: " + e.User + ".");
Write("Code: " + code + " added to active codes (Grabbed from user: " + e.User + ").");
if (Properties.Settings.Default.notificationSound)
PlayNotificationSound();
if (Properties.Settings.Default.notificationSetting)
DisplayNotification("New potential code added to active codes: \n" + code);
DisplayNotification("New code added to active codes: \n" + code);
}
else
{
Expand Down Expand Up @@ -223,8 +224,12 @@ private void button_CopySelectedToClipboard_Click(object sender, EventArgs e)
{
if(listbox_Active.SelectedIndex >= 0)
{
Clipboard.SetText(GetActiveCodes()[listbox_Active.SelectedIndex].GetCode());
Write("Copied code to clipboard: " + GetActiveCodes()[listbox_Active.SelectedIndex].GetCode());
try
{
Clipboard.SetText(GetActiveCodes()[listbox_Active.SelectedIndex].GetCode());
Write("Copied code to clipboard: " + GetActiveCodes()[listbox_Active.SelectedIndex].GetCode());
}
catch{ }
}
}
private void button_BrowseNotificationSound_Click(object sender, EventArgs e)
Expand Down Expand Up @@ -268,18 +273,16 @@ private void logbox_TextChanged(object sender, EventArgs e)
private void checkbox_64bitSmite_CheckedChanged(object sender, EventArgs e)
{
Properties.Settings.Default.use64bitSmite = checkbox_64bitSmite.Checked;
if (checkbox_64bitSmite.Checked)
{
Properties.Settings.Default.smiteWindowTitle = "Smite (64-bit, DX11)";
Properties.Settings.Default.Save();
Write("Using 64-Bit Client : True; will look for Window with title: Smite (64-bit, DX11).");
}
else
{
Properties.Settings.Default.smiteWindowTitle = "Smite (32-bit, DX9)";
Properties.Settings.Default.Save();
Write("Using 64-Bit Client : False; will look for Window with title: Smite (32-bit, DX9).");
}
Properties.Settings.Default.smiteWindowTitle = GetSmiteWindowTitle();
Properties.Settings.Default.Save();
Write("Graphics settings toggled; Will now look for Window with title: " + GetSmiteWindowTitle());
}
private void checkbox_DX11_CheckedChanged(object sender, EventArgs e)
{
Properties.Settings.Default.useDX11Smite = checkbox_DX11.Checked;
Properties.Settings.Default.smiteWindowTitle = GetSmiteWindowTitle();
Properties.Settings.Default.Save();
Write("Graphics settings toggled; Will now look for Window with title: " + GetSmiteWindowTitle());
}
#endregion

Expand Down Expand Up @@ -388,7 +391,7 @@ public static void MainLoop()
{
if (code.GetIsRedeemed() == false && IsRunning)
{
Write("AFK Mode: Redeeming code (" + code + ").");
Write("AFK Mode: Redeeming code (" + code.GetCode() + ").");

// get the event list and pass it the code we want it to type
//
Expand All @@ -402,10 +405,8 @@ public static void MainLoop()
code.SetIsRedeemed(true);
}
}
Write("AFK Mode is enabled; code queue is empty. Going to sleep for 15 seconds...");
Thread.Sleep(15000);
}
Thread.Sleep(500);
Thread.Sleep(100);
}
}

Expand Down
14 changes: 13 additions & 1 deletion SmiteMixerCodeGrabberGUI/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion SmiteMixerCodeGrabberGUI/Properties/Settings.settings
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
&lt;string&gt;HiRez Hinduman&lt;/string&gt;
&lt;string&gt;HiRez Finch&lt;/string&gt;
&lt;string&gt;HiRez Vinny&lt;/string&gt;
&lt;string&gt;LaTigress&lt;/string&gt;
&lt;string&gt;LeTigress&lt;/string&gt;
&lt;string&gt;Fdt&lt;/string&gt;
&lt;/ArrayOfString&gt;</Value>
</Setting>
Expand All @@ -41,5 +41,8 @@
<Setting Name="use64bitSmite" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="useDX11Smite" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>
Binary file modified SmiteMixerCodeGrabberGUI/bin/Debug/DolphinScript.dll
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberGUI/bin/Debug/DolphinScript.pdb
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberGUI/bin/Debug/MixerChat.dll
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberGUI/bin/Debug/MixerChat.pdb
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberGUI/bin/Debug/Smite Mixer Code Grabber.exe
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<string>HiRez Hinduman</string>
<string>HiRez Finch</string>
<string>HiRez Vinny</string>
<string>LaTigress</string>
<string>LeTigress</string>
<string>Fdt</string>
</ArrayOfString>
</value>
Expand All @@ -51,6 +51,9 @@
<setting name="use64bitSmite" serializeAs="String">
<value>False</value>
</setting>
<setting name="useDX11Smite" serializeAs="String">
<value>False</value>
</setting>
</SmiteMixerCodeGrabberGUI.Properties.Settings>
</userSettings>
</configuration>
Binary file modified SmiteMixerCodeGrabberGUI/bin/Debug/Smite Mixer Code Grabber.pdb
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<string>HiRez Hinduman</string>
<string>HiRez Finch</string>
<string>HiRez Vinny</string>
<string>LaTigress</string>
<string>LeTigress</string>
<string>Fdt</string>
</ArrayOfString>
</value>
Expand All @@ -51,6 +51,9 @@
<setting name="use64bitSmite" serializeAs="String">
<value>False</value>
</setting>
<setting name="useDX11Smite" serializeAs="String">
<value>False</value>
</setting>
</SmiteMixerCodeGrabberGUI.Properties.Settings>
</userSettings>
</configuration>
Binary file modified SmiteMixerCodeGrabberGUI/bin/Debug/SmiteMixerListener.dll
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberGUI/bin/Debug/SmiteMixerListener.pdb
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberGUI/bin/Release/DolphinScript.dll
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberGUI/bin/Release/DolphinScript.pdb
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberGUI/bin/Release/MixerChat.dll
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberGUI/bin/Release/MixerChat.pdb
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberGUI/bin/Release/Smite Mixer Code Grabber.exe
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<string>HiRez Hinduman</string>
<string>HiRez Finch</string>
<string>HiRez Vinny</string>
<string>LaTigress</string>
<string>LeTigress</string>
<string>Fdt</string>
</ArrayOfString>
</value>
Expand All @@ -51,6 +51,9 @@
<setting name="use64bitSmite" serializeAs="String">
<value>False</value>
</setting>
<setting name="useDX11Smite" serializeAs="String">
<value>False</value>
</setting>
</SmiteMixerCodeGrabberGUI.Properties.Settings>
</userSettings>
</configuration>
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<string>HiRez Hinduman</string>
<string>HiRez Finch</string>
<string>HiRez Vinny</string>
<string>LaTigress</string>
<string>LeTigress</string>
<string>Fdt</string>
</ArrayOfString>
</value>
Expand All @@ -51,6 +51,9 @@
<setting name="use64bitSmite" serializeAs="String">
<value>False</value>
</setting>
<setting name="useDX11Smite" serializeAs="String">
<value>False</value>
</setting>
</SmiteMixerCodeGrabberGUI.Properties.Settings>
</userSettings>
</configuration>
Binary file modified SmiteMixerCodeGrabberGUI/bin/Release/SmiteMixerListener.dll
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberGUI/bin/Release/SmiteMixerListener.pdb
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberGUI/obj/Debug/Smite Mixer Code Grabber.exe
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberGUI/obj/Debug/Smite Mixer Code Grabber.pdb
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified SmiteMixerCodeGrabberGUI/obj/Release/Smite Mixer Code Grabber.exe
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 572ac25

Please sign in to comment.