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

fix cartographics value, use Total instead of TotalEarnings

Browse Source
This commit is contained in:
Florian Stinglmayr 2024-09-17 18:49:18 +02:00
parent 916afb2348
commit 9f013bed38
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
EDPlayerJournal/BGS/Cartographics.cs
View File

@ -35,10 +35,10 @@ public class Cartographics : Transaction {
/* add multi sell and normal ones together */
long total =
Entries.OfType<MultiSellExplorationDataEntry>()
.Sum(x => x.TotalEarnings)
.Sum(x => x.Total)
+
Entries.OfType<SellExplorationDataEntry>()
.Sum(x => x.TotalEarnings)
.Sum(x => x.Total)
;
return total;
}

21
EDPlayerJournal/Entries/MultiSellExplorationDataEntry.cs
View File

@ -1,8 +1,23 @@
namespace EDPlayerJournal.Entries;
namespace EDPlayerJournal.Entries;
public class MultiSellExplorationDataEntry : Entry {
protected override void Initialise() {
TotalEarnings = (JSON.Value<int?>("TotalEarnings") ?? 0);
TotalEarnings = JSON.Value<long?>("TotalEarnings") ?? 0;
BaseValue = JSON.Value<long?>("BaseValue") ?? 0;
Bonus = JSON.Value<long?>("Bonus") ?? 0;
}
public int TotalEarnings { get; set; } = 0;
public long Total {
get { return BaseValue + Bonus; }
}
public long BaseValue { get; set; } = 0;
public long Bonus { get; set; } = 0;
/// <summary>
/// Total Earnings are the actual earnings without bonus. So this
/// value is BaseValue minus any percent a crew pilot takes.
/// </summary>
public long TotalEarnings { get; set; } = 0;
}

9
EDPlayerJournal/Entries/SellExplorationDataEntry.cs
View File

@ -6,8 +6,17 @@ namespace EDPlayerJournal.Entries;
public class SellExplorationDataEntry : Entry {
public long BaseValue { get; set; }
public long Bonus { get; set; }
/// <summary>
/// Total Earnings are the actual earnings without bonus. So this
/// value is BaseValue minus any percent a crew pilot takes.
/// </summary>
public long TotalEarnings { get; set; }
public long Total {
get { return BaseValue + Bonus; }
}
public List<string> Systems { get; set; } = new List<string>();
public List<string> Discovered { get; set; } = new List<string>();