Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jobs: 6.4 update #5406

Merged
merged 3 commits into from
May 23, 2023
Merged

jobs: 6.4 update #5406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c558ed0
6.4 update: Atonement no longer interrupt combo
Echoring May 23, 2023
163aa2d
revert buff tracker
Echoring May 23, 2023
f6a385e
remove empty line
Echoring May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ui/jobs/combo_tracker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { EventEmitter } from 'eventemitter3';
import {
kComboActions,
kComboBreakers,
kComboBreakers610,
kComboBreakers620,
kComboBreakers630,
kComboDelay,
} from './constants';
import { FfxivVersion } from './jobs';
Expand Down Expand Up @@ -115,10 +115,10 @@ export class ComboTracker extends EventEmitter<{ combo: ComboCallback }> {

static setup(ffxivVersion: FfxivVersion, player: Player): ComboTracker {
let breakers;
if (ffxivVersion < 620)
breakers = kComboBreakers610;
else if (ffxivVersion < 630)
if (ffxivVersion < 630)
breakers = kComboBreakers620;
else if (ffxivVersion < 640)
breakers = kComboBreakers630;
else
breakers = kComboBreakers;

Expand Down
12 changes: 6 additions & 6 deletions ui/jobs/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,6 @@ export const kComboBreakers = [
kAbility.TotalEclipse,
kAbility.Prominence,
kAbility.ShieldBash,
kAbility.Atonement,
// WAR
kAbility.HeavySwing,
kAbility.Maim,
Expand Down Expand Up @@ -539,14 +538,15 @@ export const kComboBreakers = [
kAbility.Bladeshower,
];

export const kComboBreakers620 = [
export const kComboBreakers630 = [
...kComboBreakers,
kAbility.GoringBlade,
kAbility.Confiteor,
kAbility.Atonement,
];

export const kComboBreakers610 = [
...kComboBreakers,
export const kComboBreakers620 = [
...kComboBreakers630,
kAbility.GoringBlade,
kAbility.Confiteor,
];

// [level][Sub][Div]
Expand Down
8 changes: 4 additions & 4 deletions ui/jobs/jobs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ UserConfig.getUserConfigLocation('jobs', defaultOptions, () => {
// (Battle system changes will be merged in major update for CN/KO)
// (e.g. intl 6.38 job changes are merged in cn patch 6.3)
const ffxivlanguageToVersion: Record<Lang, FfxivVersion> = {
'en': 638,
'de': 638,
'fr': 638,
'ja': 638,
'en': 640,
'de': 640,
'fr': 640,
'ja': 640,
'cn': 630,
'ko': 625,
};
Expand Down