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

grade can be null

Browse Source
This commit is contained in:
Florian Stinglmayr 2023-02-26 21:57:24 +01:00
parent 1a8c163fc4
commit d8ac2a7ee7
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
EDPlayerJournal/CombatZones.cs
View File

@ -43,7 +43,7 @@ public class CombatZones {
/// Returns the given combat zone difficulty as an integer, so it can be sorted. /// Returns the given combat zone difficulty as an integer, so it can be sorted.
/// 0 = lowest difficulty, 1 = medium and so forth. /// 0 = lowest difficulty, 1 = medium and so forth.
/// </summary> /// </summary>
public static int? DifficultyRank(string difficulty) { public static int? DifficultyRank(string? difficulty) {
Dictionary<string, int> ranks = new() { Dictionary<string, int> ranks = new() {
{ DifficultyLow, 0 }, { DifficultyLow, 0 },
{ DifficultyMedium, 1 }, { DifficultyMedium, 1 },
@ -51,6 +51,10 @@ public class CombatZones {
{ DifficultyVeryHigh, 3 } { DifficultyVeryHigh, 3 }
}; };
if (difficulty == null ) {
return null;
}
if (ranks.TryGetValue(difficulty, out int rank)) { if (ranks.TryGetValue(difficulty, out int rank)) {
return rank; return rank;
} }

4
EliteBGS/LogGenerator/CombatZoneFormat.cs
View File

@ -9,7 +9,7 @@ class CombatZoneFormat : LogFormatter {
public string GenerateLog(Objective objective) { public string GenerateLog(Objective objective) {
var logs = objective var logs = objective
.EnabledOfType<CombatZone>() .EnabledOfType<CombatZone>()
.OrderBy(x => CombatZones.DifficultyRank(x.Grade)) .OrderBy(x => (CombatZones.DifficultyRank(x.Grade) ?? 0))
.GroupBy(x => new { x.Type, x.Grade }) .GroupBy(x => new { x.Type, x.Grade })
.ToDictionary(x => x.Key, x => x.ToList()) .ToDictionary(x => x.Key, x => x.ToList())
; ;
@ -48,7 +48,7 @@ class CombatZoneFormat : LogFormatter {
public string GenerateSummary(Objective objective) { public string GenerateSummary(Objective objective) {
var logs = objective var logs = objective
.EnabledOfType<CombatZone>() .EnabledOfType<CombatZone>()
.OrderBy(x => CombatZones.DifficultyRank(x.Grade)) .OrderBy(x => (CombatZones.DifficultyRank(x.Grade) ?? 0))
.GroupBy(x => new { x.Type, x.Grade }) .GroupBy(x => new { x.Type, x.Grade })
.ToDictionary(x => x.Key, x => x.ToList()) .ToDictionary(x => x.Key, x => x.ToList())
; ;