Skip to content

Commit

Permalink
Manager: Added Eparch
Browse files Browse the repository at this point in the history
  • Loading branch information
Linkaaaaa committed Jun 4, 2024
1 parent d671e35 commit 4710535
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 11 deletions.
4 changes: 2 additions & 2 deletions ArcdpsLogManager/ImageProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +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);
private Lazy<Image> EparchIcon { get; } = new Lazy<Image>(Resources.GetEparchIcon);

// FESTIVALS
private Lazy<Image> FreezieIcon { get; } = new Lazy<Image>(Resources.GetFreezieIcon);
Expand Down Expand Up @@ -368,7 +368,7 @@ public Image GetTinyEncounterIcon(Encounter encounter)
Encounter.AiKeeperOfThePeakNightOnly => DarkAiKeeperOfThePeakIcon.Value,
Encounter.AiKeeperOfThePeakDayAndNight => BothPhasesAiKeeperOfThePeakIcon.Value,
Encounter.Kanaxai => KanaxaiIcon.Value,
Encounter.LonelyTowerTEMP => LonelyTowerIconTEMP.Value,
Encounter.Eparch => EparchIcon.Value,
// FESTIVALS
Encounter.Freezie => FreezieIcon.Value,
// TRAINING AREA
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ArcdpsLogManager/Resources.cs
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +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");
public static Image GetEparchIcon() => GetEncounterImage("Mini_Eparch");

// FESTIVALS
public static Image GetFreezieIcon() => GetEncounterImage("Mini_Freezie");
Expand Down
2 changes: 1 addition & 1 deletion EVTCAnalytics/GameData/Encounters/Encounter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public enum Encounter
Kanaxai = 10031,

// Fractals - Lonely Tower
LonelyTowerTEMP = 10041,
Eparch = 10041,

// Festivals - Wintersday
Freezie = 20001,
Expand Down
2 changes: 1 addition & 1 deletion EVTCAnalytics/GameData/Encounters/EncounterCategories.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public static class EncounterCategories
{Encounter.AiKeeperOfThePeakNightOnly, EncounterCategory.FractalSunquaPeak},
{Encounter.AiKeeperOfThePeakDayAndNight, EncounterCategory.FractalSunquaPeak},
{Encounter.Kanaxai, EncounterCategory.FractalSilentSurf},
{Encounter.LonelyTowerTEMP, EncounterCategory.FractalLonelyTower},
{Encounter.Eparch, EncounterCategory.FractalLonelyTower},
{Encounter.Freezie, EncounterCategory.StrikeMissionFestival},
{Encounter.StandardKittyGolem, EncounterCategory.SpecialForcesTrainingArea},
{Encounter.MediumKittyGolem, EncounterCategory.SpecialForcesTrainingArea},
Expand Down
15 changes: 14 additions & 1 deletion EVTCAnalytics/GameData/GameBuilds.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ public static class GameBuilds
public static int AhdashimRelease = 97235;

/// <summary>
/// The release of Cosmic Observatory Challenge Mode, which revamped the health of the normal mode as well.
/// The release of Cosmic Observatory Challenge Mode, which revamped the health of the normal mode as well.<br></br>
/// https://wiki.guildwars2.com/wiki/Game_updates/2023-11-07
/// </summary>
public static int CosmicObservatoryCMRelease = 153978;

Expand All @@ -22,5 +23,17 @@ public static class GameBuilds
/// Note that there were more health changes to this encounter, make sure this is what you mean.
/// </remarks>
public static int TempleOfFebeHealthFix = 158968;

/// <summary>
/// Lonely Tower release, no challenge mode.<br></br>
/// https://wiki.guildwars2.com/wiki/Game_updates/2024-05-21
/// </summary>
public static int LonelyTowerRelease = 163141;

/// <summary>
/// Lonely Tower Challenge Mode release.<br></br>
/// https://wiki.guildwars2.com/wiki/Game_updates/2024-06-04
/// </summary>
public static int LonelyTowerCMRelease = 163807;
}
}
2 changes: 1 addition & 1 deletion EVTCAnalytics/GameData/SpeciesIds.cs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public static class SpeciesIds
public const int KanaxaiNM = 25572;
public const int KanaxaiCM = 25577;
// Lonely Tower
public const int LonelyTowerTEMP = 30000;
public const int Eparch = 26231;

// Festivals
public const int Freezie = 21333;
Expand Down
15 changes: 15 additions & 0 deletions EVTCAnalytics/Processing/EncounterDataProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,21 @@ private IEncounterData GetPvEEncounterData(Encounter encounter, Agent mainTarget
finalFallbackMode: null))))
.Build();
}
case Encounter.Eparch:
{
return GetDefaultBuilder(encounter, mainTarget)
.WithResult(new AnyCombinedResultDeterminer(
new AgentKillingBlowDeterminer(mainTarget),
new BuffAppliedBelowHealthThresholdDeterminer(mainTarget, 0.2f, SkillIds.Determined)))
.WithModes(new ConditionalModeDeterminer(
(gameBuild != null && gameBuild < GameBuilds.LonelyTowerCMRelease,
new AgentHealthModeDeterminer(mainTarget, 31_000_000, EncounterMode.Normal)),
(true, new FallbackModeDeterminer(
new AgentHealthModeDeterminer(mainTarget, 18_000_000, EncounterMode.Normal),
new AgentHealthModeDeterminer(mainTarget, 32_000_000, EncounterMode.Challenge),
finalFallbackMode: null))))
.Build();
}
default:
return GetDefaultBuilder(encounter, mainTarget, mergeMainTarget: false).Build();
}
Expand Down
8 changes: 4 additions & 4 deletions EVTCAnalytics/Processing/EncounterIdentifier.cs
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ public Encounter IdentifyEncounter(Agent mainTarget, IReadOnlyList<Agent> agents
return Encounter.Kanaxai;
case SpeciesIds.KanaxaiCM:
return Encounter.Kanaxai;
case SpeciesIds.LonelyTowerTEMP:
return Encounter.LonelyTowerTEMP;
case SpeciesIds.Eparch:
return Encounter.Eparch;
case SpeciesIds.Freezie:
return Encounter.Freezie;
case SpeciesIds.IcebroodConstruct:
Expand Down Expand Up @@ -325,8 +325,8 @@ public IEnumerable<Encounter> IdentifyPotentialEncounters(ParsedBossData bossDat
return new[] { Encounter.Kanaxai };
case SpeciesIds.KanaxaiCM:
return new[] { Encounter.Kanaxai };
case SpeciesIds.LonelyTowerTEMP:
return new[] { Encounter.LonelyTowerTEMP };
case SpeciesIds.Eparch:
return new[] { Encounter.Eparch };
case SpeciesIds.Freezie:
return new[] { Encounter.Freezie };
case SpeciesIds.IcebroodConstruct:
Expand Down

0 comments on commit 4710535

Please sign in to comment.