Skip to content

Commit

Permalink
Add Harvest temple CM detection
Browse files Browse the repository at this point in the history
  • Loading branch information
Sejsel committed Jun 29, 2022
1 parent a61a865 commit fe0c3ef
Showing 4 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion ArcdpsLogManager/ArcdpsLogManager.csproj
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
Each new log data update causes a revision increase.
See LogDataUpdater for the updates.
-->
<Version>1.6.0.0</Version>
<Version>1.6.0.1</Version>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Eto.Forms" Version="2.6.1" />
5 changes: 5 additions & 0 deletions ArcdpsLogManager/Logs/Updates/LogDataUpdater.cs
Original file line number Diff line number Diff line change
@@ -103,6 +103,11 @@ x.Profession is Profession.Thief or Profession.Engineer or Profession.Ranger
&& (log.Encounter.IsRaid() || (log.MapId != null && MapIds.IsRaidMap(log.MapId.Value)))
&& log.GameBuild >= 130910,
"Add Emboldened (easy) mode detection for raids."),
new LogUpdate(log => log.ParsingVersion < new Version(1, 6, 0, 1)
// Some raid enemies can be manually added and they would be categorized as Other.
&& log.Encounter == Encounter.HarvestTemple
&& log.GameBuild >= 130910,
"Add CM detection for Harvest Temple."),
// When adding a new update, you need to increase the revision (last value) of the version in the .csproj file
// unless the version changes more significantly, in that case it can be reset to 0.
};
1 change: 1 addition & 0 deletions EVTCAnalytics/GameData/SpeciesIds.cs
Original file line number Diff line number Diff line change
@@ -120,6 +120,7 @@ public static class SpeciesIds
public const int MinisterLi = 24485;
public const int MinisterLiChallengeMode = 24266;
public const int VoidAmalgamate = 24375;
public const int VoidMelter = 24223;

// Story
public const int HeartsAndMindsMordremoth = 15884;
9 changes: 9 additions & 0 deletions EVTCAnalytics/Processing/DefaultEncounterIdentifier.cs
Original file line number Diff line number Diff line change
@@ -502,11 +502,20 @@ private IEncounterData GetPvEEncounterData(Agent mainTarget, IReadOnlyList<Event
{
var builder = GetDefaultBuilder(encounter, mainTarget);

// This is the gadget that represents the first 5 dragons.
Gadget firstGadget = agents.OfType<Gadget>().FirstOrDefault(x =>
x.VolatileId == GadgetIds.TheDragonvoid && x.AttackTargets.Count == 3);
if (firstGadget != null)
{
builder.WithModes(new GroupedSpawnModeDeterminer(agent => agent is NPC { SpeciesId: SpeciesIds.VoidMelter }, 6, 200));
}

// This is the gadget that represents Soo-Won. The previous phases share the same
// gadget (GadgetIds.TheDragonvoid), but this one has a unique one with different max health.
Gadget finalGadget = agents.OfType<Gadget>().FirstOrDefault(x =>
x.VolatileId == GadgetIds.TheDragonvoidFinal && x.AttackTargets.Count == 3);


if (finalGadget == null)
{
builder.WithResult(new ConstantResultDeterminer(EncounterResult.Unknown));

0 comments on commit fe0c3ef

Please sign in to comment.