Merge branch 'master' into text-decoration

baaron4 · Jan 6, 2025 · fe2438a · fe2438a
2 parents 8ab719a + 9615073
commit fe2438a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/GW2EIEvtcParser/EIData/ProfHelpers/Revenant/RenegadeHelper.cs b/GW2EIEvtcParser/EIData/ProfHelpers/Revenant/RenegadeHelper.cs
@@ -114,16 +114,18 @@ internal static void ComputeProfessionCombatReplayActors(PlayerActor player, Par
                             var connector = new PositionConnector(hitEffect.Position);
                             replay.Decorations.Add(new CircleDecoration(120, lifespanHit, color, 0.5, connector).UsingFilled(false).UsingSkillMode(skill));
                         }
-
-                        // AoE Radius and icons
-                        (long, long) lifespan = (effect.Time, effect.Time + 3000);
-                        var centralConnector = new PositionConnector(positions.Average());
-                        replay.Decorations.Add(new IconDecoration(ParserIcons.EffectCitadelBombardmentPortal, CombatReplaySkillDefaultSizeInPixel, CombatReplaySkillDefaultSizeInWorld, 0.5f, lifespan, playerPositionConnector)
-                            .UsingSkillMode(skill));
-                        replay.Decorations.Add(new IconDecoration(ParserIcons.EffectCitadelBombardment, CombatReplaySkillDefaultSizeInPixel, CombatReplaySkillDefaultSizeInWorld, 0.5f, lifespan, centralConnector)
-                            .UsingSkillMode(skill));
-                        // TODO: Find a way to tell the user that the circle is approximative.
-                        //replay.Decorations.Add(new CircleDecoration(230, lifespan, color, 0.5, centralConnector).UsingFilled(false).UsingSkillMode(skill));
+                        if (positions.Count > 0)
+                        {
+                            // AoE Radius and icons
+                            (long, long) lifespan = (effect.Time, effect.Time + 3000);
+                            var centralConnector = new PositionConnector(positions.Average());
+                            replay.Decorations.Add(new IconDecoration(ParserIcons.EffectCitadelBombardmentPortal, CombatReplaySkillDefaultSizeInPixel, CombatReplaySkillDefaultSizeInWorld, 0.5f, lifespan, playerPositionConnector)
+                                .UsingSkillMode(skill));
+                            replay.Decorations.Add(new IconDecoration(ParserIcons.EffectCitadelBombardment, CombatReplaySkillDefaultSizeInPixel, CombatReplaySkillDefaultSizeInWorld, 0.5f, lifespan, centralConnector)
+                                .UsingSkillMode(skill));
+                            // TODO: Find a way to tell the user that the circle is approximative.
+                            //replay.Decorations.Add(new CircleDecoration(230, lifespan, color, 0.5, centralConnector).UsingFilled(false).UsingSkillMode(skill));
+                        }
                     }
                 }
             }

diff --git a/GW2EIEvtcParser/EIData/ProfHelpers/Revenant/RevenantHelper.cs b/GW2EIEvtcParser/EIData/ProfHelpers/Revenant/RevenantHelper.cs
@@ -277,18 +277,21 @@ internal static void ComputeProfessionCombatReplayActors(PlayerActor player, Par
                 foreach (EffectEvent effect in eternitysRequiem)
                 {
                     var positions = new List<Vector3>();
-                    foreach (EffectEvent hitEffect in eternitysRequiemHits.Where(x => x.Time >= effect.Time && x.Time <= effect.Time + 2800 && x.Dst == null))
+                    foreach (EffectEvent hitEffect in eternitysRequiemHits.Where(x => x.Time >= effect.Time && x.Time <= effect.Time + 2800 && !x.IsAroundDst))
                     {
                         positions.Add(hitEffect.Position);
                         (long, long) lifespanHit = hitEffect.ComputeLifespan(log, 1000);
                         var connector = new PositionConnector(hitEffect.Position);
                         replay.Decorations.Add(new CircleDecoration(120, lifespanHit, color, 0.5, connector).UsingFilled(false).UsingSkillMode(skill));
                     }
-                    (long, long) lifespan = (effect.Time, effect.Time + 2800);
-                    var centralConnector = new PositionConnector(positions.Average());
-                    replay.Decorations.Add(new IconDecoration(ParserIcons.EffectEternitysRequiem, CombatReplaySkillDefaultSizeInPixel, CombatReplaySkillDefaultSizeInWorld, 0.5f, lifespan, centralConnector).UsingSkillMode(skill));
-                    // TODO: Find a way to tell the user that the circle is approximative.
-                    //replay.Decorations.Add(new CircleDecoration(360, lifespan, color, 0.5, centralConnector).UsingFilled(false).UsingSkillMode(skill));
+                    if (positions.Count > 0)
+                    {
+                        (long, long) lifespan = (effect.Time, effect.Time + 2800);
+                        var centralConnector = new PositionConnector(positions.Average());
+                        replay.Decorations.Add(new IconDecoration(ParserIcons.EffectEternitysRequiem, CombatReplaySkillDefaultSizeInPixel, CombatReplaySkillDefaultSizeInWorld, 0.5f, lifespan, centralConnector).UsingSkillMode(skill));
+                        // TODO: Find a way to tell the user that the circle is approximative.
+                        //replay.Decorations.Add(new CircleDecoration(360, lifespan, color, 0.5, centralConnector).UsingFilled(false).UsingSkillMode(skill));
+                    }
                 }
             }
         }