Merge pull request #12 from moarsmokes/master

-Changing the tax formular to adress the last changes made by ccp

.gitignore

@@ -44,3 +44,4 @@ Elinor/bin/
 Elinor/obj/
 *.suo
 *.msi
+.vs/

Elinor/CalculateDataThread.cs

@@ -43,12 +43,12 @@ internal static double SellBrokerFee(Profile profile)
 
         internal static double NpcBroker(Profile profile)
         {
-            return (3 - (profile.brokerRelations * 0.1 + profile.factionStanding * 0.03 + profile.corpStanding * 0.02)) / 100;
+            return (5 - (profile.brokerRelations * 0.3 + profile.factionStanding * 0.03 + profile.corpStanding * 0.02)) / 100;
         }
 
         internal static double SalesTax(int accounting)
         {
-            return .020*(1 - (accounting*.1));
+            return .050*(1 - (accounting*.11));
         }
 
         internal void Run()

Elinor/ClipboardTools.cs

@@ -19,6 +19,7 @@ internal static void SetClipboardWrapper(double d)
 
             while (copied == false && Attempts < 3)
             {
+                Clipboard.Clear();
                 try
                 {
                     Clipboard.SetText(d > .01 ? Math.Round(d, 2).ToString(CultureInfo.InvariantCulture) : string.Empty);

Elinor/MessageBoxEx.cs

@@ -3,6 +3,7 @@
 using System.Windows.Forms;
 using System.Drawing;
 using System.Runtime.InteropServices;
+using System.Threading;
 
 namespace Elinor
 {
@@ -166,7 +167,7 @@ private static void Initialize()
 
             if (_owner != null)
             {
-                _hHook = SetWindowsHookEx(WH_CALLWNDPROCRET, _hookProc, IntPtr.Zero, AppDomain.GetCurrentThreadId());
+                _hHook = SetWindowsHookEx(WH_CALLWNDPROCRET, _hookProc, IntPtr.Zero, Thread.CurrentThread.ManagedThreadId);
             }
         }