Compare commits

...

3 Commits

4 changed files with 30 additions and 3 deletions

View File

@ -13,6 +13,16 @@ public class Vouchers : Transaction {
Entries.Add(e); Entries.Add(e);
} }
public override bool SystemContribution {
get {
if (Faction == Factions.PilotsFederation && Type == "Combat Bond") {
return true;
}
return false;
}
}
public long TotalSum { public long TotalSum {
get { get {
if (Faction == null) { if (Faction == null) {
@ -39,9 +49,9 @@ public class Vouchers : Transaction {
.First(); .First();
if (v == null) { if (v == null) {
return null; return null;
} else if (v == "CombatBond") { } else if (v == Bonds.CombatBond) {
type = "Combat Bond"; type = "Combat Bond";
} else if (v == "bounty") { } else if (v == Bonds.Bounty) {
type = "Bounty"; type = "Bounty";
} else { } else {
type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(v); type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(v);

13
EDPlayerJournal/Bonds.cs Normal file
View File

@ -0,0 +1,13 @@
namespace EDPlayerJournal;
public class Bonds {
/// <summary>
/// Internal string name for combat bonds.
/// </summary>
public static readonly string CombatBond = "CombatBond";
/// <summary>
/// Internal string name for bounties.
/// </summary>
public static readonly string Bounty = "bounty";
}

View File

@ -97,6 +97,10 @@ public class EnglishMissionNames {
{"Mission_TW_PassengerEvacuation_Burning_name", "Passenger Evacuation (Significant Damage)" }, {"Mission_TW_PassengerEvacuation_Burning_name", "Passenger Evacuation (Significant Damage)" },
{"Mission_TW_PassengerEvacuation_UnderAttack_name", "Passenger Evacuation (Thargoid Invasion)" }, {"Mission_TW_PassengerEvacuation_UnderAttack_name", "Passenger Evacuation (Thargoid Invasion)" },
{"Mission_TW_Rescue_UnderAttack_name", "Rescue (Thargoid Attack)" }, {"Mission_TW_Rescue_UnderAttack_name", "Rescue (Thargoid Attack)" },
{"Mission_TW_Massacre_Cyclops_Singular_name", "Kill Cyclops" },
{"Mission_TW_Massacre_Basilisk_Singular_name", "Kill Basilisk" },
{"Mission_TW_Massacre_Cyclops_Plural_name", "Kill Cyclops" },
{"Mission_TW_Massacre_Basilisk_Plural_name", "Kill Basilisk" },
}; };
public static string? Translate(string name) { public static string? Translate(string name) {

View File

@ -120,7 +120,7 @@ public partial class MainWindow : Window {
} }
private void HandleEntries(List<Entry> entries) { private void HandleEntries(List<Entry> entries) {
HandleEntries(entries, DateTime.Now, DateTime.Now); HandleEntries(entries, startdate.Value ?? DateTime.Now, enddate.Value ?? DateTime.Now);
} }
private void Loadentries_EntriesLoaded(List<Entry> lines) { private void Loadentries_EntriesLoaded(List<Entry> lines) {