From 99929513cafc78827d5bcc896a6f325f869a510e Mon Sep 17 00:00:00 2001
From: Vetyst <d.janse97@gmail.com>
Date: Thu, 3 Oct 2024 22:56:36 +0100
Subject: [PATCH 1/3] feature(TTW-7104): Individual character Log Header
 (#7105)

* feature(TTW-7104): Individual character Log Header

* handle hidden response type in wcl parses

---------

Co-authored-by: emallson <emallson@emallson.net>
---
 src/CHANGELOG.tsx                            |  1 +
 src/common/WCL_TYPES.ts                      |  6 ++-
 src/game/CLASSES.ts                          | 16 +++++++
 src/interface/CharacterParses.tsx            | 44 +++++++++++++++-----
 src/interface/GuildReports.tsx               | 11 +++--
 src/interface/report/Results/Header.scss     |  2 +
 src/interface/report/Results/PlayerInfo.scss |  4 +-
 src/interface/report/Results/PlayerInfo.tsx  | 30 +++++++++----
 8 files changed, 89 insertions(+), 25 deletions(-)

diff --git a/src/CHANGELOG.tsx b/src/CHANGELOG.tsx
index 2abeb776d65..6ddd32a5774 100644
--- a/src/CHANGELOG.tsx
+++ b/src/CHANGELOG.tsx
@@ -38,6 +38,7 @@ import SpellLink from 'interface/SpellLink';
 
 // prettier-ignore
 export default [
+  change(date(2024, 10, 3), 'Fixed rendering of the Header on the character log browser.', Vetyst),
   change(date(2024, 9, 30), 'Add Classic Cata Firelands raid zone, headshots, and placeholder image', jazminite),
   change(date(2024, 9, 30), 'Enchant checker now detects Spellthreads', Sref),
   change(date(2024, 9, 26), "Add support for Warlock Hero Talents", Gazh),
diff --git a/src/common/WCL_TYPES.ts b/src/common/WCL_TYPES.ts
index 295db2eecbf..7e11823e231 100644
--- a/src/common/WCL_TYPES.ts
+++ b/src/common/WCL_TYPES.ts
@@ -188,7 +188,11 @@ export interface WCLParse {
   estimated: boolean;
 }
 
-export type WCLParsesResponse = WCLParse[];
+export type WCLParsesResponse = WCLParse[] | { hidden: true };
+
+export function isHiddenParsesResponse(data: WCLParsesResponse): data is { hidden: true } {
+  return !Array.isArray(data);
+}
 
 export type WCLResponseJSON =
   | WCLGuildReportsResponse
diff --git a/src/game/CLASSES.ts b/src/game/CLASSES.ts
index 516b51e0b4a..5d726c97530 100644
--- a/src/game/CLASSES.ts
+++ b/src/game/CLASSES.ts
@@ -30,6 +30,22 @@ export enum CLASSES {
   WARRIOR,
 }
 
+export const CLASS_NAMES: { [classId: number]: { name: string } } = {
+  1: { name: 'Warrior' },
+  2: { name: 'Paladin' },
+  3: { name: 'Hunter' },
+  4: { name: 'Rogue' },
+  5: { name: 'Priest' },
+  6: { name: 'Death Knight' },
+  7: { name: 'Shaman' },
+  8: { name: 'Mage' },
+  9: { name: 'Warlock' },
+  10: { name: 'Monk' },
+  11: { name: 'Druid' },
+  12: { name: 'Demon Hunter' },
+  13: { name: 'Evoker' },
+};
+
 export function getClassBySpecId(specId: number) {
   if (DEATH_KNIGHT_SPECS.find((spec) => spec.id === specId)) {
     return CLASSES.DEATH_KNIGHT;
diff --git a/src/interface/CharacterParses.tsx b/src/interface/CharacterParses.tsx
index beadc474fcc..c382f909402 100644
--- a/src/interface/CharacterParses.tsx
+++ b/src/interface/CharacterParses.tsx
@@ -19,12 +19,18 @@ import REPORT_HISTORY_TYPES from 'interface/REPORT_HISTORY_TYPES';
 import { Component } from 'react';
 import { connect } from 'react-redux';
 import { Link } from 'react-router-dom';
-import { WCLParse, WCLParsesResponse } from 'common/WCL_TYPES';
+import { isHiddenParsesResponse, WCLParse, WCLParsesResponse } from 'common/WCL_TYPES';
 import { isSupportedRegion } from 'common/regions';
 
+import './report/Results/Header.scss';
 import './CharacterParses.scss';
 import ParsesList, { Parse } from './CharacterParsesList';
 import { appendReportHistory } from './reducers/reportHistory';
+import { CLASS_NAMES } from 'game/CLASSES';
+import {
+  classBackgroundImage,
+  characterBackgroundImage,
+} from 'interface/report/Results/PlayerInfo';
 
 const loadRealms = (classic: boolean) =>
   retryingPromise(() =>
@@ -100,7 +106,8 @@ interface CharacterParsesState {
   activeEncounter: number;
   sortBy: number;
   metric: string;
-  image: string | null;
+  characterImage: string | null;
+  classImage: string | null;
   avatarImage: string | null;
   parses: Parse[];
   isLoading: boolean;
@@ -123,7 +130,8 @@ class CharacterParses extends Component<CharacterParsesProps, CharacterParsesSta
       activeEncounter: BOSS_DEFAULT_ALL_BOSSES,
       sortBy: ORDER_BY.DATE,
       metric: 'dps',
-      image: null,
+      characterImage: null,
+      classImage: null,
       avatarImage: null,
       parses: [],
       isLoading: true,
@@ -266,7 +274,7 @@ class CharacterParses extends Component<CharacterParsesProps, CharacterParsesSta
       // Skip Blizzard API - Classic is not supported
       this.setState(
         {
-          image: FALLBACK_PICTURE,
+          characterImage: FALLBACK_PICTURE,
         },
         () => {
           this.load();
@@ -281,7 +289,7 @@ class CharacterParses extends Component<CharacterParsesProps, CharacterParsesSta
     if (region === 'CN') {
       this.setState(
         {
-          image: FALLBACK_PICTURE,
+          characterImage: FALLBACK_PICTURE,
         },
         () => {
           this.load();
@@ -312,18 +320,19 @@ class CharacterParses extends Component<CharacterParsesProps, CharacterParsesSta
     }
 
     const data = await response.json();
-
+    const classImageUrl = classBackgroundImage(CLASS_NAMES[data.class].name, data.region);
     const avatarUrl = data.thumbnail
       ? data.thumbnail.startsWith('https')
         ? data.thumbnail
         : `https://render-${this.props.region}.worldofwarcraft.com/character/${data.thumbnail}`
       : undefined;
-    const imageUrl = avatarUrl?.replace('avatar.jpg', 'main.jpg');
+    const characterImageUrl = characterBackgroundImage(avatarUrl, data.region);
     const role = data.role;
     const metric = role === 'HEALING' ? 'hps' : 'dps';
     this.setState(
       {
-        image: imageUrl,
+        characterImage: characterImageUrl,
+        classImage: classImageUrl,
         avatarImage: avatarUrl,
         metric: metric,
       },
@@ -389,6 +398,15 @@ class CharacterParses extends Component<CharacterParsesProps, CharacterParsesSta
       refresh,
     )
       .then((rawParses) => {
+        if (isHiddenParsesResponse(rawParses)) {
+          // WCL responds with {hidden:true} when the logs are hidden.
+          this.setState({
+            parses: [],
+            isLoading: false,
+            error: ERRORS.CHARACTER_HIDDEN,
+          });
+          return;
+        }
         if (rawParses.length === 0) {
           this.setState({
             parses: [],
@@ -397,7 +415,6 @@ class CharacterParses extends Component<CharacterParsesProps, CharacterParsesSta
           });
           return;
         }
-        // hidden isn't a value on the parse response
 
         if (this.state.class !== '') {
           //only update parses when class was already parsed (since its only a metric/raid change)
@@ -593,11 +610,16 @@ class CharacterParses extends Component<CharacterParsesProps, CharacterParsesSta
     return (
       <div className="results">
         <header>
-          <div className="background">
+          <div
+            className="background"
+            style={{
+              backgroundImage: `url(${this.state.classImage})`,
+            }}
+          >
             <div
               className="img"
               style={{
-                backgroundImage: `url(${this.state.image})`,
+                backgroundImage: `url(${this.state.characterImage})`,
                 backgroundPosition: 'center center',
               }}
             />
diff --git a/src/interface/GuildReports.tsx b/src/interface/GuildReports.tsx
index 29f8f1cf0d9..c675b53f7e9 100644
--- a/src/interface/GuildReports.tsx
+++ b/src/interface/GuildReports.tsx
@@ -15,6 +15,7 @@ import { Component } from 'react';
 import { Link } from 'react-router-dom';
 import { isSupportedRegion } from 'common/regions';
 
+import './report/Results/Header.scss';
 import './GuildReports.scss';
 import ReportsList from './GuildReportsList';
 import ALLIANCE_PICTURE from './images/ally_guild_banner_bwl.jpg';
@@ -431,10 +432,12 @@ class GuildReports extends Component<Props, State> {
               )}
             </div>
             <div className="player">
-              <h2>
-                {this.props.region} - {this.props.realm}
-              </h2>
-              <h1>{this.props.name}</h1>
+              <div className="details">
+                <h2>
+                  {this.props.region} - {this.props.realm}
+                </h2>
+                <h1>{this.props.name}</h1>
+              </div>
             </div>
           </div>
           <nav>
diff --git a/src/interface/report/Results/Header.scss b/src/interface/report/Results/Header.scss
index 11c0486e416..80d066a5066 100644
--- a/src/interface/report/Results/Header.scss
+++ b/src/interface/report/Results/Header.scss
@@ -11,6 +11,8 @@
   padding-top: 85px;
 
   .background {
+    background-position: center 62.5%;
+    background-size: cover;
     position: absolute;
     top: 0;
     left: 50%;
diff --git a/src/interface/report/Results/PlayerInfo.scss b/src/interface/report/Results/PlayerInfo.scss
index c9dd2469f66..c35e3cd8084 100644
--- a/src/interface/report/Results/PlayerInfo.scss
+++ b/src/interface/report/Results/PlayerInfo.scss
@@ -7,12 +7,14 @@
     text-decoration: none;
   }
 
-  .player-background {
+  .class-background {
     background-position: center;
     background-size: cover;
   }
 
   .player-gear {
+    background-size: contain;
+    background-position: center 62.5%;
     display: grid;
     grid-template-columns: 45px 15px auto 30px 15px 45px 45px 15px 30px auto 15px 45px;
     grid-template-rows: 20px 20px 20px 20px 20px 20px 20px 20px 20px 20px 20px 20px 20px 20px 20px 20px 20px 20px;
diff --git a/src/interface/report/Results/PlayerInfo.tsx b/src/interface/report/Results/PlayerInfo.tsx
index 745c5b4c8db..01679adad24 100644
--- a/src/interface/report/Results/PlayerInfo.tsx
+++ b/src/interface/report/Results/PlayerInfo.tsx
@@ -9,6 +9,7 @@ import PlayerInfoGear from './PlayerInfoGear';
 import PlayerInfoGems from './PlayerInfoGems';
 import PlayerInfoTalents from './PlayerInfoTalents';
 import GameBranch from 'game/GameBranch';
+import { CLASS_NAMES } from 'game/CLASSES';
 
 function _parseGear(gear: Item[]) {
   return gear.reduce((gearItemsBySlotId: Item[], item: Item) => gearItemsBySlotId.concat(item), []);
@@ -18,33 +19,46 @@ interface Props {
   combatant: Combatant;
 }
 
-const backgroundImage = (thumbnail?: string, region?: string): string => {
+export const characterBackgroundImage = (thumbnail?: string, region?: string): string => {
   if (thumbnail?.startsWith('https')) {
-    return thumbnail.replace('avatar.jpg', 'main.jpg');
+    return thumbnail.replace('avatar.jpg', 'main-raw.png');
   } else if (thumbnail && region) {
     return `https://render-${region}.worldofwarcraft.com/character/${thumbnail.replace(
-      'avatar',
-      'main',
+      'avatar.jpg',
+      'main-raw.png',
     )}`;
   } else {
     return '/img/fallback-character.jpg';
   }
 };
+export const classBackgroundImage = (className?: string, region?: string): string | null => {
+  if (className && region) {
+    return `https://render.worldofwarcraft.com/${region}/profile-backgrounds/v2/armory_bg_class_${className.toLowerCase().replaceAll(' ', '_')}.jpg`;
+  }
+
+  return null;
+};
 
 const PlayerInfo = ({ combatant }: Props) => {
   const isRetail = combatant.owner.config.branch === GameBranch.Retail;
   const gear: Item[] = _parseGear(combatant._combatantInfo.gear);
   const talents = combatant._combatantInfo.talentTree;
   const averageIlvl = getAverageItemLevel(gear);
-  const background = backgroundImage(
+  const classBackground = classBackgroundImage(
+    CLASS_NAMES[combatant.characterProfile.class].name,
+    combatant.characterProfile?.region,
+  );
+  const characterBackground = characterBackgroundImage(
     combatant.characterProfile?.thumbnail,
     combatant.characterProfile?.region,
   );
-
   return (
     <div className="player-info">
-      <div className="player-background" style={{ backgroundImage: `url(${background})` }}>
-        <div className="player-gear">
+      <div className="class-background" style={{ backgroundImage: `url(${classBackground})` }}>
+        <div
+          className="player-gear player-background"
+          style={{ backgroundImage: `url(${characterBackground})` }}
+        >
           <PlayerGearHeader player={combatant} averageIlvl={averageIlvl} />
           <PlayerInfoGear gear={gear} />
           <PlayerInfoGems gear={gear} />

From 55f3566be8f04a2fb57b297560b529b300dc1521 Mon Sep 17 00:00:00 2001
From: Gazh <axel.bruneaux@epitech.eu>
Date: Fri, 4 Oct 2024 00:02:18 +0200
Subject: [PATCH 2/3] Warlock - Re-enabled Demonology + Destruction + Demonic
 Healthstone support (#7098)

* add demonic healthstone + fix icon in talent

* re-enabled demo/destro spec, update changelog of all 3 warlock spec, add demonic healstone in defensive section of checklist in destro & affli
---
 .../retail/warlock/affliction/CHANGELOG.tsx   |  1 +
 .../retail/warlock/affliction/CONFIG.tsx      | 10 ++++-----
 .../modules/checklist/Component.tsx           |  6 +++++
 .../retail/warlock/demonology/CHANGELOG.tsx   |  1 +
 .../retail/warlock/demonology/CONFIG.tsx      | 22 +++++++++----------
 .../retail/warlock/destruction/CHANGELOG.tsx  |  1 +
 .../retail/warlock/destruction/CONFIG.tsx     | 21 +++++++++---------
 .../modules/features/Checklist/Component.tsx  |  6 +++++
 src/common/SPELLS/others.ts                   |  5 +++++
 src/common/TALENTS/warlock.ts                 |  2 +-
 .../retail/modules/items/Healthstone.ts       |  6 ++++-
 11 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/src/analysis/retail/warlock/affliction/CHANGELOG.tsx b/src/analysis/retail/warlock/affliction/CHANGELOG.tsx
index 8b1108b3866..c04dc39e88d 100644
--- a/src/analysis/retail/warlock/affliction/CHANGELOG.tsx
+++ b/src/analysis/retail/warlock/affliction/CHANGELOG.tsx
@@ -5,6 +5,7 @@ import { Arlie, Jonfanz, Lithix, Meldris, ToppleTheNun, dodse, Gazh } from 'CONT
 import { SpellLink } from 'interface';
 
 export default [
+  change(date(2024, 10, 1), <>Add support for <SpellLink spell={SPELLS.DEMONIC_HEALTHSTONE} /> </>, Gazh),
   change(date(2024, 9, 28), <>Fix <SpellLink spell={TALENTS.SHADOW_EMBRACE_TALENT} /> error </>, Gazh),
   change(date(2024, 9, 26), "Add support for Hero Talents", Gazh),
   change(date(2024, 8, 10), 'Made several changes for affliction in preperation for the TWW', Lithix),
diff --git a/src/analysis/retail/warlock/affliction/CONFIG.tsx b/src/analysis/retail/warlock/affliction/CONFIG.tsx
index 3d88c5f5c54..5658edbe951 100644
--- a/src/analysis/retail/warlock/affliction/CONFIG.tsx
+++ b/src/analysis/retail/warlock/affliction/CONFIG.tsx
@@ -1,4 +1,4 @@
-import { Jonfanz } from 'CONTRIBUTORS';
+import { Gazh } from 'CONTRIBUTORS';
 import GameBranch from 'game/GameBranch';
 import SPECS from 'game/SPECS';
 import type Config from 'parser/Config';
@@ -8,11 +8,11 @@ import { SupportLevel } from 'parser/Config';
 
 const CONFIG: Config = {
   // The people that have contributed to this spec recently. People don't have to sign up to be long-time maintainers to be included in this list. If someone built a large part of the spec or contributed something recently to that spec, they can be added to the contributors list. If someone goes MIA, they may be removed after major changes or during a new expansion.
-  contributors: [Jonfanz],
+  contributors: [Gazh],
   branch: GameBranch.Retail,
   // The WoW client patch this spec was last updated.
-  patchCompatibility: null,
-  supportLevel: SupportLevel.Unmaintained,
+  patchCompatibility: '11.0.2',
+  supportLevel: SupportLevel.MaintainedPartial,
   // Explain the status of this spec's analysis here. Try to mention how complete it is, and perhaps show links to places users can learn more.
   // If this spec's analysis does not show a complete picture please mention this in the `<Warning>` component.
   description: (
@@ -43,7 +43,7 @@ const CONFIG: Config = {
     </>
   ),
   // A recent example report to see interesting parts of the spec. Will be shown on the homepage.
-  exampleReport: '/report/JGFabW3gfqrtynX1/5-Normal+Eranog+-+Kill+(5:08)/Crunky',
+  exampleReport: '/report/mQMF8YnCpTctZK7w/44-Heroic+The+Silken+Court+-+Kill+(7:53)/Desolater',
 
   // Don't change anything below this line;
   // The current spec identifier. This is the only place (in code) that specifies which spec this parser is about.
diff --git a/src/analysis/retail/warlock/affliction/modules/checklist/Component.tsx b/src/analysis/retail/warlock/affliction/modules/checklist/Component.tsx
index 71d3e32f890..bf9032939ce 100644
--- a/src/analysis/retail/warlock/affliction/modules/checklist/Component.tsx
+++ b/src/analysis/retail/warlock/affliction/modules/checklist/Component.tsx
@@ -80,6 +80,9 @@ const AfflictionWarlockChecklist = ({ combatant, castEfficiency, thresholds }: C
             <SpellLink spell={TALENTS.BURNING_RUSH_TALENT} icon /> or mitigate incoming damage with{' '}
             <SpellLink spell={SPELLS.UNENDING_RESOLVE} icon />/
             <SpellLink spell={TALENTS.DARK_PACT_TALENT} icon />.<br />
+            You can use 3 <SpellLink spell={SPELLS.DEMONIC_HEALTHSTONE} icon /> if you have{' '}
+            <SpellLink spell={TALENTS.PACT_OF_GLUTTONY_TALENT} icon /> talented.
+            <br />
             While you shouldn't cast these defensives on cooldown, be aware of them and use them
             whenever effective. Not using them at all indicates you might not be aware of them or
             not using them optimally.
@@ -90,6 +93,9 @@ const AfflictionWarlockChecklist = ({ combatant, castEfficiency, thresholds }: C
           <AbilityRequirement spell={TALENTS.DARK_PACT_TALENT.id} />
         )}
         <AbilityRequirement spell={SPELLS.UNENDING_RESOLVE.id} />
+        {combatant.hasTalent(TALENTS.PACT_OF_GLUTTONY_TALENT) && (
+          <AbilityRequirement spell={SPELLS.DEMONIC_HEALTHSTONE.id} />
+        )}
       </Rule>
       <Rule
         name="Always be casting"
diff --git a/src/analysis/retail/warlock/demonology/CHANGELOG.tsx b/src/analysis/retail/warlock/demonology/CHANGELOG.tsx
index d2d14340516..d80df37e2d4 100644
--- a/src/analysis/retail/warlock/demonology/CHANGELOG.tsx
+++ b/src/analysis/retail/warlock/demonology/CHANGELOG.tsx
@@ -5,6 +5,7 @@ import { Sharrq, Zeboot, Meldris, ToppleTheNun, Jonfanz, Mae, dodse, Arlie, Putr
 import { SpellLink } from 'interface';
 
 export default [
+  change(date(2024, 10, 1), <>Add support for <SpellLink spell={SPELLS.DEMONIC_HEALTHSTONE} /> </>, Gazh),
   change(date(2024, 9, 28), <>Add support for <SpellLink spell={TALENTS_WARLOCK.MARK_OF_FHARG_TALENT}/> & <SpellLink spell={TALENTS_WARLOCK.MARK_OF_SHATUG_TALENT}/></>, Gazh),
   change(date(2024, 9, 26), "Add support for Hero Talents", Gazh),
   change(date(2024, 5, 31), <>Fixed <SpellLink spell={TALENTS_WARLOCK.POWER_SIPHON_TALENT}/> statistic</>, Zyer),
diff --git a/src/analysis/retail/warlock/demonology/CONFIG.tsx b/src/analysis/retail/warlock/demonology/CONFIG.tsx
index de04b03cce0..7b894b70c34 100644
--- a/src/analysis/retail/warlock/demonology/CONFIG.tsx
+++ b/src/analysis/retail/warlock/demonology/CONFIG.tsx
@@ -1,17 +1,17 @@
-import { Zyer } from 'CONTRIBUTORS';
+import { Zyer, Gazh } from 'CONTRIBUTORS';
 import GameBranch from 'game/GameBranch';
 import SPECS from 'game/SPECS';
 import Config, { SupportLevel } from 'parser/Config';
 
-// import CHANGELOG from './CHANGELOG';
+import CHANGELOG from './CHANGELOG';
 
 const config: Config = {
   // The people that have contributed to this spec recently. People don't have to sign up to be long-time maintainers to be included in this list. If someone built a large part of the spec or contributed something recently to that spec, they can be added to the contributors list. If someone goes MIA, they may be removed after major changes or during a new expansion.
-  contributors: [Zyer],
+  contributors: [Zyer, Gazh],
   branch: GameBranch.Retail,
   // The WoW client patch this spec was last updated.
-  patchCompatibility: '10.2.7',
-  supportLevel: SupportLevel.MaintainedFull,
+  patchCompatibility: '11.0.2',
+  supportLevel: SupportLevel.MaintainedPartial,
   // Explain the status of this spec's analysis here. Try to mention how complete it is, and perhaps show links to places users can learn more.
   // If this spec's analysis does not show a complete picture please mention this in the `<Warning>` component.
   description: (
@@ -72,18 +72,18 @@ const config: Config = {
     </>
   ),
   // A recent example report to see interesting parts of the spec. Will be shown on the homepage.
-  exampleReport: '/report/myndpGBw3k7rjVDf/4-Mythic+Smolderon+-+Kill+(7:01)/Yumiblood/standard',
+  exampleReport: "/report/hY6vg1LxqzmR94XG/126-Heroic+Broodtwister+Ovi'nax+-+Kill+(6:24)/Meurthe/",
 
   // Don't change anything below this line;
   // The current spec identifier. This is the only place (in code) that specifies which spec this parser is about.
   spec: SPECS.DEMONOLOGY_WARLOCK,
   // The contents of your changelog.
-  // changelog: CHANGELOG,
+  changelog: CHANGELOG,
   // The CombatLogParser class for your spec.
-  // parser: () =>
-  //   import('./CombatLogParser' /* webpackChunkName: "DemonologyWarlock" */).then(
-  //     (exports) => exports.default,
-  //   ),
+  parser: () =>
+    import('./CombatLogParser' /* webpackChunkName: "DemonologyWarlock" */).then(
+      (exports) => exports.default,
+    ),
   // The path to the current directory (relative form project root). This is used for generating a GitHub link directly to your spec's code.
   path: import.meta.url,
 };
diff --git a/src/analysis/retail/warlock/destruction/CHANGELOG.tsx b/src/analysis/retail/warlock/destruction/CHANGELOG.tsx
index 6e399935b27..60b2e714f5f 100644
--- a/src/analysis/retail/warlock/destruction/CHANGELOG.tsx
+++ b/src/analysis/retail/warlock/destruction/CHANGELOG.tsx
@@ -5,6 +5,7 @@ import { SpellLink } from 'interface';
 
 // prettier-ignore
 export default [
+  change(date(2024, 10, 1), <>Add support for <SpellLink spell={SPELLS.DEMONIC_HEALTHSTONE} /> </>, Gazh),
   change(date(2024, 9, 26), "Add support for Hero Talents", Gazh),
   change(date(2023, 7, 8), 'Update CDR on Dark Pact and Unending Resolve', Arlie),
   change(date(2023, 7, 8), 'Update SpellLink usage.', ToppleTheNun),
diff --git a/src/analysis/retail/warlock/destruction/CONFIG.tsx b/src/analysis/retail/warlock/destruction/CONFIG.tsx
index a752583996c..bc5b103ed98 100644
--- a/src/analysis/retail/warlock/destruction/CONFIG.tsx
+++ b/src/analysis/retail/warlock/destruction/CONFIG.tsx
@@ -1,16 +1,17 @@
+import { Gazh } from 'CONTRIBUTORS';
 import GameBranch from 'game/GameBranch';
 import SPECS from 'game/SPECS';
 
-// import CHANGELOG from './CHANGELOG';
+import CHANGELOG from './CHANGELOG';
 import { SupportLevel } from 'parser/Config';
 
 export default {
   // The people that have contributed to this spec recently. People don't have to sign up to be long-time maintainers to be included in this list. If someone built a large part of the spec or contributed something recently to that spec, they can be added to the contributors list. If someone goes MIA, they may be removed after major changes or during a new expansion.
-  contributors: [],
+  contributors: [Gazh],
   branch: GameBranch.Retail,
   // The WoW client patch this spec was last updated.
-  patchCompatibility: null,
-  supportLevel: SupportLevel.Unmaintained,
+  patchCompatibility: '11.0.2',
+  supportLevel: SupportLevel.MaintainedPartial,
   // Explain the status of this spec's analysis here. Try to mention how complete it is, and perhaps show links to places users can learn more.
   // If this spec's analysis does not show a complete picture please mention this in the `<Warning>` component.
   description: (
@@ -39,18 +40,18 @@ export default {
     </>
   ),
   // A recent example report to see interesting parts of the spec. Will be shown on the homepage.
-  exampleReport: '/report/TGzmk4bXDZJndpj7/6-Heroic+Opulence+-+Kill+(8:12)/3-Lunaira',
+  exampleReport: '/report/9dvKWtRTxa4Ab3Yj/8-Heroic+The+Silken+Court+-+Kill+(6:30)/Trundle',
 
   // Don't change anything below this line;
   // The current spec identifier. This is the only place (in code) that specifies which spec this parser is about.
   spec: SPECS.DESTRUCTION_WARLOCK,
   // The contents of your changelog.
-  // changelog: CHANGELOG,
+  changelog: CHANGELOG,
   // The CombatLogParser class for your spec.
-  // parser: () =>
-  //   import('./CombatLogParser' /* webpackChunkName: "DestructionWarlock" */).then(
-  //     (exports) => exports.default,
-  //   ),
+  parser: () =>
+    import('./CombatLogParser' /* webpackChunkName: "DestructionWarlock" */).then(
+      (exports) => exports.default,
+    ),
   // The path to the current directory (relative form project root). This is used for generating a GitHub link directly to your spec's code.
   path: import.meta.url,
 };
diff --git a/src/analysis/retail/warlock/destruction/modules/features/Checklist/Component.tsx b/src/analysis/retail/warlock/destruction/modules/features/Checklist/Component.tsx
index b5f0d51d23b..f50355d0895 100644
--- a/src/analysis/retail/warlock/destruction/modules/features/Checklist/Component.tsx
+++ b/src/analysis/retail/warlock/destruction/modules/features/Checklist/Component.tsx
@@ -110,6 +110,9 @@ const DestructionWarlockChecklist = ({
             <SpellLink spell={TALENTS.BURNING_RUSH_TALENT} icon /> or mitigate incoming damage with{' '}
             <SpellLink spell={SPELLS.UNENDING_RESOLVE} icon />/
             <SpellLink spell={TALENTS.DARK_PACT_TALENT} icon />.<br />
+            You can use 3 <SpellLink spell={SPELLS.DEMONIC_HEALTHSTONE} icon /> if you have{' '}
+            <SpellLink spell={TALENTS.PACT_OF_GLUTTONY_TALENT} icon /> talented.
+            <br />
             While you shouldn't cast these defensives on cooldown, be aware of them and use them
             whenever effective. Not using them at all indicates you might not be aware of them or
             not using them optimally.
@@ -120,6 +123,9 @@ const DestructionWarlockChecklist = ({
           <AbilityRequirement spell={TALENTS.DARK_PACT_TALENT.id} />
         )}
         <AbilityRequirement spell={SPELLS.UNENDING_RESOLVE.id} />
+        {combatant.hasTalent(TALENTS.PACT_OF_GLUTTONY_TALENT) && (
+          <AbilityRequirement spell={SPELLS.DEMONIC_HEALTHSTONE.id} />
+        )}
       </Rule>
       <Rule
         name="Always be casting"
diff --git a/src/common/SPELLS/others.ts b/src/common/SPELLS/others.ts
index 8d92a7c1434..b231e8810a7 100644
--- a/src/common/SPELLS/others.ts
+++ b/src/common/SPELLS/others.ts
@@ -318,6 +318,11 @@ const spells = {
     name: 'Healthstone',
     icon: 'warlock_-healthstone',
   },
+  DEMONIC_HEALTHSTONE: {
+    id: 452930,
+    name: 'Demonic Healthstone',
+    icon: 'warlock_-bloodstone',
+  },
   ANCIENT_REJUVENATION_POTION: {
     id: 188018,
     name: 'Ancient Rejuvenation Potion',
diff --git a/src/common/TALENTS/warlock.ts b/src/common/TALENTS/warlock.ts
index 0393616798e..0ff35a1576e 100644
--- a/src/common/TALENTS/warlock.ts
+++ b/src/common/TALENTS/warlock.ts
@@ -1150,7 +1150,7 @@ const talents = {
   PACT_OF_GLUTTONY_TALENT: {
     id: 386689,
     name: 'Pact of Gluttony',
-    icon: 'warlock__bloodstone',
+    icon: 'warlock_-bloodstone',
     maxRanks: 1,
     entryIds: [91434],
     definitionIds: [{ id: 96436, specId: 267 }],
diff --git a/src/parser/retail/modules/items/Healthstone.ts b/src/parser/retail/modules/items/Healthstone.ts
index 7b7ebc5f70c..3900c8ef67b 100644
--- a/src/parser/retail/modules/items/Healthstone.ts
+++ b/src/parser/retail/modules/items/Healthstone.ts
@@ -4,6 +4,7 @@ import Events, { Class, DeathEvent } from 'parser/core/Events';
 import Combatants from 'parser/shared/modules/Combatants';
 
 import Potion from './Potion';
+import { TALENTS_WARLOCK } from 'common/TALENTS';
 
 const ONE_HOUR_MS = 3600000; // one hour
 const COOLDOWN_MS = 60000; // one minute
@@ -19,7 +20,7 @@ class Healthstone extends Potion {
 
   protected combatants!: Combatants;
 
-  static spells = [SPELLS.HEALTHSTONE.id];
+  static spells = [SPELLS.HEALTHSTONE.id, SPELLS.DEMONIC_HEALTHSTONE.id];
   static recommendedEfficiency = 0;
   static extraAbilityInfo = {
     isDefensive: true,
@@ -32,6 +33,9 @@ class Healthstone extends Potion {
     super(options);
     this.active = this.hasWarlock(options.combatants as Combatants);
     this.addEventListener(Events.death.to(SELECTED_PLAYER), this.onDeath);
+    this.maxCasts = this.selectedCombatant.hasTalent(TALENTS_WARLOCK.PACT_OF_GLUTTONY_TALENT)
+      ? 3
+      : 1;
   }
 
   protected hasWarlock(combatants: Combatants) {

From 33be06d56e631a42e073e1fc80c4f51d09cc8d3a Mon Sep 17 00:00:00 2001
From: Vetyst <d.janse97@gmail.com>
Date: Thu, 3 Oct 2024 23:11:02 +0100
Subject: [PATCH 3/3] feature(TTW): Spymaster's Web Trinket (#7089)

* feature(TTW): Spymaster's Web Trinket

* Update personal contributor entry

* Update personal contributor entry

* feature(TTW): Spymaster's Web Trinket

Review comments

---------

Co-authored-by: Danny Janse <danny.janse@synetic.nl>
Co-authored-by: J David Smith <emallson@emallson.net>
Co-authored-by: Putro <29204244+Pewtro@users.noreply.github.com>
---
 src/CHANGELOG.tsx                             |   1 +
 src/CONTRIBUTORS.ts                           |  10 +-
 src/common/ITEMS/thewarwithin/trinkets.ts     |   5 +
 src/common/SPELLS/thewarwithin/trinkets.ts    |  11 ++
 src/parser/core/CASTS_THAT_ARENT_CASTS.ts     |   1 +
 src/parser/core/CombatLogParser.tsx           |   2 +
 .../thewarwithin/trinkets/SpymastersWeb.tsx   | 126 ++++++++++++++++++
 7 files changed, 151 insertions(+), 5 deletions(-)
 create mode 100644 src/parser/retail/modules/items/thewarwithin/trinkets/SpymastersWeb.tsx

diff --git a/src/CHANGELOG.tsx b/src/CHANGELOG.tsx
index 6ddd32a5774..00bcb92bad2 100644
--- a/src/CHANGELOG.tsx
+++ b/src/CHANGELOG.tsx
@@ -38,6 +38,7 @@ import SpellLink from 'interface/SpellLink';
 
 // prettier-ignore
 export default [
+  change(date(2024, 10, 4), <>Added simple statistics for <ItemLink id={ITEMS.SPYMASTERS_WEB.id}/>.</>, Vetyst),
   change(date(2024, 10, 3), 'Fixed rendering of the Header on the character log browser.', Vetyst),
   change(date(2024, 9, 30), 'Add Classic Cata Firelands raid zone, headshots, and placeholder image', jazminite),
   change(date(2024, 9, 30), 'Enchant checker now detects Spellthreads', Sref),
diff --git a/src/CONTRIBUTORS.ts b/src/CONTRIBUTORS.ts
index 201bfd21e82..3d379aa9a14 100644
--- a/src/CONTRIBUTORS.ts
+++ b/src/CONTRIBUTORS.ts
@@ -564,14 +564,14 @@ export const HawkCorrigan: Contributor = {
 };
 export const Vetyst: Contributor = {
   nickname: 'Vetyst',
-  github: 'djanse',
-  discord: 'vetyst#0001',
+  github: 'vetyst',
+  discord: 'vetyst',
   avatar: avatar('vetyst-avatar.png'),
   mains: [
     {
-      name: 'Vetyst',
-      spec: SPECS.BALANCE_DRUID,
-      link: 'https://worldofwarcraft.com/en-gb/character/tarren-mill/vetyst',
+      name: 'Vetiest',
+      spec: SPECS.SHADOW_PRIEST,
+      link: 'https://worldofwarcraft.com/en-gb/character/ragnaros/vetiest',
     },
   ],
 };
diff --git a/src/common/ITEMS/thewarwithin/trinkets.ts b/src/common/ITEMS/thewarwithin/trinkets.ts
index f4505a9c15f..8f4ad6296bd 100644
--- a/src/common/ITEMS/thewarwithin/trinkets.ts
+++ b/src/common/ITEMS/thewarwithin/trinkets.ts
@@ -11,6 +11,11 @@ const trinkets = {
     name: 'Signet of the Priory',
     icon: 'inv_arathordungeon_signet_color1',
   },
+  SPYMASTERS_WEB: {
+    id: 220202,
+    name: "Spymaster's Web",
+    icon: 'inv_11_0_raid_spymastersweb_purple',
+  },
 } satisfies Record<string, Item>;
 
 export default trinkets;
diff --git a/src/common/SPELLS/thewarwithin/trinkets.ts b/src/common/SPELLS/thewarwithin/trinkets.ts
index 64507d9bd0e..18f60b493e0 100644
--- a/src/common/SPELLS/thewarwithin/trinkets.ts
+++ b/src/common/SPELLS/thewarwithin/trinkets.ts
@@ -7,6 +7,17 @@ const spells = {
     name: 'Bolstering Light',
     icon: 'inv_arathordungeon_signet_color1',
   },
+  // Spymaster's Web
+  SPYMASTERS_WEB: {
+    id: 444959,
+    name: "Spymaster's Web",
+    icon: 'ability_spy',
+  },
+  SPYMASTERS_REPORT: {
+    id: 451199,
+    name: "Spymaster's Report",
+    icon: 'inv_nerubianspiderling2_black',
+  },
 } satisfies Record<string, Spell>;
 
 export default spells;
diff --git a/src/parser/core/CASTS_THAT_ARENT_CASTS.ts b/src/parser/core/CASTS_THAT_ARENT_CASTS.ts
index 7efb14a91e4..ba6586c51d7 100644
--- a/src/parser/core/CASTS_THAT_ARENT_CASTS.ts
+++ b/src/parser/core/CASTS_THAT_ARENT_CASTS.ts
@@ -100,6 +100,7 @@ const spells: number[] = [
   SPELLS.CLOUDBURST_TOTEM_RECALL.id, // Cloudburst reactivation
   TALENTS_SHAMAN.SPIRITWALKERS_GRACE_TALENT.id,
   SPELLS.FERAL_LUNGE_NOT_A_CAST.id, // duplicate event of regular Feral Lunge cast
+  SPELLS.HEALING_RAIN_TOTEMIC.id,
   //endregion
 
   //region warlock
diff --git a/src/parser/core/CombatLogParser.tsx b/src/parser/core/CombatLogParser.tsx
index 315b05cb4b6..41a63bf0ee5 100644
--- a/src/parser/core/CombatLogParser.tsx
+++ b/src/parser/core/CombatLogParser.tsx
@@ -101,6 +101,7 @@ import SporeTender from 'parser/retail/modules/items/dragonflight/enchants/Spore
 import WaftingDevotion from 'parser/retail/modules/items/dragonflight/enchants/WaftingDevotion';
 import WaftingWrit from 'parser/retail/modules/items/dragonflight/enchants/WaftingWrit';
 import SignetOfThePriory from 'parser/retail/modules/items/thewarwithin/trinkets/SignetOfThePriory';
+import SpymastersWeb from 'parser/retail/modules/items/thewarwithin/trinkets/SpymastersWeb';
 import FriendlyCompatNormalizer from './FriendlyCompatNormalizer';
 import {
   AuthorityOfRadiantPower,
@@ -218,6 +219,7 @@ class CombatLogParser {
     stormridersFury: StormridersFury,
     authorityOfTheDepths: AuthorityOfTheDepths,
     signetOfThePriory: SignetOfThePriory,
+    spymastersWeb: SpymastersWeb,
 
     // Embellishments
     darkmoonSigilAscension: DarkmoonSigilAscension,
diff --git a/src/parser/retail/modules/items/thewarwithin/trinkets/SpymastersWeb.tsx b/src/parser/retail/modules/items/thewarwithin/trinkets/SpymastersWeb.tsx
new file mode 100644
index 00000000000..db376ee1c2a
--- /dev/null
+++ b/src/parser/retail/modules/items/thewarwithin/trinkets/SpymastersWeb.tsx
@@ -0,0 +1,126 @@
+import ITEMS from 'common/ITEMS/thewarwithin/trinkets';
+import Analyzer, { Options, SELECTED_PLAYER } from 'parser/core/Analyzer';
+import Abilities from 'parser/core/modules/Abilities';
+import SPELLS from 'common/SPELLS/thewarwithin/trinkets';
+import SPELL_CATEGORY from 'parser/core/SPELL_CATEGORY';
+import Statistic from 'parser/ui/Statistic';
+import STATISTIC_ORDER from 'parser/ui/STATISTIC_ORDER';
+import Events, { ApplyBuffEvent, ApplyBuffStackEvent, CastEvent } from 'parser/core/Events';
+import BoringItemValueText from 'parser/ui/BoringItemValueText';
+import { formatDuration, formatNumber } from 'common/format';
+import STATISTIC_CATEGORY from 'parser/ui/STATISTIC_CATEGORY';
+import { calculatePrimaryStat } from 'parser/core/stats';
+
+type SpymastersWebCast = {
+  timestamp: number;
+  stacks: number;
+};
+
+/**
+ * Based on the stats provided on wowhead.
+ *
+ * https://www.wowhead.com/item=220202/spymasters-web
+ */
+const SPYMASTERS_WEB_BASE_ILVL = 571;
+const SPYMASTERS_WEB_BASE_GAIN = 515;
+
+export default class SpymastersWeb extends Analyzer.withDependencies({
+  abilities: Abilities,
+}) {
+  protected currentReportStackCount: number = 0;
+  protected primaryStatBonus: number = 0;
+  protected SpymastersWebCasts: SpymastersWebCast[] = [];
+
+  constructor(options: Options) {
+    super(options);
+
+    // Ensure the combatant has the trinket.
+    this.active = this.selectedCombatant.hasTrinket(ITEMS.SPYMASTERS_WEB.id);
+    if (!this.active) {
+      return;
+    }
+
+    // Add the ability to the spellbook of the current combatant.
+    this.deps.abilities.add({
+      spell: SPELLS.SPYMASTERS_WEB.id,
+      category: SPELL_CATEGORY.ITEMS,
+      cooldown: 20,
+    });
+
+    this.addEventListener(
+      Events.applybuff.by(SELECTED_PLAYER).spell(SPELLS.SPYMASTERS_REPORT),
+      this._onBuffApply,
+    );
+    this.addEventListener(
+      Events.applybuffstack.by(SELECTED_PLAYER).spell(SPELLS.SPYMASTERS_REPORT),
+      this._onBuffApply,
+    );
+    this.addEventListener(
+      Events.cast.by(SELECTED_PLAYER).spell(SPELLS.SPYMASTERS_WEB),
+      this._onCast,
+    );
+
+    // Calculate the primary stat bonus we'd receive per stack when the on use effect of the tricket is cast.
+    this.primaryStatBonus = calculatePrimaryStat(
+      SPYMASTERS_WEB_BASE_ILVL,
+      SPYMASTERS_WEB_BASE_GAIN,
+      this.selectedCombatant.getTrinket(ITEMS.SPYMASTERS_WEB.id)?.itemLevel,
+    );
+  }
+
+  _onBuffApply(event: ApplyBuffStackEvent | ApplyBuffEvent) {
+    // Increase the current stack report stack count.
+    this.currentReportStackCount += 1;
+  }
+
+  _onCast(event: CastEvent) {
+    this.SpymastersWebCasts.push({
+      timestamp: event.timestamp,
+      stacks: this.currentReportStackCount,
+    });
+
+    // Reset the stack count to zero.
+    this.currentReportStackCount = 0;
+  }
+
+  statistic() {
+    const castRows = this.SpymastersWebCasts.map((cast: SpymastersWebCast, index: number) => {
+      const castTime = cast.timestamp - this.owner.fight.start_time;
+      const intellectGained = cast.stacks * this.primaryStatBonus;
+
+      return (
+        <tr key={index}>
+          <td>{formatDuration(castTime)}</td>
+          <td>{cast.stacks}</td>
+          <td>{formatNumber(intellectGained)}</td>
+        </tr>
+      );
+    });
+
+    return (
+      <Statistic
+        position={STATISTIC_ORDER.OPTIONAL(99)}
+        category={STATISTIC_CATEGORY.ITEMS}
+        size="flexible"
+        dropdown={
+          <>
+            <table className="table table-condensed">
+              <thead>
+                <tr>
+                  <th>Cast</th>
+                  <th>Stacks on Use</th>
+                  <th>Intellect Gained</th>
+                </tr>
+              </thead>
+              <tbody>{castRows}</tbody>
+            </table>
+          </>
+        }
+      >
+        <BoringItemValueText item={ITEMS.SPYMASTERS_WEB}>
+          {this.SpymastersWebCasts.length} Casts
+        </BoringItemValueText>
+      </Statistic>
+    );
+  }
+}