Fix tier set for rd

trevorm4 · Mar 4, 2025 · 9b0b9fc · 9b0b9fc
1 parent 8db3d9b
commit 9b0b9fc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 27 deletions.
diff --git a/src/analysis/retail/monk/mistweaver/CHANGELOG.tsx b/src/analysis/retail/monk/mistweaver/CHANGELOG.tsx
@@ -5,6 +5,7 @@ import { emallson, Trevor, Vetyst, Vohrr } from 'CONTRIBUTORS';
 import SpellLink from 'interface/SpellLink';
 
 export default [
+  change(date(2025, 3, 3), <>Fix 11.1 tier set module</>, Trevor),
   change(date(2025, 3, 3), <>Add 11.1 tier set module and other fixups</>, Trevor),
   change(date(2025, 3, 3), <>Add <SpellLink spell={TALENTS_MONK.RESPLENDENT_MIST_TALENT}/> module</>, Trevor),
   change(date(2025, 3, 3), <>Update <SpellLink spell={TALENTS_MONK.JADE_BOND_TALENT}/> for 11.1</>, Trevor),

diff --git a/src/analysis/retail/monk/mistweaver/normalizers/CastLinkNormalizer.ts b/src/analysis/retail/monk/mistweaver/normalizers/CastLinkNormalizer.ts
@@ -324,15 +324,16 @@ export function isStrengthOfTheBlackOxConsumed(event: RemoveBuffEvent): boolean
 }
 
 // tier
-export function isInsuranceFromHardcast(event: ApplyBuffEvent | RefreshBuffEvent | HealEvent) {
-  if (event.type === EventType.Heal) {
-    const source = GetRelatedEvents(event, INSURANCE);
-    if (!source.length) {
-      return false;
-    }
-    return HasRelatedEvent(source[0], INSURANCE_FROM_REM);
+export function isInsuranceFromHardcast(event: HealEvent) {
+  const source = GetRelatedEvent(event, INSURANCE);
+  if (!source) {
+    return false;
+  }
+  const remApply = GetRelatedEvent<RefreshBuffEvent | ApplyBuffEvent>(source, INSURANCE_FROM_REM);
+  if (!remApply) {
+    return false;
   }
-  return HasRelatedEvent(event, INSURANCE_FROM_REM);
+  return isFromHardcast(remApply) || isFromRapidDiffusion(remApply);
 }
 
 export default CastLinkNormalizer;
diff --git a/src/analysis/retail/monk/mistweaver/normalizers/EventLinks/RenewingMistEventLinks.ts b/src/analysis/retail/monk/mistweaver/normalizers/EventLinks/RenewingMistEventLinks.ts
@@ -22,9 +22,7 @@ import {
   SOURCE_APPLY,
   DANCING_MIST_BUFFER_MS,
   FROM_MISTS_OF_LIFE,
-  INSURANCE_FROM_REM,
 } from './EventLinkConstants';
-import { TIERS } from 'game/TIERS';
 
 export const RENEWING_MIST_EVENT_LINKS: EventLink[] = [
   // link renewing mist apply to its CastEvent
@@ -146,18 +144,4 @@ export const RENEWING_MIST_EVENT_LINKS: EventLink[] = [
       return c.hasTalent(TALENTS_MONK.MISTS_OF_LIFE_TALENT);
     },
   },
-  // Insurance from Rem hardcast
-  {
-    linkRelation: INSURANCE_FROM_REM,
-    linkingEventId: SPELLS.INSURANCE_HOT_MONK.id,
-    linkingEventType: [EventType.ApplyBuff, EventType.RefreshBuff],
-    referencedEventId: TALENTS_MONK.RENEWING_MIST_TALENT.id,
-    referencedEventType: [EventType.Cast],
-    backwardBufferMs: CAST_BUFFER_MS,
-    forwardBufferMs: CAST_BUFFER_MS,
-    maximumLinks: 1,
-    isActive: (c) => {
-      return c.has4PieceByTier(TIERS.TWW2);
-    },
-  },
 ];
diff --git a/src/analysis/retail/monk/mistweaver/normalizers/EventLinks/TierEventLinks.ts b/src/analysis/retail/monk/mistweaver/normalizers/EventLinks/TierEventLinks.ts
@@ -1,5 +1,4 @@
 import SPELLS from 'common/SPELLS';
-import { TALENTS_MONK } from 'common/TALENTS';
 import { EventLink } from 'parser/core/EventLinkNormalizer';
 import { EventType } from 'parser/core/Events';
 import {
@@ -16,8 +15,8 @@ export const TIER_EVENT_LINKS: EventLink[] = [
     linkRelation: INSURANCE_FROM_REM,
     linkingEventId: SPELLS.INSURANCE_HOT_MONK.id,
     linkingEventType: [EventType.ApplyBuff, EventType.RefreshBuff],
-    referencedEventId: TALENTS_MONK.RENEWING_MIST_TALENT.id,
-    referencedEventType: [EventType.Cast],
+    referencedEventId: SPELLS.RENEWING_MIST_HEAL.id,
+    referencedEventType: [EventType.ApplyBuff, EventType.RefreshBuff],
     backwardBufferMs: CAST_BUFFER_MS,
     forwardBufferMs: CAST_BUFFER_MS,
     maximumLinks: 1,