Merge branch 'master' of https://github.com/baaron4/GW2-Elite-Insight…

…s-Parser
baaron4 · Jun 20, 2024 · 9e27846 · 9e27846
2 parents d0f8341 + 47b2335
commit 9e27846
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/GW2EIEvtcParser/EIData/Buffs/WvWBuffs.cs b/GW2EIEvtcParser/EIData/Buffs/WvWBuffs.cs
@@ -76,7 +76,8 @@ internal static class WvWBuffs
             new Buff("Commander's Presence", CommandersPresence, Source.Common, BuffClassification.Support, BuffImages.MightyBlow),
             new Buff("Inferno Hound", InfernoHound, Source.Common, BuffClassification.Other, BuffImages.HoundsOfBalthazar),
             new Buff("Smoke Form", SmokeForm, Source.Common, BuffClassification.Other, BuffImages.InkShot),
-            new Buff("Chilling Fog", ChillingFogBuff, Source.Common, BuffClassification.Debuff, BuffImages.FreezingGust),
+            new Buff("Chilling Fog", ChillingFog_HealingMistBuff, Source.Common, BuffClassification.Debuff, BuffImages.FreezingGust).WithBuilds(GW2Builds.StartOfLife, GW2Builds.May2024LonelyTowerFractalRelease),
+            new Buff("Healing Mist", ChillingFog_HealingMistBuff, Source.Common, BuffClassification.Defensive, BuffImages.HealingMistWvW).WithBuilds(GW2Builds.May2024LonelyTowerFractalRelease),
             new Buff("Banner Drop Warning", BannerDropWarning, Source.Common, BuffClassification.Other, BuffImages.Tracked),
             new Buff("Greater Call of the Mists (WvW)", GreaterCallOfTheMistsWvW, Source.Common, BuffClassification.Other, BuffImages.GloriousFervor),
             // Edge of the Mists
@@ -90,8 +91,8 @@ internal static class WvWBuffs
             new Buff("Koda's Armor", KodasArmor, Source.Common, BuffClassification.Support, BuffImages.KodasArmor),
             // Guild Hall
             new Buff("Guild Hall - PvE", GuildHallPvEMode, Source.Common, BuffClassification.Other, BuffImages.GuildHallPvEMode),
-            new Buff("Guild Hall - sPvP", GuildHallsPvPMode, Source.Common, BuffClassification.Support, BuffImages.GuildHallsPvPMode),
-            new Buff("Guild Hall - WvW", GuildHallWvWMode, Source.Common, BuffClassification.Support, BuffImages.GuildHallWvWMode),
+            new Buff("Guild Hall - sPvP", GuildHallsPvPMode, Source.Common, BuffClassification.Other, BuffImages.GuildHallsPvPMode),
+            new Buff("Guild Hall - WvW", GuildHallWvWMode, Source.Common, BuffClassification.Other, BuffImages.GuildHallWvWMode),
         };
     }
 }
diff --git a/GW2EIEvtcParser/EncounterLogic/Fractals/FractalLogic.cs b/GW2EIEvtcParser/EncounterLogic/Fractals/FractalLogic.cs
@@ -26,8 +26,9 @@ protected FractalLogic(int triggerID) : base(triggerID)
             new SpawnMechanic((int)TrashID.FractalVindicator, "Fractal Vindicator", new MechanicPlotlySetting(Symbols.StarDiamondOpen,Colors.Black,10), "Vindicator","Fractal Vindicator spawned", "Vindicator spawn",0),
             new PlayerDstBuffApplyMechanic(DebilitatedToxicSickness, "Debilitated", new MechanicPlotlySetting(Symbols.TriangleUp, Colors.Pink, 10), "Debil.A", "Debilitated Application (Toxic Sickness)", "Received Debilitated", 0),
             new PlayerSrcEffectMechanic(new [] { EffectGUIDs.ToxicSicknessOldIndicator, EffectGUIDs.ToxicSicknessNewIndicator }, "Toxic Sickness", new MechanicPlotlySetting(Symbols.TriangleUpOpen, Colors.LightOrange, 10), "ToxSick.A", "Toxic Sickness Application", "Toxic Sickness Application", 0),
