Analytics: Fixed Adina and Sabir identification when stuck in combat

ArcdpsLogManager/ArcdpsLogManager.csproj

@@ -17,7 +17,7 @@
         Each new log data update causes a revision increase.
         See LogDataUpdater for the updates.
         -->
-        <Version>1.11.1.6</Version>
+        <Version>1.11.1.7</Version>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="DebounceThrottle" Version="2.0.0" />

ArcdpsLogManager/CHANGELOG.md

@@ -17,6 +17,7 @@ This is the full changelog of the arcdps Log Manager.
 - Fixed commander tag identification for fights where multiple overhead markers are used.
 - Fixed upload button not being available for multiple selected logs if logs failed to be processed by dps.report
 - Fixed crashes happening at weekly reset and on the midnight of the day for some timezones.
+- Fixed Cardinal Sabir logs very rarely being identified as Cardinal Adina and vice versa.
 - Fixed a Skorvald false failure triggered when the group dies after he reaches 1% (thanks, @Linkaaaaa!)
 - Fixed encounter durations rounding to 1m60s (thanks, @Linkaaaaa!).
 

ArcdpsLogManager/Logs/Updates/LogDataUpdater.cs

@@ -213,6 +213,9 @@ x.Profession is Profession.Thief or Profession.Engineer or Profession.Ranger
 			                     && string.Compare(log.EvtcVersion, "EVTC20240612", StringComparison.OrdinalIgnoreCase) >= 0
 			                     && log.Encounter is Encounter.XunlaiJadeJunkyard or Encounter.KainengOverlook,
 				"Fix success detection for Xunlai Jade Junkyard and Kaineng Overlook with recent arcdps versions"),
+			new LogUpdate(log => log.ParsingVersion < new Version(1, 11, 1, 7)
+			                     && log.Encounter is Encounter.Adina or Encounter.Sabir,
+				"Fixed Adina and Sabir possibly being identified as the other one in rare scenarios."),
 			// 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.
 		};

EVTCAnalytics/GameData/SkillIds.cs

@@ -122,6 +122,12 @@ public static class SkillIds
 
 		public const int HarvestTempleLiftOff = 63896;
 
+
+		// The first attack of Cardinal Adina
+		public const int AdinaChargeUp = 56648;
+		// The first autoattack of Cardinal Sabir
+		public const int SabirFirstAutoattack = 56620;
+
 		public const int Emboldened = 68087;
 	}
 }

EVTCAnalytics/GameData/SpeciesIds.cs

@@ -80,7 +80,7 @@ public static class SpeciesIds
 		// Cardinal Adina
 		public const int CardinalAdina = 22006;
 		// Cardinal Sabir
-		public const int CadinalSabir = 21964;
+		public const int CardinalSabir = 21964;
 		// Qadim the Peerless
 		public const int QadimThePeerless = 22000;
 

EVTCAnalytics/Processing/EncounterDataProvider.cs

@@ -286,13 +286,17 @@ private IEncounterData GetPvEEncounterData(Encounter encounter, Agent mainTarget
 				// Raids - Wing 7
 				case Encounter.Adina:
 				{
-					return GetDefaultBuilder(encounter, mainTarget)
+					// We need to explicitly find Adina as this may be a Sabir main target log.
+					var adina = GetTargetBySpeciesId(agents, SpeciesIds.CardinalAdina);
+					return GetDefaultBuilder(encounter, adina ?? mainTarget)
 						.WithModes(new AgentHealthModeDeterminer(mainTarget, 24_000_000))
 						.Build();
 				}
 				case Encounter.Sabir:
 				{
-					return GetDefaultBuilder(encounter, mainTarget)
+					// We need to explicitly find Sabir this may be an Adina main target log.
+					var sabir = GetTargetBySpeciesId(agents, SpeciesIds.CardinalSabir);
+					return GetDefaultBuilder(encounter, sabir ?? mainTarget)
 						.WithModes(new AgentHealthModeDeterminer(mainTarget, 32_000_000))
 						.Build();
 				}

EVTCAnalytics/Processing/EncounterIdentifier.cs

@@ -83,9 +83,17 @@ public Encounter IdentifyEncounter(Agent mainTarget, IReadOnlyList<Agent> agents
 				case SpeciesIds.Qadim:
 					return Encounter.Qadim;
 				case SpeciesIds.CardinalAdina:
-					return Encounter.Adina;
-				case SpeciesIds.CadinalSabir:
-					return Encounter.Sabir;
+					// During initial instance clearing, it is possible for the squad to start combat (clearing) near one boss
+					// and then move to the other and start without leaving combat.
+					// We check for the first cast skill of Sabir, that should happen reasonably early.
+					// If both bosses were attacked at the same time, then choosing one at random is acceptable as well.
+					return skills.Any(x => x.Id == SkillIds.SabirFirstAutoattack) ? Encounter.Sabir : Encounter.Adina;
+				case SpeciesIds.CardinalSabir:
+					// During initial instance clearing, it is possible for the squad to start combat (clearing) near one boss
+					// and then move to the other and start without leaving combat.
+					// We check for the first cast skill of Adina (often within a few milliseconds).
+					// If both bosses were attacked at the same time, then choosing one at random is acceptable as well.
+					return skills.Any(x => x.Id == SkillIds.AdinaChargeUp) ? Encounter.Adina : Encounter.Sabir;
 				case SpeciesIds.QadimThePeerless:
 					return Encounter.QadimThePeerless;
 				case SpeciesIds.StandardKittyGolem:
@@ -294,9 +302,9 @@ public IEnumerable<Encounter> IdentifyPotentialEncounters(ParsedBossData bossDat
 			case SpeciesIds.Qadim:
 				return new[] { Encounter.Qadim };
 			case SpeciesIds.CardinalAdina:
-				return new[] { Encounter.Adina };
-			case SpeciesIds.CadinalSabir:
-				return new[] { Encounter.Sabir };
+				return new[] { Encounter.Adina, Encounter.Sabir };
+			case SpeciesIds.CardinalSabir:
+				return new[] { Encounter.Sabir, Encounter.Adina };
 			case SpeciesIds.QadimThePeerless:
 				return new[] { Encounter.QadimThePeerless };
 			case SpeciesIds.StandardKittyGolem: