Merge pull request #16 from Slivo-fr/develop

Removes API, removes advanced increment settings
Slivo-fr · Jul 26, 2021 · c62bc5c · c62bc5c
2 parents 808756f + b4fa510
commit c62bc5c
Show file tree

Hide file tree

Showing 19 changed files with 60 additions and 772 deletions.
diff --git a/Elinor/AboutWindow.xaml b/Elinor/AboutWindow.xaml
@@ -26,7 +26,7 @@
         <Label Content="SUPPORT_NAME" Height="28" HorizontalAlignment="Left" Margin="69,167,0,0" x:Name="LblSupport"
             MouseEnter="LblSupportMouseEnter" MouseDown="LblSupportMouseDown" VerticalAlignment="Top"
             Foreground="Blue" Cursor="Hand" MouseLeave="LblSupportMouseLeave" Panel.ZIndex="1" />
-        <Label Content="Thanks to Cuhlen for EVE.Net" Height="28" HorizontalAlignment="Left" Margin="234,148,0,0"
+        <Label Content="Thanks to Cuhlen for EVE.Net" Height="28" HorizontalAlignment="Left" Margin="234,148,0,0"
             x:Name="label5_Copy" VerticalAlignment="Top" FontStyle="Italic" />
     </Grid>
 </Window>
diff --git a/Elinor/ApiImportSelectFactionWindow.xaml b/Elinor/ApiImportSelectFactionWindow.xaml
diff --git a/Elinor/ApiImportSelectFactionWindow.xaml.cs b/Elinor/ApiImportSelectFactionWindow.xaml.cs
diff --git a/Elinor/ApiImportWindow.xaml b/Elinor/ApiImportWindow.xaml
diff --git a/Elinor/ApiImportWindow.xaml.cs b/Elinor/ApiImportWindow.xaml.cs
diff --git a/Elinor/CharWrapper.cs b/Elinor/CharWrapper.cs
diff --git a/Elinor/ClipboardTools.cs b/Elinor/ClipboardTools.cs
@@ -38,17 +38,7 @@ internal static double GetSellPrice(double sell, Profile settings)
             if (settings == null) return .0;
 
             double result = sell;
-
-            if (settings.advancedStepSettings)
-            {
-                result -= (result*settings.sellPercentage > settings.sellThreshold)
-                              ? settings.sellThreshold
-                              : settings.sellPercentage*result;
-            }
-            else
-            {
-                result -= Math.Max(Math.Pow(10, Math.Floor(Math.Log10(result / 1000))), 0.01);
-            }
+            result -= Math.Max(Math.Pow(10, Math.Floor(Math.Log10(result / 1000))), 0.01);
 
             return result;
         }
@@ -58,17 +48,7 @@ internal static double GetBuyPrice(double buy, Profile settings)
             if (settings == null) return .0;
 
             double result = buy;
-
-            if (settings.advancedStepSettings)
-            {
-                result += result*settings.buyPercentage > settings.buyThreshold
-                              ? settings.buyThreshold
-                              : settings.buyPercentage*result;
-            }
-            else
-            {
-                result += Math.Max(Math.Pow(10, Math.Floor(Math.Log10(result / 1000))), 0.01);
-            }
+            result += Math.Max(Math.Pow(10, Math.Floor(Math.Log10(result / 1000))), 0.01);
 
             return result;
         }