Merge branch 'master' of https://github.com/baaron4/GW2-Elite-Insights-Parser

Author: EliphasNUIT

GW2EIEvtcParser/EIData/InstantCastFinders/EffectInstantCastFinder/EffectCastFinder.cs

@@ -9,6 +9,7 @@ namespace GW2EIEvtcParser.EIData
     internal class EffectCastFinder : CheckedCastFinder<EffectEvent>
     {
         private readonly string _effectGUID;
+        private int _speciesId = 0;
 
         protected virtual Dictionary<AgentItem, List<EffectEvent>> GetEffectEventDict(EffectGUIDEvent effectGUIDEvent, CombatData combatData)
         {
@@ -64,6 +65,12 @@ internal EffectCastFinder UsingSecondaryEffectChecker(string effectGUID, long ti
             return this;
         }
 
+        internal EffectCastFinder UsingAgentRedirectionIfUnknown(int speciesID)
+        {
+            _speciesId = speciesID;
+            return this;
+        }
+
         public override List<InstantCastEvent> ComputeInstantCast(CombatData combatData, SkillData skillData, AgentData agentData)
         {
             var res = new List<InstantCastEvent>();
@@ -85,6 +92,14 @@ public override List<InstantCastEvent> ComputeInstantCast(CombatData combatData,
                         {
                             lastTime = effectEvent.Time;
                             AgentItem caster = GetAgent(effectEvent);
+                            if (_speciesId > 0 && caster.IsSpecies(ArcDPSEnums.NonIdentifiedSpecies))
+                            {
+                                AgentItem agent = agentData.GetNPCsByID(_speciesId).FirstOrDefault(x => x.LastAware >= effectEvent.Time && x.FirstAware <= effectEvent.Time);
+                                if (agent != null)
+                                {
+                                    caster = agent;
+                                }
+                            }
                             res.Add(new InstantCastEvent(GetTime(effectEvent, caster, combatData), skillData.Get(SkillID), caster));
                         }
                     }

GW2EIEvtcParser/EncounterLogic/Raids/W5/StatueOfIce.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using GW2EIEvtcParser.EIData;
 using GW2EIEvtcParser.ParsedData;
@@ -13,14 +14,16 @@ namespace GW2EIEvtcParser.EncounterLogic
 {
     internal class StatueOfIce : HallOfChains
     {
-        // TODO - add CR icons and some mechanics
         public StatueOfIce(int triggerID) : base(triggerID)
         {
             MechanicList.AddRange(new List<Mechanic>
             {
-            new PlayerDstHitMechanic(KingsWrath, "King's Wrath", new MechanicPlotlySetting(Symbols.TriangleLeft,Colors.LightBlue), "Cone Hit","King's Wrath (Auto Attack Cone Part)", "Cone Auto Attack",0),
-            new PlayerDstHitMechanic(NumbingBreach, "Numbing Breach", new MechanicPlotlySetting(Symbols.AsteriskOpen,Colors.LightBlue), "Cracks","Numbing Breach (Ice Cracks in the Ground)", "Cracks",0),
-            new PlayerDstBuffApplyMechanic(FrozenWind, "Frozen Wind", new MechanicPlotlySetting(Symbols.CircleOpen,Colors.Green), "Green","Frozen Wind (Stood in Green)", "Green Stack",0),
+                new PlayerDstHitMechanic(KingsWrathConeAoE, "King's Wrath", new MechanicPlotlySetting(Symbols.TriangleUp, Colors.White), "Cone AoE", "Hit by King's Wrath (Cone AoEs)", "King's Wrath Cone AoE Hit", 0),
+                new PlayerDstHitMechanic(KingsWrathConeShards, "King's Wrath", new MechanicPlotlySetting(Symbols.TriangleLeft, Colors.LightBlue), "Cone Shards", "Hit by King's Wrath (Frontal Cone Shards)", "King's Wrath Cone Shards Hit", 0),
+                new PlayerDstHitMechanic(NumbingBreach, "Numbing Breach", new MechanicPlotlySetting(Symbols.AsteriskOpen, Colors.LightBlue), "Cracks", "Stood on Numbing Breach (Ice Cracks in the Ground)", "Cracks", 0),
+                new PlayerDstBuffApplyMechanic(FrozenWind, "Frozen Wind", new MechanicPlotlySetting(Symbols.CircleOpen, Colors.Green), "Green", "Frozen Wind (Stood in Green)", "Green Stack", 0),
+                new PlayerDstBuffApplyMechanic(Glaciate, "Glaciate", new MechanicPlotlySetting(Symbols.Square, Colors.Purple), "Glaciate", "Glaciated (Frozen by 4th Stack of Frozen Wind)", "Glaciate", 0),
+                new EnemySrcEffectMechanic(EffectGUIDs.BrokenKingIceBreakerGreenExplosion, "Ice Breaker", new MechanicPlotlySetting(Symbols.CircleX, Colors.DarkGreen), "Ice Breaker", "Hailstorm Explosion (Missed Green)", "Ice Breaker (Green Missed)", 0),
             }
             );
             Extension = "brokenking";
@@ -40,7 +43,7 @@ protected override CombatReplayMap GetCombatMapInternal(ParsedEvtcLog log)
 
         internal override long GetFightOffset(int evtcVersion, FightData fightData, AgentData agentData, List<CombatItem> combatData)
         {
-            AgentItem brokenKing = agentData.GetNPCsByID((int)ArcDPSEnums.TargetID.BrokenKing).FirstOrDefault();
+            AgentItem brokenKing = agentData.GetNPCsByID(ArcDPSEnums.TargetID.BrokenKing).FirstOrDefault();
             if (brokenKing == null)
             {
                 throw new MissingKeyActorsException("Broken King not found");
@@ -86,7 +89,7 @@ internal override void ComputeNPCCombatReplayActors(NPC target, ParsedEvtcLog lo
             switch (target.ID)
             {
                 case (int)ArcDPSEnums.TargetID.BrokenKing:
-                    var Cone = cls.Where(x => x.SkillId == KingsWrath).ToList();
+                    var Cone = cls.Where(x => x.SkillId == KingsWrathConeShards).ToList();
                     foreach (AbstractCastEvent c in Cone)
                     {
                         int start = (int)c.Time;
@@ -107,14 +110,70 @@ internal override void ComputeNPCCombatReplayActors(NPC target, ParsedEvtcLog lo
                 default:
                     break;
             }
+        }
+
+        internal override void ComputeEnvironmentCombatReplayDecorations(ParsedEvtcLog log)
+        {
+            base.ComputeEnvironmentCombatReplayDecorations(log);
+
+            // Numbing Breach - Cracks - White smoke indicator
+            if (log.CombatData.TryGetEffectEventsByGUID(EffectGUIDs.BrokenKingNumbingBreachIndicator, out IReadOnlyList<EffectEvent> cracksIndicators))
+            {
+                foreach (EffectEvent effect in cracksIndicators)
+                {
+                    (long, long) lifespan = effect.ComputeLifespan(log, 1000);
+                    var connector = new PositionConnector(effect.Position);
+                    var circle = new CircleDecoration(115, lifespan, "rgba(219, 233, 244, 0.2)", connector);
+                    EnvironmentDecorations.Add(circle);
+                }
+            }
 
+            // Numbing Breach - Cracks - Damage zone
+            if (log.CombatData.TryGetEffectEventsByGUID(EffectGUIDs.BrokenKingNumbingBreachDamage, out IReadOnlyList<EffectEvent> cracks))
+            {
+                foreach (EffectEvent effect in cracks)
+                {
+                    (long, long) lifespan = effect.ComputeLifespan(log, 30000);
+                    var connector = new PositionConnector(effect.Position);
+                    var rotationConnector = new AngleConnector(effect.Rotation.Z);
+                    var rectangle = (RectangleDecoration)new RectangleDecoration(40, 230, lifespan, "rgba(66, 130, 253, 0.2)", connector).UsingRotationConnector(rotationConnector);
+                    EnvironmentDecorations.Add(rectangle);
+                }
+            }
+
+            // Hailstorm - Greens
+            if (log.CombatData.TryGetEffectEventsByGUID(EffectGUIDs.BrokenKingHailstormGreen, out IReadOnlyList<EffectEvent> greens))
+            {
+                foreach (EffectEvent green in greens)
+                {
+                    string color = "rgba(0, 120, 0, 0.4)";
+
+                    // Ice Breaker - Failed Greens
+                    if (log.CombatData.TryGetEffectEventsByGUID(EffectGUIDs.BrokenKingIceBreakerGreenExplosion, out IReadOnlyList<EffectEvent> failedGreens))
+                    {
+                        EffectEvent failedGreen = failedGreens.FirstOrDefault(x => x.Position.Distance2DToPoint(green.Position) < 1e-6 && Math.Abs(x.Time - green.Time - 15000) <= 650);
+                        if (failedGreen != null)
+                        {
+                            color = "rgba(120, 0, 0, 0.4)";
+                        }
+                    }
+
+                    (long, long) lifespan = green.ComputeLifespan(log, 15000);
+                    var circle = new CircleDecoration(120, lifespan, color, new PositionConnector(green.Position));
+                    EnvironmentDecorations.Add(circle);
+                    EnvironmentDecorations.Add(circle.Copy().UsingGrowingEnd(lifespan.Item2, true));
+                }
+            }
         }
 
         internal override List<InstantCastFinder> GetInstantCastFinders()
         {
             return new List<InstantCastFinder>()
             {
-                new DamageCastFinder(BitingAura, BitingAura), // Biting Aura
+                new DamageCastFinder(BitingAura, BitingAura),
+                new EffectCastFinder(Hailstorm, EffectGUIDs.BrokenKingHailstormGreen),
+                new EffectCastFinder(IceBreaker, EffectGUIDs.BrokenKingIceBreakerGreenExplosion)
+                    .UsingAgentRedirectionIfUnknown((int)ArcDPSEnums.TargetID.BrokenKing),
             };
         }
         internal override void CheckSuccess(CombatData combatData, AgentData agentData, FightData fightData, IReadOnlyCollection<AgentItem> playerAgents)

GW2EIEvtcParser/ParsedData/Skills/SkillItem.cs

@@ -206,6 +206,8 @@ internal static (long, long) GetArcDPSCustomIDs(int evtcVersion)
             { ProtectSAK, "Protect" },
             // Soulless Horror
             { IssueChallengeSAK, "Issue Challenge" },
+            // Broken King
+            { NumbingBreachCast, "Numbing Breach (Cast)" },
             // Dhuum
             { MajorSoulSplit, "Major Soul Split" },
             { ExpelEnergySAK, "Expel Energy" },

GW2EIEvtcParser/ParserHelpers/EffectGUIDs.cs

@@ -360,6 +360,13 @@ public static class EffectGUIDs
         public const string MursaarOverseerProtectBubble = "17BC358A51ED2D43BF2ABE8AB642B86B"; // Src player
         public const string MursaarOverseerClaimMarker = "94F3501D777FAC439E78E143CE756B0A"; // No Src - No Dst
         public const string MursaarOverseerShockwave = "0F62A1315A00FC438B2F1273E6BC4054";
+        // Broken King
+        public const string BrokenKingNumbingBreachIndicator = "5341E83B29B534408E90DBE7BE6F452D";
+        public const string BrokenKingNumbingBreachDamage = "1BF014091BFD1E40A11ED36B92601342";
+        public const string BrokenKingHailstormGreen = "C97A7665B2AA6C4482026D4F2562E25E";
+        public const string BrokenKingIceBreakerGreenExplosion = "957ADB83D139704F8CB865E86E389228";
+        public const string BrokenKingKingsWrathConeAoEIndicator = "FA4B726574C96E489D73529CFE390D3D"; // Currently unused, we don't know how to determinate the aoe size
+        public const string BrokenKingKingsWrathConeAoEDamage = "22AC6bFC0B06C1459DFEF1E380F50165"; // Currently unused, we don't know how to determinate the aoe size
         // CA
         public const string CAArmSmash = "B1AAD873DB07E04E9D69627156CA8918";
         // Sabir

GW2EIEvtcParser/ParserHelpers/SkillIDs.cs

@@ -2534,6 +2534,8 @@ public static class SkillIDs
         public const long SuperiorSigilOfTheStars = 46953;
         public const long MushroomKingsBlessing = 46970;
         public const long AchievementEligibilityNecroDancer = 46994;
+        public const long KingsWrathConeAoE = 47005;
+        public const long Hailstorm = 47013;
         public const long Glaciate = 47022;
         public const long Flare = 47074;
         public const long EndersEchoDamage = 47076;
@@ -2572,6 +2574,7 @@ public static class SkillIDs
         public const long EnvironmentallyFriendly = 47625;
         public const long LastGraspJudgment = 47635;
         public const long ArcingAffliction = 47646;
+        public const long IceBreaker = 47679;
         public const long DhuumsMessengerFixationBuff = 47702; // From player applied to messenger
         public const long CorsairMaintenanceOil = 47734;
         public const long WurmSpit = 47756;
@@ -2584,12 +2587,13 @@ public static class SkillIDs
         public const long ChoyaFinisher = 47904;
         public const long QuadSlashSecondSet = 47915;
         public const long OneTrackMind = 47929;
+        public const long NumbingBreachCast = 47930;
         public const long SoulSiphon2 = 47939;
         public const long ReclaimedEnergySkill = 47942;
         public const long BrokenKingFirstCast = 47981;
         public const long Imbibe = 48007;
         public const long DhuumDamagingShacklesBuff = 48042;
-        public const long KingsWrath = 48066;
+        public const long KingsWrathConeShards = 48066;
         public const long DeepAbyss = 48150;
         public const long MortalCoilRiver = 48154;
         public const long ArcingAfflictionHit = 48121;