Skip to content

Commit

Permalink
Update ancientteachings
Browse files Browse the repository at this point in the history
  • Loading branch information
trevorm4 committed Oct 23, 2024
1 parent ddf6e0b commit 2d0ffce
Show file tree
Hide file tree
Showing 17 changed files with 37 additions and 37 deletions.
4 changes: 2 additions & 2 deletions src/analysis/retail/monk/mistweaver/CombatLogParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import REMGraph from './modules/features/REMGraph';
import JadeBond from './modules/spells/JadeBond';
import RisingSunRevival from './modules/spells/UpliftedSpirits';
import JadefireStompHealing from './modules/spells/JadefireStompHealing';
import AncientTeachings from './modules/spells/AncientTeachings';
import JadefireTeachings from './modules/spells/JadefireTeachings';
import EnvelopingBreath from './modules/spells/EnvelopingBreath';
import EnvelopingMists from './modules/spells/EnvelopingMists';
import ExpelHarm from './modules/spells/ExpelHarm';
Expand Down Expand Up @@ -146,7 +146,7 @@ class CombatLogParser extends CoreCombatLogParser {
vivaciousVivification: VivaciousVivification,

// MW Talents
ancientTeachings: AncientTeachings,
jadefireTeachings: JadefireTeachings,
energizingBrew: EnergizingBrew,
envelopingBreath: EnvelopingBreath,
envelopingMists: EnvelopingMists,
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/retail/monk/mistweaver/Guide.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default function Guide({ modules, events, info }: GuideProps<typeof Comba
{modules.thunderFocusTea.guideSubsection}
{modules.vivify.guideSubsection}
{info.combatant.hasTalent(TALENTS_MONK.JADEFIRE_TEACHINGS_TALENT) &&
modules.ancientTeachings.guideSubsection}
modules.jadefireTeachings.guideSubsection}
{info.combatant.hasTalent(TALENTS_MONK.SHEILUNS_GIFT_TALENT) && (
<SheilunsGraph modules={modules} events={events} info={info} />
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ const rotation_rm_at_sg = build([
const rotation_fallback = build([...commonTop, ...commonBottom]);

export enum MistweaverApl {
RisingMistAncientTeachingsShaohaos,
RisingMistJadefireTeachingsShaohaos,
AwakenedFaeline,
TearOfMorning,
Fallback,
Expand All @@ -167,7 +167,7 @@ export const chooseApl = (info: PlayerInfo): MistweaverApl => {
info.combatant.hasTalent(talents.SHAOHAOS_LESSONS_TALENT) &&
info.combatant.hasTalent(talents.INVOKERS_DELIGHT_TALENT)
) {
return MistweaverApl.RisingMistAncientTeachingsShaohaos;
return MistweaverApl.RisingMistJadefireTeachingsShaohaos;
} else if (
info.combatant.hasTalent(talents.AWAKENED_JADEFIRE_TALENT) &&
info.combatant.hasTalent(talents.JADEFIRE_TEACHINGS_TALENT)
Expand All @@ -180,7 +180,7 @@ export const chooseApl = (info: PlayerInfo): MistweaverApl => {
};

const apls: Record<MistweaverApl, Apl> = {
[MistweaverApl.RisingMistAncientTeachingsShaohaos]: rotation_rm_at_sg,
[MistweaverApl.RisingMistJadefireTeachingsShaohaos]: rotation_rm_at_sg,
[MistweaverApl.AwakenedFaeline]: rotation_fallback,
[MistweaverApl.TearOfMorning]: rotation_fallback,
[MistweaverApl.Fallback]: rotation_fallback,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { MistweaverApl } from './AplCheck';

const aplTitle = (choice: MistweaverApl) => {
switch (choice) {
case MistweaverApl.RisingMistAncientTeachingsShaohaos:
case MistweaverApl.RisingMistJadefireTeachingsShaohaos:
return (
<>
<SpellLink spell={talents.RISING_MIST_TALENT} /> /{' '}
Expand Down Expand Up @@ -38,7 +38,7 @@ const RisingMistDescription = () => {
);
};

const AncientTeachingsDescription = () => {
const JadefireTeachingsDescription = () => {
return (
<>
to heal by using your damaging abilities (<SpellLink spell={talents.RISING_SUN_KICK_TALENT} />
Expand Down Expand Up @@ -67,13 +67,13 @@ const ThunderFocusTeaREM = () => {
);
};

const RisingMistAncientTeachingsShaohaosDescription = () => {
const RisingMistJadefireTeachingsShaohaosDescription = () => {
return (
<>
<p>
The {aplTitle(MistweaverApl.RisingMistAncientTeachingsShaohaos)} rotation uses{' '}
The {aplTitle(MistweaverApl.RisingMistJadefireTeachingsShaohaos)} rotation uses{' '}
<RisingMistDescription />
<AncientTeachingsDescription />
<JadefireTeachingsDescription />
</p>
<p>
When playing <SpellLink spell={talents.RISING_MIST_TALENT} /> and{' '}
Expand Down Expand Up @@ -131,8 +131,8 @@ const FallbackDescription = () => {

const Description = ({ aplChoice }: { aplChoice: MistweaverApl }) => {
switch (aplChoice) {
case MistweaverApl.RisingMistAncientTeachingsShaohaos:
return <RisingMistAncientTeachingsShaohaosDescription />;
case MistweaverApl.RisingMistJadefireTeachingsShaohaos:
return <RisingMistJadefireTeachingsShaohaosDescription />;
case MistweaverApl.AwakenedFaeline:
return <CleaveBuildNotYetSupportedDescription />;
case MistweaverApl.TearOfMorning:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import RenewingMist from '../spells/RenewingMist';
import SoothingMist from '../spells/SoothingMist';
import Vivify from '../spells/Vivify';
import RefreshingJadeWind from '../spells/RefreshingJadeWind';
import AncientTeachings from '../spells/AncientTeachings';
import JadefireTeachings from '../spells/JadefireTeachings';
import RapidDiffusion from '../spells/RapidDiffusion';
import DancingMists from '../spells/DancingMists';
import MistyPeaks from '../spells/MistyPeaks';
Expand All @@ -33,7 +33,7 @@ class MistweaverHealingEfficiencyTracker extends HealingEfficiencyTracker {
refreshingJadeWind: RefreshingJadeWind,
expelHarm: ExpelHarm,
jadefireStompHealing: JadefireStompHealing,
ancientTeachings: AncientTeachings,
jadefireTeachings: JadefireTeachings,
rapidDiffusion: RapidDiffusion,
dancingMists: DancingMists,
mistyPeaks: MistyPeaks,
Expand All @@ -51,7 +51,7 @@ class MistweaverHealingEfficiencyTracker extends HealingEfficiencyTracker {
protected refreshingJadeWind!: RefreshingJadeWind;
protected expelHarm!: ExpelHarm;
protected jadefireStompHealing!: JadefireStompHealing;
protected ancientTeachings!: AncientTeachings;
protected jadefireTeachings!: JadefireTeachings;
protected rapidDiffusion!: RapidDiffusion;
protected dancingMists!: DancingMists;
protected mistyPeaks!: MistyPeaks;
Expand Down Expand Up @@ -196,9 +196,9 @@ class MistweaverHealingEfficiencyTracker extends HealingEfficiencyTracker {

getJFSDetails(spellInfo: SpellInfoDetails) {
spellInfo.healingDone = this.jadefireStompHealing.jfsHealing;
spellInfo.healingDone += this.ancientTeachings.totalHealing;
spellInfo.healingDone += this.jadefireTeachings.totalHealing;
spellInfo.overhealingDone = this.jadefireStompHealing.jfsOverhealing;
spellInfo.overhealingDone += this.ancientTeachings.overhealing;
spellInfo.overhealingDone += this.jadefireTeachings.overhealing;
return spellInfo;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import SheilunsGift from '../spells/SheilunsGift';
import ShaohaosLessons from '../spells/ShaohaosLessons';
import VeilOfPride from '../spells/VeilOfPride';
import LegacyOfWisdom from '../spells/LegacyOfWisdom';
import AncientTeachings from '../spells/AncientTeachings';
import JadefireTeachings from '../spells/JadefireTeachings';
import TearOfMorning from '../spells/TearOfMorning';
import ChiHarmony from '../spells/ChiHarmony';
import LotusInfusion from '../spells/LotusInfusion';
Expand All @@ -43,7 +43,7 @@ class TalentHealingStatistic extends Analyzer {
shaohaos: ShaohaosLessons,
veilOfPride: VeilOfPride,
legacyOfWisdom: LegacyOfWisdom,
ancientTeachings: AncientTeachings,
jadefireTeachings: JadefireTeachings,
jadefireStomp: JadefireStomp,
tearOfMorning: TearOfMorning,
chiHarmony: ChiHarmony,
Expand All @@ -67,7 +67,7 @@ class TalentHealingStatistic extends Analyzer {
protected shaohaos!: ShaohaosLessons;
protected veilOfPride!: VeilOfPride;
protected legacyOfWisdom!: LegacyOfWisdom;
protected ancientTeachings!: AncientTeachings;
protected jadefireTeachings!: JadefireTeachings;
protected jadefireStomp!: JadefireStomp;

protected tearOfMorning!: TearOfMorning;
Expand Down Expand Up @@ -122,7 +122,7 @@ class TalentHealingStatistic extends Analyzer {
talentList.push(this.legacyOfWisdom.subStatistic());
}
if (this.selectedCombatant.hasTalent(TALENTS_MONK.RISING_MIST_TALENT)) {
talentList.push(this.ancientTeachings.talentHealingStatistic());
talentList.push(this.jadefireTeachings.talentHealingStatistic());
}
if (this.selectedCombatant.hasTalent(TALENTS_MONK.JADEFIRE_STOMP_TALENT)) {
talentList.push(this.jadefireStomp.talentHealingStatistic());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { getCurrentRSKTalent, getCurrentRSKTalentDamage, SPELL_COLORS } from '..
import { GUIDE_CORE_EXPLANATION_PERCENT } from '../../Guide';
import StatisticListBoxItem from 'parser/ui/StatisticListBoxItem';

class AncientTeachings extends Analyzer {
class JadefireTeachings extends Analyzer {
atSourceSpell: number = 0;
damageSpellToHealing: Map<number, number> = new Map();
damageSpellsCount: Map<number, number> = new Map();
Expand All @@ -33,7 +33,7 @@ class AncientTeachings extends Analyzer {
overhealing: number = 0;

/**
* After you cast Jadefire Stomp, Tiger Palm, Blackout Kick, and Rising Sun Kick heal an injured ally within 20 yards for 150% of the damage done. Lasts 15s.
* After you cast Jadefire Stomp, Tiger Palm, Blackout Kick, and Rising Sun Kick heal an injured ally within 20 yards for 140% of the damage done. Lasts 15s.
*/
constructor(options: Options) {
super(options);
Expand Down Expand Up @@ -161,7 +161,7 @@ class AncientTeachings extends Analyzer {
return this.rskHealing + this.bokHealing + this.totmHealing + this.tpHealing;
}

getAncientTeachingsDataItems() {
getJadefireTeachingsDataItems() {
const items = [
{
spell: getCurrentRSKTalent(this.selectedCombatant),
Expand Down Expand Up @@ -247,10 +247,10 @@ class AncientTeachings extends Analyzer {
</>
}
>
<TalentAggregateBars bars={this.getAncientTeachingsDataItems()}></TalentAggregateBars>
<TalentAggregateBars bars={this.getJadefireTeachingsDataItems()}></TalentAggregateBars>
</TalentAggregateStatisticContainer>
);
}
}

export default AncientTeachings;
export default JadefireTeachings;
2 changes: 1 addition & 1 deletion src/localization/de/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@
"monk.mistweaver.spells.essenceFont.statistic.tooltip": "",
"monk.mistweaver.suggestions.alwaysBeCasting.downtime": "{0}% Downtime",
"monk.mistweaver.suggestions.alwaysBeCasting.nonHealing": "{0}% Zeit verbracht nicht am Heilen",
"monk.mistweaver.suggestions.ancientTeachings.uptime": "",
"monk.mistweaver.suggestions.jadefireTeachings.uptime": "",
"monk.mistweaver.suggestions.chiBurst.targetsHit": "Ziele getroffen pro Einsatz von Chistoß -",
"monk.mistweaver.suggestions.chiBurst.targetsHitPartTwo": "% der Raidgruppe getroffen",
"monk.mistweaver.suggestions.envelopingBreath.averageEnvBPerEnv": "Einsätze von 'Einhüllender Atem' pro Einsatz von 'Einhüllender Nebel' während 'Erhabener'",
Expand Down
2 changes: 1 addition & 1 deletion src/localization/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@
"monk.mistweaver.spells.essenceFont.statistic.tooltip": "Mastery:<0><1>{0} additional hits</1><2>{1} additional healing</2><3>Avg number of GoMs hits per triggering event (aka Essence Font Proc Ratio): {2}</3></0>{3}",
"monk.mistweaver.suggestions.alwaysBeCasting.downtime": "{0}% downtime",
"monk.mistweaver.suggestions.alwaysBeCasting.nonHealing": "{0}% non healing time",
"monk.mistweaver.suggestions.ancientTeachings.uptime": "% uptime",
"monk.mistweaver.suggestions.jadefireTeachings.uptime": "% uptime",
"monk.mistweaver.suggestions.chiBurst.targetsHit": "targets hit per Chi Burst cast -",
"monk.mistweaver.suggestions.chiBurst.targetsHitPartTwo": "% of raid hit",
"monk.mistweaver.suggestions.envelopingBreath.averageEnvBPerEnv": "Enveloping Breaths per Enveloping Mist during Celestial",
Expand Down
2 changes: 1 addition & 1 deletion src/localization/es/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@
"monk.mistweaver.spells.essenceFont.statistic.tooltip": "",
"monk.mistweaver.suggestions.alwaysBeCasting.downtime": "",
"monk.mistweaver.suggestions.alwaysBeCasting.nonHealing": "",
"monk.mistweaver.suggestions.ancientTeachings.uptime": "",
"monk.mistweaver.suggestions.jadefireTeachings.uptime": "",
"monk.mistweaver.suggestions.chiBurst.targetsHit": "",
"monk.mistweaver.suggestions.chiBurst.targetsHitPartTwo": "",
"monk.mistweaver.suggestions.envelopingBreath.averageEnvBPerEnv": "",
Expand Down
2 changes: 1 addition & 1 deletion src/localization/fr/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@
"monk.mistweaver.spells.essenceFont.statistic.tooltip": "",
"monk.mistweaver.suggestions.alwaysBeCasting.downtime": "",
"monk.mistweaver.suggestions.alwaysBeCasting.nonHealing": "",
"monk.mistweaver.suggestions.ancientTeachings.uptime": "",
"monk.mistweaver.suggestions.jadefireTeachings.uptime": "",
"monk.mistweaver.suggestions.chiBurst.targetsHit": "",
"monk.mistweaver.suggestions.chiBurst.targetsHitPartTwo": "",
"monk.mistweaver.suggestions.envelopingBreath.averageEnvBPerEnv": "",
Expand Down
2 changes: 1 addition & 1 deletion src/localization/it/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@
"monk.mistweaver.spells.essenceFont.statistic.tooltip": "",
"monk.mistweaver.suggestions.alwaysBeCasting.downtime": "",
"monk.mistweaver.suggestions.alwaysBeCasting.nonHealing": "",
"monk.mistweaver.suggestions.ancientTeachings.uptime": "",
"monk.mistweaver.suggestions.jadefireTeachings.uptime": "",
"monk.mistweaver.suggestions.chiBurst.targetsHit": "",
"monk.mistweaver.suggestions.chiBurst.targetsHitPartTwo": "",
"monk.mistweaver.suggestions.envelopingBreath.averageEnvBPerEnv": "",
Expand Down
2 changes: 1 addition & 1 deletion src/localization/ko/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@
"monk.mistweaver.spells.essenceFont.statistic.tooltip": "",
"monk.mistweaver.suggestions.alwaysBeCasting.downtime": "",
"monk.mistweaver.suggestions.alwaysBeCasting.nonHealing": "",
"monk.mistweaver.suggestions.ancientTeachings.uptime": "",
"monk.mistweaver.suggestions.jadefireTeachings.uptime": "",
"monk.mistweaver.suggestions.chiBurst.targetsHit": "",
"monk.mistweaver.suggestions.chiBurst.targetsHitPartTwo": "",
"monk.mistweaver.suggestions.envelopingBreath.averageEnvBPerEnv": "",
Expand Down
2 changes: 1 addition & 1 deletion src/localization/pl/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@
"monk.mistweaver.spells.essenceFont.statistic.tooltip": "",
"monk.mistweaver.suggestions.alwaysBeCasting.downtime": "",
"monk.mistweaver.suggestions.alwaysBeCasting.nonHealing": "",
"monk.mistweaver.suggestions.ancientTeachings.uptime": "",
"monk.mistweaver.suggestions.jadefireTeachings.uptime": "",
"monk.mistweaver.suggestions.chiBurst.targetsHit": "",
"monk.mistweaver.suggestions.chiBurst.targetsHitPartTwo": "",
"monk.mistweaver.suggestions.envelopingBreath.averageEnvBPerEnv": "",
Expand Down
2 changes: 1 addition & 1 deletion src/localization/pt/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@
"monk.mistweaver.spells.essenceFont.statistic.tooltip": "",
"monk.mistweaver.suggestions.alwaysBeCasting.downtime": "",
"monk.mistweaver.suggestions.alwaysBeCasting.nonHealing": "",
"monk.mistweaver.suggestions.ancientTeachings.uptime": "",
"monk.mistweaver.suggestions.jadefireTeachings.uptime": "",
"monk.mistweaver.suggestions.chiBurst.targetsHit": "",
"monk.mistweaver.suggestions.chiBurst.targetsHitPartTwo": "",
"monk.mistweaver.suggestions.envelopingBreath.averageEnvBPerEnv": "",
Expand Down
2 changes: 1 addition & 1 deletion src/localization/ru/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@
"monk.mistweaver.spells.essenceFont.statistic.tooltip": "",
"monk.mistweaver.suggestions.alwaysBeCasting.downtime": "{0}% downtime",
"monk.mistweaver.suggestions.alwaysBeCasting.nonHealing": "{0}% non healing time",
"monk.mistweaver.suggestions.ancientTeachings.uptime": "",
"monk.mistweaver.suggestions.jadefireTeachings.uptime": "",
"monk.mistweaver.suggestions.chiBurst.targetsHit": "targets hit per Chi Burst cast - ",
"monk.mistweaver.suggestions.chiBurst.targetsHitPartTwo": "% of raid hit",
"monk.mistweaver.suggestions.envelopingBreath.averageEnvBPerEnv": " Enveloping Breaths per Enveloping Mist during Celestial",
Expand Down
2 changes: 1 addition & 1 deletion src/localization/zh/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@
"monk.mistweaver.spells.essenceFont.statistic.tooltip": "",
"monk.mistweaver.suggestions.alwaysBeCasting.downtime": "",
"monk.mistweaver.suggestions.alwaysBeCasting.nonHealing": "",
"monk.mistweaver.suggestions.ancientTeachings.uptime": "",
"monk.mistweaver.suggestions.jadefireTeachings.uptime": "",
"monk.mistweaver.suggestions.chiBurst.targetsHit": "",
"monk.mistweaver.suggestions.chiBurst.targetsHitPartTwo": "",
"monk.mistweaver.suggestions.envelopingBreath.averageEnvBPerEnv": "",
Expand Down

0 comments on commit 2d0ffce

Please sign in to comment.