Analytics: Add support for old weapon set

Linkaaaaa · Jun 28, 2024 · 0d5c182 · 0d5c182
1 parent 7be2e26
commit 0d5c182
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/ArcdpsLogManager/CHANGELOG.md b/ArcdpsLogManager/CHANGELOG.md
@@ -25,6 +25,7 @@ This is the full changelog of the arcdps Log Manager.
 - Added SquadGroundMarkerPlace and SquadGroundMarkerRemove events; requires arcdps 2024-03-28 or newer.
 - Added AgentGliderOpenEvent and AgentGliderClosedEvent; requires arcdps 2024-06-27 or newer.
 - Exact arcdps build is now shown in the Statistics tabs; requires arcdps 2024-06-14 or newer.
+- Added old weapon set to AgentWeaponSwapEvent; requires arcdps 2024-06-27 or newer.
 
 ## Log Manager v1.11.1
 

diff --git a/EVTCAnalytics/Events/AgentEvents.cs b/EVTCAnalytics/Events/AgentEvents.cs
@@ -90,9 +90,13 @@ public class AgentHealthUpdateEvent(long time, Agent agent, float healthFraction
 	/// A weapon set does not necessarily correspond to what players use the weapon swap action for.
 	/// Swapping to a bundle that provides a set of skills will also trigger this event.
 	/// </remarks>
-	public class AgentWeaponSwapEvent(long time, Agent agent, WeaponSet newWeaponSet) : AgentEvent(time, agent)
+	public class AgentWeaponSwapEvent(long time, Agent agent, WeaponSet newWeaponSet, WeaponSet? oldWeaponSet) : AgentEvent(time, agent)
 	{
 		public WeaponSet NewWeaponSet { get; } = newWeaponSet;
+		/// <summary>
+		/// Introduced in EVTC20240627. May be null before.
+		/// </summary>
+		public WeaponSet? OldWeaponSet { get; } = oldWeaponSet;
 	}
 
 	/// <summary>

diff --git a/EVTCAnalytics/Processing/LogProcessor.cs b/EVTCAnalytics/Processing/LogProcessor.cs
@@ -978,31 +978,25 @@ Skill GetSkillByIdOrAdd(uint id)
 						return new AgentHealthUpdateEvent(item.Time, GetAgentByAddress(item.SrcAgent),
 							healthFraction);
 					case StateChange.WeaponSwap:
-						WeaponSet newWeaponSet;
-						switch (item.DstAgent)
+						static WeaponSet WeaponSetFromId(long id)
 						{
-							case 0:
-								newWeaponSet = WeaponSet.Water1;
-								break;
-							case 1:
-								newWeaponSet = WeaponSet.Water2;
-								break;
-							case 4:
-								newWeaponSet = WeaponSet.Land1;
-								break;
-							case 5:
-								newWeaponSet = WeaponSet.Land2;
-								break;
-							default:
-								newWeaponSet = WeaponSet.Unknown;
-								break;
+							return id switch
+							{
+								0 => WeaponSet.Water1,
+								1 => WeaponSet.Water2,
+								4 => WeaponSet.Land1,
+								5 => WeaponSet.Land2,
+								_ => WeaponSet.Unknown
+							};
 						}
 
-						return new AgentWeaponSwapEvent(item.Time, GetAgentByAddress(item.SrcAgent),
-							newWeaponSet);
+						WeaponSet newWeaponSet = WeaponSetFromId((long) item.DstAgent);
+						bool isOldWeaponSetAvailable = string.Compare(state.EvtcVersion, "EVTC20240627", StringComparison.OrdinalIgnoreCase) >= 0;
+						WeaponSet? oldWeaponSet = isOldWeaponSetAvailable ? WeaponSetFromId(item.Value) : null;
+
+						return new AgentWeaponSwapEvent(item.Time, GetAgentByAddress(item.SrcAgent), newWeaponSet, oldWeaponSet);
 					case StateChange.MaxHealthUpdate:
-						return new AgentMaxHealthUpdateEvent(item.Time, GetAgentByAddress(item.SrcAgent),
-							item.DstAgent);
+						return new AgentMaxHealthUpdateEvent(item.Time, GetAgentByAddress(item.SrcAgent), item.DstAgent);
 					case StateChange.Reward:
 						return new RewardEvent(item.Time, item.DstAgent, item.Value);
 					case StateChange.BuffInitial: