add multiplier

WakaToa · Jun 23, 2019 · 57b0719 · 57b0719
1 parent 5833d79
commit 57b0719
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 43 deletions.
diff --git a/Corvus/DarkOrbit/DarkOrbitAccount.cs b/Corvus/DarkOrbit/DarkOrbitAccount.cs
@@ -1,6 +1,8 @@
 using System;
 using System.IO;
+using System.Linq;
 using System.Net;
+using System.Runtime.Remoting.Lifetime;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Xml.Serialization;
@@ -318,11 +320,24 @@ public async Task<bool> BuildTechAsync(TechFactoryData.TechFactoryItem item, int
             return false;
         }
 
+        private bool IsMultiplierAvailable(GalaxyGate gate)
+        {
+            var gateName = gate.GetFullName().ToLower();
+
+            var data = GateData.MultiplierInfo.MultiplierInfo.FirstOrDefault(x => x.Mode.ToLower() == gateName);
+            if (data == null)
+            {
+                return false;
+            }
+            return data.Value >= 0;
+        }
+
         public async Task<GateSpinData> SpinGateAsync(GalaxyGate gate, bool useMultiplier)
         {
-            if (useMultiplier)
+            var spinUrl = string.Empty;
+            if (useMultiplier && IsMultiplierAvailable(gate))
             {
-                var spinUrl = string.Format(Urls.SpinGateMultiplier, Urls.BaseUrl, AccountData.UserId, AccountData.SessionId,
+                spinUrl = string.Format(Urls.SpinGateMultiplier, Urls.BaseUrl, AccountData.UserId, AccountData.SessionId,
                     (int)gate, gate.GetFullName().ToLower());
 
                 if (GateData.Samples > 0)
@@ -331,45 +346,33 @@ public async Task<GateSpinData> SpinGateAsync(GalaxyGate gate, bool useMultiplie
                         (int)gate, gate.GetFullName().ToLower());
                 }
 
-                var resultString = await _httpClient.GetAsyncNoLimit(spinUrl);
-
-                var serializer = new XmlSerializer(typeof(GateSpinData));
-
-                GateSpinData result;
-
-                using (var reader = new StringReader(resultString))
-                {
-                    result = (GateSpinData)serializer.Deserialize(reader) as GateSpinData;
-                }
-                EvaluateGateSpin(result);
-
-                return result;
+
             }
             else
             {
-                var spinUrl = string.Format(Urls.SpinGate, Urls.BaseUrl, AccountData.UserId, AccountData.SessionId,
+                spinUrl = string.Format(Urls.SpinGate, Urls.BaseUrl, AccountData.UserId, AccountData.SessionId,
                     (int)gate, gate.GetFullName().ToLower());
 
                 if (GateData.Samples > 0)
                 {
                     spinUrl = string.Format(Urls.SpinGateSample, Urls.BaseUrl, AccountData.UserId, AccountData.SessionId,
                         (int)gate, gate.GetFullName().ToLower());
                 }
+            }
 
-                var resultString = await _httpClient.GetAsyncNoLimit(spinUrl);
-
-                var serializer = new XmlSerializer(typeof(GateSpinData));
+            var resultString = await _httpClient.GetAsyncNoLimit(spinUrl);
 
-                GateSpinData result;
+            var serializer = new XmlSerializer(typeof(GateSpinData));
 
-                using (var reader = new StringReader(resultString))
-                {
-                    result = (GateSpinData)serializer.Deserialize(reader) as GateSpinData;
-                }
-                EvaluateGateSpin(result);
+            GateSpinData result;
 
-                return result;
+            using (var reader = new StringReader(resultString))
+            {
+                result = (GateSpinData)serializer.Deserialize(reader) as GateSpinData;
             }
+            EvaluateGateSpin(result);
+
+            return result;
         }
 
         private void EvaluateGateSpin(GateSpinData spin)
@@ -379,6 +382,7 @@ private void EvaluateGateSpin(GateSpinData spin)
             GateData.EnergyCost.Text = spin.EnergyCost.Text;
             GateData.Money = spin.Money;
 
+            GateData.MultiplierInfo = spin.MultiplierInfo;
 
             foreach (var spinItem in spin.Items.GetAllItems())
             {

diff --git a/Corvus/DarkOrbit/Data/GalaxyGate.cs b/Corvus/DarkOrbit/Data/GalaxyGate.cs
@@ -31,6 +31,24 @@ public enum GalaxyGate
         Kuiper = 19
     }
 
+
+    [XmlRoot(ElementName = "multiplier")]
+    public class Multiplier
+    {
+        [XmlAttribute(AttributeName = "mode")]
+        public string Mode { get; set; }
+        [XmlAttribute(AttributeName = "value")]
+        public int Value { get; set; }
+        [XmlAttribute(AttributeName = "state")]
+        public int State { get; set; }
+    }
+    [XmlRoot(ElementName = "multipliers")]
+    public class Multipliers
+    {
+        [XmlElement(ElementName = "multiplier")]
+        public List<Multiplier> MultiplierInfo { get; set; }
+    }
+
     [XmlRoot(ElementName = "jumpgate")]
     public class GateData
     {
@@ -56,22 +74,7 @@ public class EnergyCostInfo
             public int Text { get; set; }
         }
 
-        [XmlRoot(ElementName = "multiplier")]
-        public class Multiplier
-        {
-            [XmlAttribute(AttributeName = "mode")]
-            public string Mode { get; set; }
-            [XmlAttribute(AttributeName = "value")]
-            public int Value { get; set; }
-            [XmlAttribute(AttributeName = "state")]
-            public int State { get; set; }
-        }
-        [XmlRoot(ElementName = "multipliers")]
-        public class Multipliers
-        {
-            [XmlElement(ElementName = "multiplier")]
-            public List<Multiplier> MultiplierInfo { get; set; }
-        }
+
 
         [XmlRoot(ElementName = "gate")]
         public class Gate
@@ -174,6 +177,9 @@ public class GateSpinData
         [XmlElement(ElementName = "items")]
         public ItemsInfo Items { get; set; }
 
+        [XmlElement(ElementName = "multipliers")]
+        public Multipliers MultiplierInfo { get; set; }
+
         [XmlRoot(ElementName = "energy_cost")]
         public class EnergyCostInfo
         {

diff --git a/Corvus/FrmMain.cs b/Corvus/FrmMain.cs
@@ -92,7 +92,6 @@ public partial class FrmMain : Form
         private bool manuallyStopped = false;
         private bool loginAccount = false;
         private bool useMultiplier = false;
-        private int multiplier = 1;
 
         private DateTime _nextRunTechFactory = DateTime.Now;
         private DateTime _nextRunSkylab = DateTime.Now;

diff --git a/Corvus/packages.config → Corvus/packages 2.config b/Corvus/packages.config → Corvus/packages 2.config