Compare commits

..

No commits in common. "b96e40299dd6bee6036a8e684d94876a843df337" and "b4e6b1b46caf071c909bad4ca9a21c810aefe27a" have entirely different histories.

4 changed files with 3 additions and 30 deletions

View File

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

View File

@ -1,13 +0,0 @@
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,10 +97,6 @@ public class EnglishMissionNames {
{"Mission_TW_PassengerEvacuation_Burning_name", "Passenger Evacuation (Significant Damage)" },
{"Mission_TW_PassengerEvacuation_UnderAttack_name", "Passenger Evacuation (Thargoid Invasion)" },
{"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) {

View File

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