Compare commits

...

2 Commits

View File

@ -12,10 +12,15 @@ namespace EDJournal {
if (factions != null) { if (factions != null) {
foreach (JObject faction in factions.Children<JObject>()) { foreach (JObject faction in factions.Children<JObject>()) {
string faction_name = faction.Value<string>("Faction"); string faction_name = faction.Value<string>("Faction");
long faction_bounty = faction.Value<long?>("Amount") ?? 0;
if (faction_name == null || faction_name.Length <= 0) { if (faction_name == null || faction_name.Length <= 0) {
continue; continue;
} }
Factions.Add(faction_name); Factions.Add(faction_name);
if (!FactionBounties.ContainsKey(faction_name)) {
FactionBounties[faction_name] = 0;
}
FactionBounties[faction_name] += faction_bounty;
} }
} }
@ -23,11 +28,16 @@ namespace EDJournal {
string single_faction = JSON.Value<string>("Faction"); string single_faction = JSON.Value<string>("Faction");
if (single_faction != null) { if (single_faction != null) {
Factions.Add(single_faction); Factions.Add(single_faction);
if (!FactionBounties.ContainsKey(single_faction)) {
FactionBounties[single_faction] = 0;
}
FactionBounties[single_faction] += Amount;
} }
} }
public int Amount { get; set; } = 0; public int Amount { get; set; } = 0;
public string Type { get; set; } = "Bounty"; public string Type { get; set; } = "Bounty";
public List<string> Factions { get; set; } = new List<string>(); public List<string> Factions { get; set; } = new List<string>();
public Dictionary<string, long> FactionBounties { get; set; } = new Dictionary<string, long>();
} }
} }