raidboss: adjust callouts for BLU (#5692)

Prep for 6.45 BLU update.
quisquous · Jul 14, 2023 · 376aee1 · 376aee1
1 parent d187ccd
commit 376aee1
Show file tree

Hide file tree

Showing 31 changed files with 83 additions and 79 deletions.
diff --git a/ui/raidboss/data/02-arr/trial/ultima-ex.ts b/ui/raidboss/data/02-arr/trial/ultima-ex.ts
@@ -69,7 +69,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'Ultima EX Viscous Aetheroplasm',
  type: 'GainsEffect',
  netRegex: { effectId: '171', count: '04', capture: false },
- condition: (data) => data.role === 'tank',
+ condition: (data) => data.role === 'tank' || data.job === 'BLU',
  alertText: (_data, _matches, output) => output.text!(),
  outputStrings: {
  text: Outputs.tankSwap,

diff --git a/ui/raidboss/data/03-hw/alliance/weeping_city.ts b/ui/raidboss/data/03-hw/alliance/weeping_city.ts
@@ -196,7 +196,7 @@ const triggerSet: TriggerSet<Data> = {
  type: 'StartsUsing',
  netRegex: { id: '17CB', source: 'Forgall', capture: false },
  // Hell Wind sets HP to single digits, so mitigations don't work. Don't notify non-healers.
- condition: (data) => data.role === 'healer',
+ condition: (data) => data.role === 'healer' || data.job === 'BLU',
  response: Responses.aoe(),
  },
  {
@@ -298,7 +298,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'Weeping City Flare Star Orbs',
  type: 'AddedCombatant',
  netRegex: { npcBaseId: '4889', capture: false },
- condition: (data) => data.role === 'tank' || data.role === 'healer',
+ condition: (data) => data.role === 'tank' || data.role === 'healer' || data.job === 'BLU',
  infoText: (_data, _matches, output) => output.text!(),
  outputStrings: {
  text: {

diff --git a/ui/raidboss/data/03-hw/dungeon/the_lost_city_of_amdapor_hard.ts b/ui/raidboss/data/03-hw/dungeon/the_lost_city_of_amdapor_hard.ts
@@ -198,6 +198,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'LostCityHard Winged Lion Ancient Holy',
  type: 'Ability',
  netRegex: { id: '15CA', source: 'Winged Lion', capture: false },
+ suppressSeconds: 1,
  alertText: (_data, _matches, output) => output.text!(),
  outputStrings: {
  text: {
@@ -227,7 +228,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'LostCityHard Kuribu Regen',
  type: 'StartsUsing',
  netRegex: { id: '15DC', source: 'Kuribu', capture: false },
- condition: (data) => data.role === 'tank',
+ condition: (data) => data.role === 'tank' || data.job === 'BLU',
  infoText: (_data, _matches, output) => output.text!(),
  outputStrings: {
  text: {
@@ -243,7 +244,6 @@ const triggerSet: TriggerSet<Data> = {
  id: 'LostCityHard Kuribu Cure IV',
  type: 'StartsUsing',
  netRegex: { id: '15DF', source: 'Kuribu', capture: false },
- condition: (data) => data.role === 'tank',
  alertText: (_data, _matches, output) => output.text!(),
  outputStrings: {
  text: {
@@ -255,6 +255,12 @@ const triggerSet: TriggerSet<Data> = {
  },
  },
  },
+ {
+ id: 'LostCityHard Kuribu Cure IV Reverse',
+ type: 'StartsUsing',
+ netRegex: { id: '15E0', source: 'Kuribu', capture: false },
+ response: Responses.aoe(),
+ },
  {
  id: 'LostCityHard Kuribu Cure III',
  type: 'HeadMarker',

diff --git a/ui/raidboss/data/03-hw/dungeon/the_vault.ts b/ui/raidboss/data/03-hw/dungeon/the_vault.ts
@@ -47,7 +47,6 @@ const triggerSet: TriggerSet<Data> = {
  id: 'The Vault Altar Candle',
  regex: /Altar Candle/,
  beforeSeconds: 5,
- condition: (data) => data.role !== 'dps',
  response: Responses.tankBuster(),
  },
  ],

diff --git a/ui/raidboss/data/03-hw/dungeon/the_vault61.ts b/ui/raidboss/data/03-hw/dungeon/the_vault61.ts
@@ -47,7 +47,6 @@ const triggerSet: TriggerSet<Data> = {
  id: 'TheVault61 Altar Candle',
  regex: /Altar Candle/,
  beforeSeconds: 5,
- condition: (data) => data.role !== 'dps',
  response: Responses.tankBuster(),
  },
  ],

diff --git a/ui/raidboss/data/03-hw/raid/a6n.ts b/ui/raidboss/data/03-hw/raid/a6n.ts
@@ -22,14 +22,14 @@ const triggerSet: TriggerSet<Data> = {
  id: 'A6N Brute Force',
  regex: /Brute Force/,
  beforeSeconds: 4,
- condition: (data) => data.role === 'tank' || data.role === 'healer',
+ condition: (data) => data.role === 'tank' || data.role === 'healer' || data.job === 'BLU',
  response: Responses.miniBuster(),
  },
  {
  id: 'A6N Magicked Mark',
  regex: /Magicked Mark/,
  beforeSeconds: 4,
- condition: (data) => data.role === 'tank' || data.role === 'healer',
+ condition: (data) => data.role === 'tank' || data.role === 'healer' || data.job === 'BLU',
  response: Responses.miniBuster(),
  },
  ],

diff --git a/ui/raidboss/data/04-sb/alliance/orbonne_monastery.ts b/ui/raidboss/data/04-sb/alliance/orbonne_monastery.ts
@@ -373,7 +373,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'Orbonne Cid Cleansing Strike',
  type: 'Ability',
  netRegex: { id: '3751', source: 'The Thunder God', capture: false },
- condition: (data) => data.role === 'healer',
+ condition: (data) => data.role === 'healer' || data.job === 'BLU',
  suppressSeconds: 10,
  alertText: (_data, _matches, output) => output.text!(),
  outputStrings: {
@@ -599,7 +599,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'Orbonne Ultima Ultimate Illusion Healer',
  type: 'StartsUsing',
  netRegex: { id: '3895', source: 'Ultima, The High Seraph', capture: false },
- condition: (data) => data.role === 'healer',
+ condition: (data) => data.role === 'healer' || data.job === 'BLU',
  alertText: (_data, _matches, output) => output.text!(),
  outputStrings: {
  text: {

diff --git a/ui/raidboss/data/04-sb/dungeon/temple_of_the_fist.ts b/ui/raidboss/data/04-sb/dungeon/temple_of_the_fist.ts
@@ -115,7 +115,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'Temple Touch Of Slaughter',
  type: 'StartsUsing',
  netRegex: { id: '1FE6', source: 'Ivon Coeurlfist' },
- condition: (data) => data.role === 'healer',
+ condition: (data) => data.role === 'healer' || data.job === 'BLU',
  infoText: (data, matches, output) => output.text!({ player: data.ShortName(matches.target) }),
  outputStrings: {
  text: {

diff --git a/ui/raidboss/data/04-sb/raid/o11n.ts b/ui/raidboss/data/04-sb/raid/o11n.ts
@@ -18,7 +18,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'O11N Blaster',
  regex: /Blaster/,
  beforeSeconds: 3,
- condition: (data) => data.role === 'tank',
+ condition: (data) => data.role === 'tank' || data.job === 'BLU',
  infoText: (_data, _matches, output) => output.text!(),
  outputStrings: {
  text: {

diff --git a/ui/raidboss/data/04-sb/raid/o12n.ts b/ui/raidboss/data/04-sb/raid/o12n.ts
@@ -63,7 +63,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'O12N Local Resonance',
  type: 'GainsEffect',
  netRegex: { target: 'Omega', effectId: '67E', capture: false },
- condition: (data) => data.role === 'tank',
+ condition: (data) => data.role === 'tank' || data.job === 'BLU',
  alertText: (_data, _matches, output) => output.text!(),
  outputStrings: {
  text: {

diff --git a/ui/raidboss/data/04-sb/raid/o1n.ts b/ui/raidboss/data/04-sb/raid/o1n.ts
@@ -64,7 +64,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'O1N Charybdis',
  type: 'StartsUsing',
  netRegex: { id: '23DB', source: 'Alte Roite', capture: false },
- condition: (data) => data.role === 'healer',
+ condition: (data) => data.role === 'healer' || data.job === 'BLU',
  // Alert rather than info, as any further raid damage is lethal if unhealed.
  response: Responses.aoe('alert'),
  },

diff --git a/ui/raidboss/data/04-sb/raid/o9n.ts b/ui/raidboss/data/04-sb/raid/o9n.ts
@@ -25,7 +25,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'O9N Orbs Fiend',
  type: 'StartsUsing',
  netRegex: { id: '315C', source: 'Chaos', capture: false },
- condition: (data) => data.role === 'tank',
+ condition: (data) => data.role === 'tank' || data.job === 'BLU',
  alarmText: (_data, _matches, output) => output.text!(),
  outputStrings: {
  text: {

diff --git a/ui/raidboss/data/04-sb/raid/o9s.ts b/ui/raidboss/data/04-sb/raid/o9s.ts
@@ -104,7 +104,7 @@ const triggerSet: TriggerSet<Data> = {
  return output.orbTethers!();
  },
  infoText: (data, _matches, output) => {
- if (data.role === 'healer')
+ if (data.role === 'healer' || data.job === 'BLU')
  return output.orbTethers!();
  },
  outputStrings: {
@@ -390,7 +390,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'O9S Accretion',
  type: 'GainsEffect',
  netRegex: { effectId: '644', capture: false },
- condition: (data) => data.role === 'healer',
+ condition: (data) => data.role === 'healer' || data.job === 'BLU',
  suppressSeconds: 10,
  infoText: (data, _matches, output) => {
  if (data.phaseType !== 'earth')

diff --git a/ui/raidboss/data/04-sb/trial/byakko-ex.ts b/ui/raidboss/data/04-sb/trial/byakko-ex.ts
@@ -108,7 +108,7 @@ const triggerSet: TriggerSet<Data> = {
  if (data.roarCount !== 2)
  return;
 
- if (data.role === 'tank')
+ if (data.role === 'tank' || data.job === 'BLU')
  return output.text!();
  },
  outputStrings: {
@@ -198,7 +198,7 @@ const triggerSet: TriggerSet<Data> = {
  code: Util.gameLogCodes.dialog,
  capture: false,
  },
- condition: (data) => data.role === 'tank',
+ condition: (data) => data.role === 'tank' || data.job === 'BLU',
  infoText: (_data, _matches, output) => output.text!(),
  outputStrings: {
  text: {

diff --git a/ui/raidboss/data/04-sb/trial/seiryu-ex.ts b/ui/raidboss/data/04-sb/trial/seiryu-ex.ts
@@ -53,7 +53,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'SeiryuEx Tether',
  regex: /Kanabo/,
  beforeSeconds: 7,
- condition: (data) => data.role === 'tank',
+ condition: (data) => data.role === 'tank' || data.job === 'BLU',
  alertText: (_data, _matches, output) => output.text!(),
  outputStrings: {
  text: {

diff --git a/ui/raidboss/data/05-shb/hunts/the_raktika_greatwood.ts b/ui/raidboss/data/05-shb/hunts/the_raktika_greatwood.ts
@@ -89,7 +89,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'Hunt Ixtab Cryptcall',
  type: 'Ability',
  netRegex: { id: '45B7', source: 'Ixtab', capture: false },
- condition: (data) => data.inCombat && data.role === 'healer',
+ condition: (data) => data.inCombat && (data.role === 'healer' || data.job === 'BLU'),
  suppressSeconds: 1,
  alertText: (_data, _matches, output) => output.text!(),
  outputStrings: {

diff --git a/ui/raidboss/data/05-shb/raid/e12s.ts b/ui/raidboss/data/05-shb/raid/e12s.ts
@@ -1063,25 +1063,25 @@ const triggerSet: TriggerSet<Data> = {
  netRegex: { source: 'Oracle Of Darkness', id: ['58BE', '58BD'], capture: false },
  infoText: (data, _matches, output) => {
  if (data.role === 'tank')
- return output.tankBait!();
- return output.partyUnder!();
+ return output.tanksOutPartyIn!();
+ return output.partyInTanksOut!();
  },
  outputStrings: {
- tankBait: {
- en: 'Bait Far',
- de: 'Ködern - Weit weg',
- fr: 'Attirez au loin',
- ja: '遠くに誘導',
- cn: '远诱导',
- ko: '멀리 유도하기',
+ partyInTanksOut: {
+ en: 'Party In (Tanks Out)',
+ de: 'Gruppe Rein (Tanks Raus)',
+ fr: 'Équipe à l\'intérieur (Tanks à l\'extérieur)',
+ ja: 'ボスの足元へ (タンクは離れる)',
+ cn: '小队进 (T出)',
+ ko: '본대 안 (탱커 밖)',
  },
- partyUnder: {
- en: 'Get Under',
- de: 'Unter ihn',
- fr: 'En dessous',
- ja: 'ボスと貼り付く',
- cn: '去脚下',
- ko: '보스 안쪽으로',
+ tanksOutPartyIn: {
+ en: 'Tanks Out (Party In)',
+ de: 'Tanks Raus (Gruppe Rein)',
+ fr: 'Tanks à l\'extérieur (Équipe à l\'intérieur',
+ ja: 'ボスからはなれる (パーティーが内側)',
+ cn: 'T出 (小队进)',
+ ko: '탱커 밖 (본대 안)',
  },
  },
  },
@@ -1093,25 +1093,25 @@ const triggerSet: TriggerSet<Data> = {
  suppressSeconds: 5,
  infoText: (data, _matches, output) => {
  if (data.role === 'tank')
- return output.tankBait!();
- return output.partyOut!();
+ return output.tanksInPartyOut!();
+ return output.partyOutTanksIn!();
  },
  outputStrings: {
- tankBait: {
- en: 'Bait Close',
- de: 'Köder nah',
- fr: 'Attirez proche',
- ja: '近い誘導',
- cn: '近诱导',
- ko: '가까이 붙기',
+ partyOutTanksIn: {
+ en: 'Party Out (Tanks In)',
+ de: 'Gruppe Raus (Tanks Rein)',
+ fr: 'Équipe à l\'extérieur (Tanks à l\'intérieur)',
+ ja: 'ボスから離れる (タンクが内側)',
+ cn: '小队出 (T进)',
+ ko: '본대 밖 (탱커 안)',
  },
- partyOut: {
- en: 'Party Out',
- de: 'Gruppe raus',
- fr: 'Groupe au loin',
- ja: '全員離れる',
- cn: '不要靠近BOSS',
- ko: '탱보다 멀리 있기',
+ tanksInPartyOut: {
+ en: 'Tanks In (Party Out)',
+ de: 'Gruppe Rein (Tanks Raus)',
+ fr: 'Tanks à l\'intérieur (Équipe à l\'extérieur',
+ ja: 'ボスに足元へ (パーティーは離れる)',
+ cn: 'T进 (小队出)',
+ ko: '탱커 안 (본대 밖)',
  },
  },
  },

diff --git a/ui/raidboss/data/05-shb/raid/e8s.ts b/ui/raidboss/data/05-shb/raid/e8s.ts
@@ -187,7 +187,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'E8S Forgetful Tank Second Frost',
  type: 'StartsUsing',
  netRegex: { source: 'Shiva', id: '4D6[67]', capture: false },
- condition: (data) => data.role === 'tank',
+ condition: (data) => data.role === 'tank' || data.job === 'BLU',
  delaySeconds: 43,
  suppressSeconds: 80,
  infoText: (data, _matches, output) => {
@@ -592,7 +592,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'E8S Banish',
  type: 'StartsUsing',
  netRegex: { source: 'Shiva', id: '4D7E', capture: false },
- condition: (data) => data.role === 'tank',
+ condition: (data) => data.role === 'tank' || data.job === 'BLU',
  alertText: (_data, _matches, output) => output.text!(),
  outputStrings: {
  text: {
@@ -609,7 +609,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'E8S Banish Divided',
  type: 'StartsUsing',
  netRegex: { source: 'Shiva', id: '4D7F', capture: false },
- condition: (data) => data.role === 'tank',
+ condition: (data) => data.role === 'tank' || data.job === 'BLU',
  alertText: (_data, _matches, output) => output.text!(),
  outputStrings: {
  text: {

diff --git a/ui/raidboss/data/05-shb/trial/hades-ex.ts b/ui/raidboss/data/05-shb/trial/hades-ex.ts
@@ -28,7 +28,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'HadesEx Comet',
  regex: /Comet 1/,
  beforeSeconds: 5,
- condition: (data) => data.role === 'tank',
+ condition: (data) => data.role === 'tank' || data.job === 'BLU',
  infoText: (_data, _matches, output) => output.text!(),
  outputStrings: {
  text: {
@@ -242,7 +242,7 @@ const triggerSet: TriggerSet<Data> = {
  target: ['Igeyorhm\'s Shade', 'Lahabrea\'s Shade'],
  capture: false,
  },
- condition: (data) => data.role === 'tank',
+ condition: (data) => data.role === 'tank' || data.job === 'BLU',
  suppressSeconds: 10,
  alarmText: (_data, _matches, output) => output.text!(),
  outputStrings: {
@@ -260,7 +260,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'HadesEx Spheres',
  type: 'StartsUsing',
  netRegex: { id: '47BD', source: 'Igeyorhm\'s Shade', capture: false },
- condition: (data) => data.role === 'tank',
+ condition: (data) => data.role === 'tank' || data.job === 'BLU',
  infoText: (data, _matches, output) => {
  if (!data.sphereCount)
  return;
@@ -354,7 +354,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'HadesEx Doom',
  type: 'GainsEffect',
  netRegex: { effectId: '6E9', capture: false },
- condition: (data) => data.role === 'healer',
+ condition: (data) => data.role === 'healer' || data.job === 'BLU',
  suppressSeconds: 5,
  alertText: (_data, _matches, output) => output.text!(),
  outputStrings: {
@@ -653,10 +653,10 @@ const triggerSet: TriggerSet<Data> = {
  id: 'HadesEx Quadrastrike 2',
  type: 'StartsUsing',
  netRegex: { id: '47F6', source: 'Hades', capture: false },
- condition: (data) => data.role === 'tank' || data.role === 'healer',
+ condition: (data) => data.role === 'tank' || data.role === 'healer' || data.job === 'BLU',
  suppressSeconds: 2,
  alarmText: (data, _matches, output) => {
- if (data.role === 'tank')
+ if (data.role === 'tank' || data.job === 'BLU')
  return output.getTowers!();
  },
  infoText: (data, _matches, output) => {

diff --git a/ui/raidboss/data/05-shb/trial/innocence-ex.ts b/ui/raidboss/data/05-shb/trial/innocence-ex.ts
@@ -185,7 +185,7 @@ const triggerSet: TriggerSet<Data> = {
  id: 'InnoEx Adds',
  type: 'Ability',
  netRegex: { id: '42B0', source: 'Innocence', capture: false },
- condition: (data) => data.role === 'tank',
+ condition: (data) => data.role === 'tank' || data.job === 'BLU',
  infoText: (_data, _matches, output) => output.text!(),
  outputStrings: {
  text: {