Skip to content

Commit

Permalink
-Changing the tax formular to adress the last changes made by ccp
Browse files Browse the repository at this point in the history
-Clearing the Clipboard before setting new value helps without
throwing CLIPBRD_E_CANT_OPEN everytime you export a new log with
-Replacing obselete api call call with a new one from the Threading api
-Added vs folder to gitignore
  • Loading branch information
moarsmokes committed Aug 23, 2019
1 parent 785ebfb commit 433c995
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ Elinor/bin/
Elinor/obj/
*.suo
*.msi
.vs/
4 changes: 2 additions & 2 deletions Elinor/CalculateDataThread.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 1 addition & 0 deletions Elinor/ClipboardTools.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion Elinor/MessageBoxEx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Windows.Forms;
using System.Drawing;
using System.Runtime.InteropServices;
using System.Threading;

namespace Elinor
{
Expand Down Expand Up @@ -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);
}
}

Expand Down

0 comments on commit 433c995

Please sign in to comment.