Update 2.0.0.4 (In process)

WakaToa · Jun 23, 2019 · 5833d79 · 5833d79
1 parent 4b8ff94
commit 5833d79
Show file tree

Hide file tree

Showing 6 changed files with 325 additions and 72 deletions.
diff --git a/Corvus/DarkOrbit/DarkOrbitAccount.cs b/Corvus/DarkOrbit/DarkOrbitAccount.cs
@@ -318,31 +318,58 @@ public async Task<bool> BuildTechAsync(TechFactoryData.TechFactoryItem item, int
             return false;
         }
 
-        public async Task<GateSpinData> SpinGateAsync(GalaxyGate gate)
+        public async Task<GateSpinData> SpinGateAsync(GalaxyGate gate, bool useMultiplier)
         {
-            var spinUrl = string.Format(Urls.SpinGate, Urls.BaseUrl, AccountData.UserId, AccountData.SessionId,
-                (int) gate, gate.GetFullName().ToLower());
-            if (GateData.Samples > 0)
+            if (useMultiplier)
             {
-                spinUrl = string.Format(Urls.SpinGateSample, Urls.BaseUrl, AccountData.UserId, AccountData.SessionId,
+                var spinUrl = string.Format(Urls.SpinGateMultiplier, Urls.BaseUrl, AccountData.UserId, AccountData.SessionId,
                     (int)gate, gate.GetFullName().ToLower());
-            }
 
-            var resultString = await _httpClient.GetAsyncNoLimit(spinUrl);
+                if (GateData.Samples > 0)
+                {
+                    spinUrl = string.Format(Urls.SpinGateSampleMultiplier, Urls.BaseUrl, AccountData.UserId, AccountData.SessionId,
+                        (int)gate, gate.GetFullName().ToLower());
+                }
 
-            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;
+                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,
+                    (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));
 
-            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)

diff --git a/Corvus/DarkOrbit/Data/GalaxyGate.cs b/Corvus/DarkOrbit/Data/GalaxyGate.cs
@@ -42,6 +42,8 @@ public class GateData
         public int Samples { get; set; }
         [XmlElement(ElementName = "energy_cost")]
         public EnergyCostInfo EnergyCost { get; set; }
+        [XmlElement(ElementName = "multipliers")]
+        public Multipliers MultiplierInfo { get; set; }
         [XmlElement(ElementName = "gates")]
         public GatesInfo Gates { get; set; }
 
@@ -54,6 +56,23 @@ 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
         {