Skip to content

Commit

Permalink
Manager: Ground work for the new fractal
Browse files Browse the repository at this point in the history
  • Loading branch information
Linkaaaaa committed May 14, 2024
1 parent 0b693b2 commit 089bf1f
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 0 deletions.
1 change: 1 addition & 0 deletions ArcdpsLogManager/Controls/LogEncounterFilterTree.cs
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ private Image GetCategoryIcon(EncounterCategory category)
EncounterCategory.FractalShatteredObservatory => imageProvider.GetFractalMapIcon(),
EncounterCategory.FractalSunquaPeak => imageProvider.GetFractalMapIcon(),
EncounterCategory.FractalSilentSurf => imageProvider.GetFractalMapIcon(),
EncounterCategory.FractalLonelyTower => imageProvider.GetFractalMapIcon(),
EncounterCategory.Map => imageProvider.GetTinyInstanceIcon(),
_ => null
};
Expand Down
2 changes: 2 additions & 0 deletions ArcdpsLogManager/ImageProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ public class ImageProvider
private Lazy<Image> DarkAiKeeperOfThePeakIcon { get; } = new Lazy<Image>(Resources.GetDarkAiKeeperOfThePeakIcon);
private Lazy<Image> BothPhasesAiKeeperOfThePeakIcon { get; } = new Lazy<Image>(Resources.GetBothPhasesAiKeeperOfThePeakIcon);
private Lazy<Image> KanaxaiIcon { get; } = new Lazy<Image>(Resources.GetKanaxaiIcon);
private Lazy<Image> LonelyTowerIconTEMP { get; } = new Lazy<Image>(Resources.GetLonelyTowerIcon);

// FESTIVALS
private Lazy<Image> FreezieIcon { get; } = new Lazy<Image>(Resources.GetFreezieIcon);
Expand Down Expand Up @@ -367,6 +368,7 @@ public Image GetTinyEncounterIcon(Encounter encounter)
Encounter.AiKeeperOfThePeakNightOnly => DarkAiKeeperOfThePeakIcon.Value,
Encounter.AiKeeperOfThePeakDayAndNight => BothPhasesAiKeeperOfThePeakIcon.Value,
Encounter.Kanaxai => KanaxaiIcon.Value,
Encounter.LonelyTowerTEMP => LonelyTowerIconTEMP.Value,
// FESTIVALS
Encounter.Freezie => FreezieIcon.Value,
// TRAINING AREA
Expand Down
1 change: 1 addition & 0 deletions ArcdpsLogManager/Logs/Filters/Groups/CategoryLogGroup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public class CategoryLogGroup : LogGroup
{EncounterCategory.FractalShatteredObservatory, "Shattered Observatory" },
{EncounterCategory.FractalSunquaPeak, "Sunqua Peak" },
{EncounterCategory.FractalSilentSurf, "Silent Surf" },
{EncounterCategory.FractalLonelyTower, "Lonely Tower" },
{EncounterCategory.SpecialForcesTrainingArea, "Special Forces Training Area"},
{EncounterCategory.Other, "Uncategorized (PvE)"},
{EncounterCategory.Festival, "Festivals"},
Expand Down
1 change: 1 addition & 0 deletions ArcdpsLogManager/Resources.cs
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ public static Image GetInstabilityImage(string iconName)
public static Image GetDarkAiKeeperOfThePeakIcon() => GetEncounterImage("Dark_Ai");
public static Image GetBothPhasesAiKeeperOfThePeakIcon() => GetEncounterImage("Both_Phases_Ai");
public static Image GetKanaxaiIcon() => GetEncounterImage("Mini_Kanaxai");
public static Image GetLonelyTowerIcon() => GetEncounterImage("Mini_Kanaxai");

// FESTIVALS
public static Image GetFreezieIcon() => GetEncounterImage("Mini_Freezie");
Expand Down
3 changes: 3 additions & 0 deletions EVTCAnalytics/GameData/Encounters/Encounter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ public enum Encounter
// Fractals - Silent Surf
Kanaxai = 10031,

// Fractals - Lonely Tower
LonelyTowerTEMP = 99999,

// Festivals - Wintersday
Freezie = 20001,

Expand Down
2 changes: 2 additions & 0 deletions EVTCAnalytics/GameData/Encounters/EncounterCategories.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public static class EncounterCategories
{Encounter.AiKeeperOfThePeakNightOnly, EncounterCategory.FractalSunquaPeak},
{Encounter.AiKeeperOfThePeakDayAndNight, EncounterCategory.FractalSunquaPeak},
{Encounter.Kanaxai, EncounterCategory.FractalSilentSurf},
{Encounter.LonelyTowerTEMP, EncounterCategory.FractalLonelyTower},
{Encounter.Freezie, EncounterCategory.StrikeMissionFestival},
{Encounter.StandardKittyGolem, EncounterCategory.SpecialForcesTrainingArea},
{Encounter.MediumKittyGolem, EncounterCategory.SpecialForcesTrainingArea},
Expand Down Expand Up @@ -102,6 +103,7 @@ public static class EncounterCategories
EncounterCategory.FractalShatteredObservatory,
EncounterCategory.FractalSunquaPeak,
EncounterCategory.FractalSilentSurf,
EncounterCategory.FractalLonelyTower,
};

/// <summary>
Expand Down
1 change: 1 addition & 0 deletions EVTCAnalytics/GameData/Encounters/EncounterCategory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public enum EncounterCategory
FractalShatteredObservatory = 302,
FractalSunquaPeak = 303,
FractalSilentSurf = 304,
FractalLonelyTower = 305,
Map = 2000,
}
}

0 comments on commit 089bf1f

Please sign in to comment.