Skip to content

Commit

Permalink
Merge https://github.com/WoWAnalyzer/WoWAnalyzer into breath-of-eons-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Krealle committed Oct 4, 2024
2 parents 91cd641 + 33be06d commit d23adb3
Show file tree
Hide file tree
Showing 25 changed files with 293 additions and 58 deletions.
2 changes: 2 additions & 0 deletions src/CHANGELOG.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ 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),
change(date(2024, 9, 26), "Add support for Warlock Hero Talents", Gazh),
Expand Down
10 changes: 5 additions & 5 deletions src/CONTRIBUTORS.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
],
};
Expand Down
1 change: 1 addition & 0 deletions src/analysis/retail/warlock/affliction/CHANGELOG.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
10 changes: 5 additions & 5 deletions src/analysis/retail/warlock/affliction/CONFIG.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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: (
Expand Down Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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"
Expand Down
1 change: 1 addition & 0 deletions src/analysis/retail/warlock/demonology/CHANGELOG.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
22 changes: 11 additions & 11 deletions src/analysis/retail/warlock/demonology/CONFIG.tsx
Original file line number Diff line number Diff line change
@@ -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: (
Expand Down Expand Up @@ -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,
};
Expand Down
1 change: 1 addition & 0 deletions src/analysis/retail/warlock/destruction/CHANGELOG.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
21 changes: 11 additions & 10 deletions src/analysis/retail/warlock/destruction/CONFIG.tsx
Original file line number Diff line number Diff line change
@@ -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: (
Expand Down Expand Up @@ -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,
};
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions src/common/ITEMS/thewarwithin/trinkets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
5 changes: 5 additions & 0 deletions src/common/SPELLS/others.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
11 changes: 11 additions & 0 deletions src/common/SPELLS/thewarwithin/trinkets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
2 changes: 1 addition & 1 deletion src/common/TALENTS/warlock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 }],
Expand Down
6 changes: 5 additions & 1 deletion src/common/WCL_TYPES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 16 additions & 0 deletions src/game/CLASSES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit d23adb3

Please sign in to comment.