From c0b9ad7949af161c4868fcfcdbe5f357084f893d Mon Sep 17 00:00:00 2001 From: Alex <10480967+WakaToa@users.noreply.github.com> Date: Sat, 29 Jun 2019 23:37:56 +0200 Subject: [PATCH 1/3] Fix spin error --- Corvus/DarkOrbit/Data/GalaxyGate.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Corvus/DarkOrbit/Data/GalaxyGate.cs b/Corvus/DarkOrbit/Data/GalaxyGate.cs index 274353b..07ca0df 100644 --- a/Corvus/DarkOrbit/Data/GalaxyGate.cs +++ b/Corvus/DarkOrbit/Data/GalaxyGate.cs @@ -211,7 +211,7 @@ public class Item [XmlAttribute(AttributeName = "part_id")] public int PartId { get; set; } [XmlAttribute(AttributeName = "multiplier_used")] - public bool MultiplierUsed { get; set; } + public int MultiplierUsed { get; set; } [XmlAttribute(AttributeName = "duplicate")] public bool Duplicate { get; set; } From 7525861de205968d777409b9bc8cebfdcca47954 Mon Sep 17 00:00:00 2001 From: Alex <10480967+WakaToa@users.noreply.github.com> Date: Sat, 29 Jun 2019 23:41:48 +0200 Subject: [PATCH 2/3] Update 2.0.0.6 --- Corvus/DarkOrbit/Data/GalaxyGate.cs | 1 + Corvus/FrmMain.cs | 2 +- Corvus/Properties/AssemblyInfo.cs | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Corvus/DarkOrbit/Data/GalaxyGate.cs b/Corvus/DarkOrbit/Data/GalaxyGate.cs index 07ca0df..028fe30 100644 --- a/Corvus/DarkOrbit/Data/GalaxyGate.cs +++ b/Corvus/DarkOrbit/Data/GalaxyGate.cs @@ -203,6 +203,7 @@ public class Item [XmlAttribute(AttributeName = "total")] public int Total { get; set; } [XmlAttribute(AttributeName = "state")] + public string State { get; set; } [XmlAttribute(AttributeName = "date")] public string Date { get; set; } diff --git a/Corvus/FrmMain.cs b/Corvus/FrmMain.cs index 0c946f7..c466a8b 100644 --- a/Corvus/FrmMain.cs +++ b/Corvus/FrmMain.cs @@ -148,7 +148,7 @@ public FrmMain() _hadesRow = dgvGates.Rows[dgvGates.Rows.Add("Hades", 0, false, false, 0)]; _kuiperRow = dgvGates.Rows[dgvGates.Rows.Add("Kuiper", 0, false, false, 0)]; - Log($"Corvus v{Assembly.GetExecutingAssembly().GetName().Version} started - Made by 'Heaven and SrFairyox."); + Log($"Corvus v{Assembly.GetExecutingAssembly().GetName().Version} started - Made by 'Heaven. and SrFairyox"); LoadSettings(); } diff --git a/Corvus/Properties/AssemblyInfo.cs b/Corvus/Properties/AssemblyInfo.cs index b9857a6..4b260fa 100644 --- a/Corvus/Properties/AssemblyInfo.cs +++ b/Corvus/Properties/AssemblyInfo.cs @@ -6,10 +6,10 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Corvus")] -[assembly: AssemblyCopyright("Copyright © 'Heaven and SrFairyox 2019")] +[assembly: AssemblyCopyright("Copyright © 'Heaven. and SrFairyox 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(true)] [assembly: Guid("4e3b77da-9856-4d1e-9bba-cb3260dc1f33")] -[assembly: AssemblyVersion("2.0.0.5")] -[assembly: AssemblyFileVersion("2.0.0.5")] \ No newline at end of file +[assembly: AssemblyVersion("2.0.0.6")] +[assembly: AssemblyFileVersion("2.0.0.6")] \ No newline at end of file From 6e6793c69b33757b1f41abfd4ffa6afc8fa784c8 Mon Sep 17 00:00:00 2001 From: Alex <10480967+WakaToa@users.noreply.github.com> Date: Sun, 30 Jun 2019 15:37:50 +0200 Subject: [PATCH 3/3] fix one more bissue where spinning gates would stop --- Corvus/DarkOrbit/DarkOrbitAccount.cs | 139 +++++++++++++++------------ 1 file changed, 77 insertions(+), 62 deletions(-) diff --git a/Corvus/DarkOrbit/DarkOrbitAccount.cs b/Corvus/DarkOrbit/DarkOrbitAccount.cs index 1763aa7..1e9d1a4 100644 --- a/Corvus/DarkOrbit/DarkOrbitAccount.cs +++ b/Corvus/DarkOrbit/DarkOrbitAccount.cs @@ -360,95 +360,110 @@ public async Task SpinGateAsync(GalaxyGate gate, bool useMultiplie } } - var resultString = await _httpClient.GetAsyncNoLimit(spinUrl); + var resultString = string.Empty; + try + { + resultString = await _httpClient.GetAsyncNoLimit(spinUrl); - var serializer = new XmlSerializer(typeof(GateSpinData)); + var serializer = new XmlSerializer(typeof(GateSpinData)); - GateSpinData result; + GateSpinData result; - using (var reader = new StringReader(resultString)) + using (var reader = new StringReader(resultString)) + { + result = (GateSpinData) serializer.Deserialize(reader) as GateSpinData; + } + + EvaluateGateSpin(result); + + return result; + } + catch (Exception e) { - result = (GateSpinData)serializer.Deserialize(reader) as GateSpinData; + return default(GateSpinData); } - EvaluateGateSpin(result); - return result; } private void EvaluateGateSpin(GateSpinData spin) { - GateItemsReceived.TotalSpins++; - GateData.Samples = spin.Samples; - GateData.EnergyCost.Text = spin.EnergyCost.Text; - GateData.Money = spin.Money; + try + { + GateItemsReceived.TotalSpins++; + GateData.Samples = spin.Samples; + GateData.EnergyCost.Text = spin.EnergyCost.Text; + GateData.Money = spin.Money; - GateData.MultiplierInfo = spin.MultiplierInfo; + GateData.MultiplierInfo = spin.MultiplierInfo; - foreach (var spinItem in spin.Items.GetAllItems()) - { - if (spinItem.Type == "part" && !spinItem.Duplicate) + foreach (var spinItem in spin.Items.GetAllItems()) { - GateItemsReceived.GateParts++; - var gate = GateData.Gates.Gates.Find(x => x.Id == spinItem.GateId); - if (gate != null) + if (spinItem.Type == "part" && !spinItem.Duplicate) { - gate.Total = spinItem.Total; - gate.Current = spinItem.Current; + GateItemsReceived.GateParts++; + var gate = GateData.Gates.Gates.Find(x => x.Id == spinItem.GateId); + if (gate != null) + { + gate.Total = spinItem.Total; + gate.Current = spinItem.Current; + } } - } - if (spinItem.Type == "battery") - { - switch (spinItem.ItemId) + if (spinItem.Type == "battery") { - case 2: - GateItemsReceived.X2 += spinItem.Amount; - break; - case 3: - GateItemsReceived.X3 += spinItem.Amount; - break; - case 4: - GateItemsReceived.X4 += spinItem.Amount; - break; - case 5: - GateItemsReceived.SAB += spinItem.Amount; - break; + switch (spinItem.ItemId) + { + case 2: + GateItemsReceived.X2 += spinItem.Amount; + break; + case 3: + GateItemsReceived.X3 += spinItem.Amount; + break; + case 4: + GateItemsReceived.X4 += spinItem.Amount; + break; + case 5: + GateItemsReceived.SAB += spinItem.Amount; + break; + } } - } - if (spinItem.Type == "ore" && spinItem.ItemId == 4) - { - GateItemsReceived.Xenomit += spinItem.Amount; - } + if (spinItem.Type == "ore" && spinItem.ItemId == 4) + { + GateItemsReceived.Xenomit += spinItem.Amount; + } - if (spinItem.Type == "rocket") - { - switch (spinItem.ItemId) + if (spinItem.Type == "rocket") { - case 3: - GateItemsReceived.PLT2021 += spinItem.Amount; - break; - case 11: - GateItemsReceived.ACM += spinItem.Amount; - break; + switch (spinItem.ItemId) + { + case 3: + GateItemsReceived.PLT2021 += spinItem.Amount; + break; + case 11: + GateItemsReceived.ACM += spinItem.Amount; + break; + } } - } - if (spinItem.Type == "logfile") - { - GateItemsReceived.LogDisks += spinItem.Amount; - } + if (spinItem.Type == "logfile") + { + GateItemsReceived.LogDisks += spinItem.Amount; + } - if (spinItem.Type == "voucher") - { - GateItemsReceived.RepairCredits += spinItem.Amount; - } + if (spinItem.Type == "voucher") + { + GateItemsReceived.RepairCredits += spinItem.Amount; + } - if (spinItem.Type == "nanohull") - { - GateItemsReceived.NanoHull += spinItem.Amount; + if (spinItem.Type == "nanohull") + { + GateItemsReceived.NanoHull += spinItem.Amount; + } } } + catch(Exception e) { } + } public async Task ReadGatesAsync()