+            new PlayerSrcBuffApplyMechanic(DebilitatedToxicSickness, "Toxic Sickness", new MechanicPlotlySetting(Symbols.TriangleLeftOpen, Colors.LightOrange, 10), "ToxSick.HitTo", "Hit another player with Toxic Sickness", "Toxic Sickness Hit To Player", 0).UsingChecker((bae, log) => bae.To.IsPlayer),
+            new PlayerDstBuffApplyMechanic(DebilitatedToxicSickness, "Toxic Sickness", new MechanicPlotlySetting(Symbols.TriangleRightOpen, Colors.LightOrange, 10), "ToxSick.HitBy", "Got hit by Toxic Sickness", "Toxic Sickness Hit By Player", 0).UsingChecker((bae, log) => bae.By.IsPlayer),
             /* Not trackable due to health % damage for now
-            new PlayerDstHitMechanic(ToxicSickness, "Toxic Sickness", new MechanicPlotlySetting(Symbols.TriangleUpOpen, Colors.DarkGreen, 10), "ToxSick.H", "Hit by Toxic Sickness", "Toxic Sickness Hit", 0),
             new PlayerDstHitMechanic(ToxicTrail, "Toxic Trail", new MechanicPlotlySetting(Symbols.CircleOpenDot, Colors.DarkGreen, 10), "ToxTrail.H", "Hit by Toxic Trail", "Toxic Trail Hit", 0),
             new PlayerDstHitMechanic(ExplodeLastLaugh, "Explode", new MechanicPlotlySetting(Symbols.CircleOpenDot, Colors.Orange, 10), "Explode.H", "Hit by Last Laugh Explode", "Last Laugh Hit", 0),
             new PlayerDstHitMechanic(WeBleedFireBig, "We Bleed Fire", new MechanicPlotlySetting(Symbols.Star, Colors.LightRed, 10), "BleedFireB.H", "Hit by We Bleed Fire (Big)", "Big Bleed Fire Hit", 0),

diff --git a/GW2EIEvtcParser/ParsedData/Skills/SkillItem.cs b/GW2EIEvtcParser/ParsedData/Skills/SkillItem.cs
@@ -905,6 +905,7 @@ internal static (long, long) GetArcDPSCustomIDs(int evtcVersion)
             { MagebaneTetherSkill, BuffImages.MagebaneTether },
             { EnchantmentCollapse, "https://wiki.guildwars2.com/images/7/7f/Enchantment_Collapse.png" },
             { LineBreakerHeal, "https://wiki.guildwars2.com/images/0/0e/Line_Breaker.png" },
+            { VigorousShouts, "https://wiki.guildwars2.com/images/d/de/Vigorous_Shouts.png" },
             #endregion WarriorIcons
             #region EncounterIcons
             // Silent Surf Fractal

diff --git a/GW2EIEvtcParser/ParserHelpers/BuffImages.cs b/GW2EIEvtcParser/ParserHelpers/BuffImages.cs
@@ -1120,6 +1120,7 @@ public static class BuffImages
         public const string UnboundBlizzard = "https://wiki.guildwars2.com/images/7/7a/Unbound_Blizzard.png";
         public const string GloriousFervor = "https://wiki.guildwars2.com/images/7/76/Glorious_Fervor.png";
         public const string ChallengeOfTheAncients = "https://wiki.guildwars2.com/images/0/02/Challenge_of_the_Ancients.png";
+        public const string HealingMistWvW = "https://wiki.guildwars2.com/images/8/85/Healing_Mist_%28WvW_effect%29.png";
         #endregion Misc
 
         #region Cast

diff --git a/GW2EIEvtcParser/ParserHelpers/SkillIDs.cs b/GW2EIEvtcParser/ParserHelpers/SkillIDs.cs
@@ -953,6 +953,7 @@ public static class SkillIDs
         public const long OpeningStrike = 13988;
         public const long NaturalHealing = 14024;
         public const long Spotter = 14055;
+        public const long VigorousShouts = 14219;
         public const long EmpowerAllies = 14222;
         public const long RecklessImpact = 14268;
         public const long MendingMight = 14282;
@@ -1403,8 +1404,8 @@ public static class SkillIDs
         public const long Jade = 26925;
         public const long ReleaseHammers = 26956;
         public const long POV_ProtectiveSolaceBuff = 26957;
-        public const long NaturalHarmonyHeal = 26977;
         public const long Resistance = 26980;
+        public const long NaturalHarmonyHeal = 26997;
         public const long FacetOfElementsSkill = 27014;
         public const long ElevatedCompassion = 27028;
         public const long CeleritasSpores = 27048;
@@ -1817,7 +1818,7 @@ public static class SkillIDs
         public const long PieceOfUnderseaWurmSushi = 33936;
         public const long DragonsWings = 33963;
         public const long PresenceOfTheKeepII = 33974;
-        public const long ChillingFogBuff = 33978;
+        public const long ChillingFog_HealingMistBuff = 33978;
         public const long HardenedSiegeGear = 33983;
         public const long BowlOfTapiocaPudding = 34014;
         public const long MarkedSentryGreen = 34015;