florian/EDBGS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix completed at for combat zones

Browse Source
This commit is contained in:
Florian Stinglmayr 2022-11-25 23:06:08 +01:00
parent 0be9791abc
commit 1da4549e2c
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
EDPlayerJournal/BGS/CombatZone.cs
View File

@ -6,13 +6,6 @@ public class CombatZone : Transaction {
public string Type { get; set; } = ""; public string Type { get; set; } = "";
public string Grade { get; set; } = ""; public string Grade { get; set; } = "";
public int Amount { get; set; } = 0; public int Amount { get; set; } = 0;
public DateTime Completed { get; set; } = DateTime.UtcNow;
public override string CompletedAt {
get {
return Completed.ToString("dd.MM.yyyy HH:mm UTC");
}
}
public override int CompareTo(Transaction? obj) { public override int CompareTo(Transaction? obj) {
if (obj == null || obj.GetType() != typeof(CombatZone)) { if (obj == null || obj.GetType() != typeof(CombatZone)) {

1
EDPlayerJournal/BGS/Transaction.cs
View File

@ -1,4 +1,5 @@
using EDPlayerJournal.Entries; using EDPlayerJournal.Entries;
using System.ComponentModel.DataAnnotations.Schema;
namespace EDPlayerJournal.BGS; namespace EDPlayerJournal.BGS;

7
EDPlayerJournal/BGS/TransactionParser.cs
View File

@ -49,7 +49,7 @@ internal class TransactionParserContext {
/// </summary> /// </summary>
public Dictionary<string, long> BuyCost = new(); public Dictionary<string, long> BuyCost = new();
public void DiscernCombatZone(TransactionList transactions) { public void DiscernCombatZone(TransactionList transactions, Entry e) {
string grade = "Low"; string grade = "Low";
string cztype; string cztype;
ulong? highest = HighestCombatBond; ulong? highest = HighestCombatBond;
@ -86,6 +86,7 @@ internal class TransactionParserContext {
Type = cztype, Type = cztype,
Amount = 1, Amount = 1,
}; };
zone.Entries.Add(e);
transactions.Add(zone); transactions.Add(zone);
} }
@ -709,14 +710,14 @@ internal class EmbarkDisembarkParser : TransactionParserPart {
internal class SupercruiseEntryParser : TransactionParserPart { internal class SupercruiseEntryParser : TransactionParserPart {
public void Parse(Entry entry, TransactionParserContext context, TransactionList transactions) { public void Parse(Entry entry, TransactionParserContext context, TransactionList transactions) {
context.DiscernCombatZone(transactions); context.DiscernCombatZone(transactions, entry);
context.ResetCombatZone(); context.ResetCombatZone();
} }
} }
internal class ShutdownParser : TransactionParserPart { internal class ShutdownParser : TransactionParserPart {
public void Parse(Entry entry, TransactionParserContext context, TransactionList transactions) { public void Parse(Entry entry, TransactionParserContext context, TransactionList transactions) {
context.DiscernCombatZone(transactions); context.DiscernCombatZone(transactions, entry);
context.ResetCombatZone(); context.ResetCombatZone();
} }
} }