jobs: 6.4 update (#5406)

Atonement no longer interrupt combo.
quisquous · May 23, 2023 · 0a1589a · 0a1589a
1 parent bb262c1
commit 0a1589a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/ui/jobs/combo_tracker.ts b/ui/jobs/combo_tracker.ts
@@ -3,8 +3,8 @@ import { EventEmitter } from 'eventemitter3';
 import {
   kComboActions,
   kComboBreakers,
-  kComboBreakers610,
   kComboBreakers620,
+  kComboBreakers630,
   kComboDelay,
 } from './constants';
 import { FfxivVersion } from './jobs';
@@ -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;
 

diff --git a/ui/jobs/constants.ts b/ui/jobs/constants.ts
@@ -469,7 +469,6 @@ export const kComboBreakers = [
   kAbility.TotalEclipse,
   kAbility.Prominence,
   kAbility.ShieldBash,
-  kAbility.Atonement,
   // WAR
   kAbility.HeavySwing,
   kAbility.Maim,
@@ -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]

diff --git a/ui/jobs/jobs.ts b/ui/jobs/jobs.ts
@@ -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,
   };