Merge pull request WoWAnalyzer#6636 from trevorm4/eb-spark-fix

Fix bug in eb source module for spark
emallson · Jan 27, 2024 · 018a4db · 018a4db
2 parents d5848d1 + e5a4fb8
commit 018a4db
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/src/analysis/retail/evoker/preservation/CHANGELOG.tsx b/src/analysis/retail/evoker/preservation/CHANGELOG.tsx
@@ -6,6 +6,7 @@ import RESOURCE_TYPES from 'game/RESOURCE_TYPES';
 import { ResourceLink, SpellLink } from 'interface';
 
 export default [
+  change(date(2024, 1, 26), <>Fix bug in <SpellLink spell={TALENTS_EVOKER.ESSENCE_BURST_PRESERVATION_TALENT}/> source breakdown module and adjust mana costs</>, Trevor),
   change(date(2024, 1, 20), <>Add module for <SpellLink spell={TALENTS_EVOKER.ESSENCE_BURST_PRESERVATION_TALENT}/> source breakdown</>, Trevor),
   change(date(2024, 1, 20), <>Add <SpellLink spell={TALENTS_EVOKER.LIFEBIND_TALENT}/> attribution to <SpellLink spell={TALENTS_EVOKER.GRACE_PERIOD_TALENT}/> module</>, Trevor),
   change(date(2024, 1, 16), <>Bump support to 10.2.5</>, Trevor),

diff --git a/src/analysis/retail/evoker/preservation/normalizers/CastLinkNormalizer.ts b/src/analysis/retail/evoker/preservation/normalizers/CastLinkNormalizer.ts
@@ -5,6 +5,7 @@ import { Options } from 'parser/core/Module';
 import { TALENTS_EVOKER } from 'common/TALENTS';
 import {
   AbilityEvent,
+  AnyEvent,
   ApplyBuffEvent,
   ApplyBuffStackEvent,
   CastEvent,
@@ -734,7 +735,10 @@ const EVENT_LINKS: EventLink[] = [
     forwardBufferMs: 10, // ordering
     anyTarget: true,
     additionalCondition(linkingEvent, referencedEvent) {
-      return !HasRelatedEvent(linkingEvent, ESSENCE_RUSH);
+      return (
+        !HasRelatedEvent(linkingEvent, ESSENCE_RUSH) &&
+        !HasRelatedEvent(linkingEvent, SPARK_OF_INSIGHT)
+      );
     },
   },
   {
@@ -746,6 +750,13 @@ const EVENT_LINKS: EventLink[] = [
     referencedEventType: [EventType.RefreshBuff, EventType.ApplyBuff, EventType.ApplyBuffStack],
     forwardBufferMs: CAST_BUFFER_MS,
     anyTarget: true,
+    additionalCondition(linkingEvent, referencedEvent) {
+      return (
+        !HasRelatedEvent(linkingEvent, ESSENCE_RUSH) &&
+        !HasRelatedEvent(linkingEvent, SPARK_OF_INSIGHT) &&
+        !HasRelatedEvent(linkingEvent, FROM_HARDCAST)
+      );
+    },
   },
   {
     linkRelation: STASIS_FOR_RAMP,
@@ -940,7 +951,14 @@ export function didSparkProcEssenceBurst(
     | RefreshBuffEvent
     | ApplyBuffStackEvent,
 ) {
-  return HasRelatedEvent(event, SPARK_OF_INSIGHT);
+  let applyEvent: AnyEvent | undefined = event;
+  if (applyEvent.type === EventType.RemoveBuff || applyEvent.type === EventType.RemoveBuffStack) {
+    applyEvent = GetRelatedEvent(event, ESSENCE_BURST_LINK);
+  }
+  if (applyEvent === undefined) {
+    return;
+  }
+  return HasRelatedEvent(applyEvent, SPARK_OF_INSIGHT);
 }
 
 export function didEbConsumeSparkProc(event: RemoveBuffEvent | RemoveBuffStackEvent) {

diff --git a/src/common/SPELLS/evoker.ts b/src/common/SPELLS/evoker.ts
@@ -175,19 +175,19 @@ const spells = {
     id: 361500,
     name: 'Living Flame',
     icon: 'ability_evoker_livingflame',
-    manaCost: 5000,
+    manaCost: 5500,
   },
   LIVING_FLAME_HEAL: {
     id: 361509,
     name: 'Living Flame',
     icon: 'ability_evoker_livingflame',
-    manaCost: 5000,
+    manaCost: 5500,
   },
   LIVING_FLAME_CAST: {
     id: 361469,
     name: 'Living Flame',
     icon: 'ability_evoker_livingflame',
-    manaCost: 5000,
+    manaCost: 5500,
   },
   AZURE_STRIKE: {
     id: 362969,
@@ -199,7 +199,7 @@ const spells = {
     name: 'Emerald Blossom',
     icon: 'ability_evoker_emeraldblossom',
     essenceCost: 3,
-    manaCost: 12000,
+    manaCost: 13000,
   },
   EMERALD_BLOSSOM_ECHO: {
     id: 376832,
@@ -247,6 +247,7 @@ const spells = {
     id: 357208,
     name: 'Fire Breath',
     icon: 'ability_evoker_firebreath',
+    manaCost: 6500,
   },
   FIRE_BREATH_DOT: {
     id: 357209,
@@ -257,6 +258,7 @@ const spells = {
     id: 382266,
     name: 'Fire Breath',
     icon: 'ability_evoker_firebreath',
+    manaCost: 6500,
   },
   DISINTEGRATE: {
     id: 356995,