Compare commits
No commits in common. "d19bef33d2acbb38f0c967528a944598184c9c56" and "d38fdcac9c951e1c1325353821fd06a560e6e1e7" have entirely different histories.
d19bef33d2
...
d38fdcac9c
@ -8,34 +8,13 @@ namespace EliteBGS.BGS {
|
||||
Entries.Add(e);
|
||||
}
|
||||
|
||||
public Cartographics(SellExplorationDataEntry e) {
|
||||
Entries.Add(e);
|
||||
}
|
||||
|
||||
public override int CompareTo(LogEntry other) {
|
||||
if (other == null || other.GetType() != typeof(Cartographics)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
Cartographics b = other as Cartographics;
|
||||
if (b.System == System && b.Faction == Faction && b.Station == Station) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
public long TotalSum {
|
||||
public int TotalSum {
|
||||
get {
|
||||
/* add multi sell and normal ones together */
|
||||
long total =
|
||||
Entries.OfType<MultiSellExplorationDataEntry>()
|
||||
.Sum(x => x.TotalEarnings)
|
||||
+
|
||||
Entries.OfType<SellExplorationDataEntry>()
|
||||
.Sum(x => x.TotalEarnings)
|
||||
;
|
||||
return total;
|
||||
return (from entry in Entries
|
||||
where entry.Is(Events.MultiSellExplorationData)
|
||||
select (entry as MultiSellExplorationDataEntry).TotalEarnings)
|
||||
.Sum()
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -36,7 +36,6 @@ namespace EliteBGS.BGS {
|
||||
e.Is(Events.FSDJump) ||
|
||||
e.Is(Events.Location) ||
|
||||
e.Is(Events.MultiSellExplorationData) ||
|
||||
e.Is(Events.SellExplorationData) ||
|
||||
e.Is(Events.SellMicroResources) ||
|
||||
e.Is(Events.RedeemVoucher) ||
|
||||
e.Is(Events.FactionKillBond) ||
|
||||
@ -140,15 +139,6 @@ namespace EliteBGS.BGS {
|
||||
/* Mission failed should be collated if they are in the same system/station
|
||||
*/
|
||||
collate = true;
|
||||
} else if (e.Is(Events.SellExplorationData)) {
|
||||
results.Add(new Cartographics(e as SellExplorationDataEntry) {
|
||||
System = current_system,
|
||||
Station = current_station,
|
||||
Faction = controlling_faction,
|
||||
});
|
||||
|
||||
/* colate single cartographic selling into one */
|
||||
collate = true;
|
||||
} else if (e.Is(Events.MultiSellExplorationData)) {
|
||||
/* For multi-sell-exploraton-data only the controlling faction of the station sold to matters.
|
||||
*/
|
||||
@ -157,8 +147,6 @@ namespace EliteBGS.BGS {
|
||||
Station = current_station,
|
||||
Faction = controlling_faction
|
||||
});
|
||||
|
||||
collate = true;
|
||||
} else if (e.Is(Events.RedeemVoucher)) {
|
||||
/* Same for selling combat vouchers. Only the current controlling faction matters here.
|
||||
*/
|
||||
|
@ -1,12 +1,10 @@
|
||||
# EliteBGS changelog
|
||||
|
||||
## 0.1.0-beta6 on 22.01.2022
|
||||
## 0.1.0-beta6 on ??.??.2022
|
||||
|
||||
* Month names should now always be in English in the NONA log format.
|
||||
* Add influence support (by secondary mission objectives) to the log format.
|
||||
* Remember last used discord log template.
|
||||
* Add support for SellExplorationData journal entry.
|
||||
* Improve credit formatting.
|
||||
|
||||
## 0.1.0-beta5 on 21.01.2022
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user