raidboss: update shb to use player objects (#5904)

Followup to #5861.
quisquous · Nov 4, 2023 · 0df2f1e · 0df2f1e
1 parent 1466878
commit 0df2f1e
Show file tree

Hide file tree

Showing 25 changed files with 71 additions and 64 deletions.
diff --git a/ui/raidboss/data/05-shb/alliance/the_tower_at_paradigms_breach.ts b/ui/raidboss/data/05-shb/alliance/the_tower_at_paradigms_breach.ts
@@ -317,7 +317,7 @@ const triggerSet: TriggerSet<Data> = {
  if (matches.target === data.me)
  return output.stackOnYou!();
 
- return output.stackOn!({ player: data.ShortName(matches.target) });
+ return output.stackOn!({ player: data.party.member(matches.target) });
  },
  run: (data) => delete data.seedTargets,
  outputStrings: {

diff --git a/ui/raidboss/data/05-shb/dungeon/heroes_gauntlet.ts b/ui/raidboss/data/05-shb/dungeon/heroes_gauntlet.ts
@@ -138,7 +138,7 @@ const triggerSet: TriggerSet<Data> = {
  if (matches.target === data.me)
  return output.stackOnYou!();
 
- return output.stackOn!({ player: data.ShortName(matches.target) });
+ return output.stackOn!({ player: data.party.member(matches.target) });
  },
  run: (data) => delete data.anguish,
  outputStrings: {

diff --git a/ui/raidboss/data/05-shb/dungeon/holminster_switch.ts b/ui/raidboss/data/05-shb/dungeon/holminster_switch.ts
@@ -64,7 +64,9 @@ const triggerSet: TriggerSet<Data> = {
  type: 'HeadMarker',
  netRegex: { id: '005C' },
  condition: Conditions.targetIsNotYou(),
- infoText: (data, matches, output) => output.text!({ player: data.ShortName(matches.target) }),
+ infoText: (data, matches, output) => {
+ return output.text!({ player: data.party.member(matches.target) });
+ },
  outputStrings: {
  text: {
  en: 'Break chain on ${player}',

diff --git a/ui/raidboss/data/05-shb/eureka/delubrum_reginae.ts b/ui/raidboss/data/05-shb/eureka/delubrum_reginae.ts
@@ -1107,7 +1107,9 @@ const triggerSet: TriggerSet<Data> = {
  netRegex: { source: 'The Queen', id: '59C5' },
  condition: (data) => data.CanCleanse(),
  delaySeconds: 5,
- infoText: (data, matches, output) => output.text!({ player: data.ShortName(matches.target) }),
+ infoText: (data, matches, output) => {
+ return output.text!({ player: data.party.member(matches.target) });
+ },
  outputStrings: {
  text: {
  en: 'Esuna ${player}',

diff --git a/ui/raidboss/data/05-shb/eureka/delubrum_reginae_savage.ts b/ui/raidboss/data/05-shb/eureka/delubrum_reginae_savage.ts
@@ -2286,7 +2286,7 @@ const triggerSet: TriggerSet<Data> = {
  if (matches.target === data.me)
  return { alarmText: output.cleaveOnYou!() };
  if (tankBusterOnParty(data, matches))
- return { alertText: output.cleaveOn!({ player: data.ShortName(matches.target) }) };
+ return { alertText: output.cleaveOn!({ player: data.party.member(matches.target) }) };
  return { infoText: output.avoidCleave!() };
  },
  },
@@ -2449,7 +2449,8 @@ const triggerSet: TriggerSet<Data> = {
  // Each Cleansing Slash applies a cleansable Doom (38E), if damage is taken
  netRegex: { source: 'The Queen', effectId: '38E' },
  condition: (data) => data.CanCleanse(),
- infoText: (data, matches, output) => output.text!({ player: data.ShortName(matches.target) }),
+ infoText: (data, matches, output) =>
+ output.text!({ player: data.party.member(matches.target) }),
  outputStrings: {
  text: {
  en: 'Esuna ${player}',

diff --git a/ui/raidboss/data/05-shb/eureka/zadnor.ts b/ui/raidboss/data/05-shb/eureka/zadnor.ts
@@ -1056,7 +1056,7 @@ const triggerSet: TriggerSet<Data> = {
  if (data.me === matches.target)
  return output.stackOnYou!();
  if (data.sartauvoirPyrocrisis && !data.sartauvoirPyrocrisis.includes(data.me))
- return output.stackOnTarget!({ player: data.ShortName(matches.target) });
+ return output.stackOnTarget!({ player: data.party.member(matches.target) });
  },
  run: (data) => delete data.sartauvoirPyrocrisis,
  outputStrings: {

diff --git a/ui/raidboss/data/05-shb/hunts/lakeland.ts b/ui/raidboss/data/05-shb/hunts/lakeland.ts
@@ -48,7 +48,7 @@ const triggerSet: TriggerSet<Data> = {
  return { alertText: output.stackOnYou!() };
  if (data.allergen)
  return { alarmText: output.avoidStack!() };
- return { infoText: output.stackOnPlayer!({ player: data.ShortName(matches.target) }) };
+ return { infoText: output.stackOnPlayer!({ player: data.party.member(matches.target) }) };
  },
  },
  {

diff --git a/ui/raidboss/data/05-shb/map/the_shifting_oubliettes_of_lyhe_ghiah.ts b/ui/raidboss/data/05-shb/map/the_shifting_oubliettes_of_lyhe_ghiah.ts
@@ -229,7 +229,7 @@ const triggerSet: TriggerSet<Data> = {
  type: 'StartsUsing',
  netRegex: { id: '5500', source: 'Daen Ose the Avaricious' },
  alertText: (data, matches, output) => {
- return output.stackOnAndLookAway!({ player: data.ShortName(matches.target) });
+ return output.stackOnAndLookAway!({ player: data.party.member(matches.target) });
  },
  outputStrings: {
  stackOnAndLookAway: {

diff --git a/ui/raidboss/data/05-shb/raid/e10s.ts b/ui/raidboss/data/05-shb/raid/e10s.ts
@@ -644,7 +644,7 @@ const triggerSet: TriggerSet<Data> = {
  condition: (data, matches) => matches.source === data.me || matches.target === data.me,
  alertText: (data, matches, output) => {
  const partner = matches.source === data.me ? matches.target : matches.source;
- return output.text!({ player: data.ShortName(partner) });
+ return output.text!({ player: data.party.member(partner) });
  },
  outputStrings: {
  text: Outputs.farTethersWithPlayer,
@@ -657,7 +657,7 @@ const triggerSet: TriggerSet<Data> = {
  condition: (data, matches) => matches.source === data.me || matches.target === data.me,
  alertText: (data, matches, output) => {
  const partner = matches.source === data.me ? matches.target : matches.source;
- return output.text!({ player: data.ShortName(partner) });
+ return output.text!({ player: data.party.member(partner) });
  },
  outputStrings: {
  text: Outputs.closeTethersWithPlayer,

diff --git a/ui/raidboss/data/05-shb/raid/e11n.ts b/ui/raidboss/data/05-shb/raid/e11n.ts
@@ -38,7 +38,7 @@ const boundOfFaithFireTetherResponse = (data: Data, _matches: unknown, output: O
  return { alertText: output.stackOnYou!() };
  if (targets.length === 0)
  return { alertText: output.stackOnPlayer!({ player: output.unknownTarget!() }) };
- return { alertText: output.stackOnPlayer!({ player: data.ShortName(targets[0]) }) };
+ return { alertText: output.stackOnPlayer!({ player: data.party.member(targets[0]) }) };
 };
 
 const boundOfFaithLightningTetherResponse = (data: Data, _matches: unknown, output: Output) => {
@@ -67,7 +67,7 @@ const boundOfFaithLightningTetherResponse = (data: Data, _matches: unknown, outp
  if (targets.includes(data.me))
  return { alarmText: output.onYou!() };
 
- const target = targets.length === 1 ? data.ShortName(targets[0]) : output.unknownTarget!();
+ const target = targets.length === 1 ? data.party.member(targets[0]) : output.unknownTarget!();
  return { infoText: output.tetherInfo!({ player: target }) };
 };
 
@@ -84,7 +84,7 @@ const boundOfFaithHolyTetherResponse = (data: Data, _matches: unknown, output: O
  return { alarmText: output.awayFromGroup!() };
  if (targets.length === 0)
  return { infoText: output.awayFromPlayer!({ player: output.unknownTarget!() }) };
- return { infoText: output.awayFromPlayer!({ player: data.ShortName(targets[0]) }) };
+ return { infoText: output.awayFromPlayer!({ player: data.party.member(targets[0]) }) };
 };
 
 const triggerSet: TriggerSet<Data> = {

diff --git a/ui/raidboss/data/05-shb/raid/e11s.ts b/ui/raidboss/data/05-shb/raid/e11s.ts
@@ -36,7 +36,7 @@ const boundOfFaithFireTetherResponse = (data: Data, _matches: unknown, output: O
  return { alertText: output.stackOnYou!() };
  if (targets.length === 0)
  return { alertText: output.stackOnPlayer!({ player: output.unknownTarget!() }) };
- return { alertText: output.stackOnPlayer!({ player: data.ShortName(targets[0]) }) };
+ return { alertText: output.stackOnPlayer!({ player: data.party.member(targets[0]) }) };
 };
 
 const boundOfFaithLightningTetherResponse = (data: Data, _matches: unknown, output: Output) => {
@@ -65,7 +65,7 @@ const boundOfFaithLightningTetherResponse = (data: Data, _matches: unknown, outp
  if (targets.includes(data.me))
  return { alarmText: output.onYou!() };
 
- const target = targets.length === 1 ? data.ShortName(targets[0]) : output.unknownTarget!();
+ const target = targets.length === 1 ? data.party.member(targets[0]) : output.unknownTarget!();
  return { infoText: output.tetherInfo!({ player: target }) };
 };
 
@@ -82,7 +82,7 @@ const boundOfFaithHolyTetherResponse = (data: Data, _matches: unknown, output: O
  return { alarmText: output.awayFromGroup!() };
  if (targets.length === 0)
  return { infoText: output.awayFromPlayer!({ player: output.unknownTarget!() }) };
- return { infoText: output.awayFromPlayer!({ player: data.ShortName(targets[0]) }) };
+ return { infoText: output.awayFromPlayer!({ player: data.party.member(targets[0]) }) };
 };
 
 const triggerSet: TriggerSet<Data> = {
@@ -283,8 +283,8 @@ const triggerSet: TriggerSet<Data> = {
  }
 
  const tetherInfo = output.tetherInfo!({
- player1: data.ShortName(lightningTarget),
- player2: data.ShortName(fireTarget),
+ player1: data.party.member(lightningTarget),
+ player2: data.party.member(fireTarget),
  });
  const response = { infoText: tetherInfo };
  if (lightningTarget === data.me)
@@ -346,8 +346,8 @@ const triggerSet: TriggerSet<Data> = {
  }
 
  const tetherInfo = output.tetherInfo!({
- player1: data.ShortName(holyTarget),
- player2: data.ShortName(fireTarget),
+ player1: data.party.member(holyTarget),
+ player2: data.party.member(fireTarget),
  });
  const response = { infoText: tetherInfo };
  if (holyTarget === data.me)

diff --git a/ui/raidboss/data/05-shb/raid/e12n.ts b/ui/raidboss/data/05-shb/raid/e12n.ts
@@ -204,8 +204,8 @@ const triggerSet: TriggerSet<Data> = {
  infoText: (data, _matches, output) => {
  if (!data.stacks || data.stacks.length === 1)
  return;
- const names = data.stacks.map((x) => data.ShortName(x)).sort();
- return output.stacks!({ players: names.join(', ') });
+ const names = data.stacks.map((x) => data.party.member(x)).sort();
+ return output.stacks!({ players: names });
  },
  outputStrings: {
  stacks: {

diff --git a/ui/raidboss/data/05-shb/raid/e12s.ts b/ui/raidboss/data/05-shb/raid/e12s.ts
@@ -380,7 +380,7 @@ const triggerSet: TriggerSet<Data> = {
  if (data.weightTargets.includes(data.me)) {
  const partner = data.weightTargets[data.weightTargets[0] === data.me ? 1 : 0];
  return {
- alarmText: output.titanBlueWithPartner!({ player: data.ShortName(partner) }),
+ alarmText: output.titanBlueWithPartner!({ player: data.party.member(partner) }),
  };
  }
  }
@@ -1376,15 +1376,15 @@ const triggerSet: TriggerSet<Data> = {
  if (player1 !== data.me && player2 !== data.me) {
  // Call out both player names if you don't have eye
  return output.lookAwayFromPlayers!({
- player1: data.ShortName(player1),
- player2: data.ShortName(player2),
+ player1: data.party.member(player1),
+ player2: data.party.member(player2),
  });
  } else if (player1 === data.me && player2 !== undefined) {
  // Call out second player name if exists and you have eye
- return output.lookAwayFromPlayer!({ player: data.ShortName(player2) });
+ return output.lookAwayFromPlayer!({ player: data.party.member(player2) });
  } else if (player2 === data.me) {
  // Call out first player name if you have eye
- return output.lookAwayFromPlayer!({ player: data.ShortName(player1) });
+ return output.lookAwayFromPlayer!({ player: data.party.member(player1) });
  }
 
  // Return empty when only you have eye
@@ -1604,13 +1604,13 @@ const triggerSet: TriggerSet<Data> = {
  condition: (data, matches) => data.phase === 'advanced' && parseFloat(matches.duration) > 28,
  infoText: (data, matches, output) => {
  data.doubleAero ??= [];
- data.doubleAero.push(data.ShortName(matches.target));
+ data.doubleAero.push(matches.target);
 
  if (data.doubleAero.length !== 2)
  return;
 
- data.doubleAero.sort();
- return output.text!({ name1: data.doubleAero[0], name2: data.doubleAero[1] });
+ const [name1, name2] = data.doubleAero.sort().map((x) => data.party.member(x));
+ return output.text!({ name1: name1, name2: name2 });
  },
  // This will collide with 'E12S Adv Relativity Buff Collector', sorry.
  tts: null,

diff --git a/ui/raidboss/data/05-shb/raid/e4s.ts b/ui/raidboss/data/05-shb/raid/e4s.ts
@@ -362,7 +362,7 @@ const triggerSet: TriggerSet<Data> = {
  if (matches.target === data.me)
  return output.stackOnYou!();
 
- return output.stackOn!({ player: data.ShortName(matches.target) });
+ return output.stackOn!({ player: data.party.member(matches.target) });
  },
  outputStrings: {
  awayFromTanks: {

diff --git a/ui/raidboss/data/05-shb/raid/e6s.ts b/ui/raidboss/data/05-shb/raid/e6s.ts
@@ -350,9 +350,9 @@ const triggerSet: TriggerSet<Data> = {
  condition: (data, matches) => data.me === matches.target || data.me === matches.source,
  alertText: (data, matches, output) => {
  if (data.me === matches.source)
- return output.tetheredToPlayer!({ player: data.ShortName(matches.target) });
+ return output.tetheredToPlayer!({ player: data.party.member(matches.target) });
 
- return output.tetheredToPlayer!({ player: data.ShortName(matches.source) });
+ return output.tetheredToPlayer!({ player: data.party.member(matches.source) });
  },
  outputStrings: {
  tetheredToPlayer: {

diff --git a/ui/raidboss/data/05-shb/raid/e7s.ts b/ui/raidboss/data/05-shb/raid/e7s.ts
@@ -99,8 +99,8 @@ const triggerSet: TriggerSet<Data> = {
 
  if (!data.betwixtWorldsStack || data.betwixtWorldsStack.length === 1)
  return;
- const names = data.betwixtWorldsStack.map((x) => data.ShortName(x)).sort();
- return output.stackOn!({ players: names.join(', ') });
+ const names = data.betwixtWorldsStack.map((x) => data.party.member(x)).sort();
+ return output.stackOn!({ players: names });
  },
  outputStrings: {
  stackOnYou: Outputs.stackOnYou,
@@ -221,7 +221,7 @@ const triggerSet: TriggerSet<Data> = {
  if (data.me === matches.target)
  return output.stackOnYou!();
 
- return output.stackOn!({ player: data.ShortName(matches.target) });
+ return output.stackOn!({ player: data.party.member(matches.target) });
  },
  outputStrings: {
  stackOnYou: Outputs.stackOnYou,
@@ -258,8 +258,8 @@ const triggerSet: TriggerSet<Data> = {
 
  if (!data.insatiableLightStack || data.insatiableLightStack.length === 1)
  return;
- const names = data.insatiableLightStack.map((x) => data.ShortName(x)).sort();
- return output.stackPlayers!({ players: names.join(', ') });
+ const names = data.insatiableLightStack.map((x) => data.party.member(x)).sort();
+ return output.stackPlayers!({ players: names });
  },
  outputStrings: {
  stackOnYou: Outputs.stackOnYou,
@@ -364,7 +364,7 @@ const triggerSet: TriggerSet<Data> = {
  if (data.boundless.light === data.boundless.dark) {
  if (matches.target === data.me)
  return;
- return { infoText: output.text!({ player: data.ShortName(matches.target) }) };
+ return { infoText: output.text!({ player: data.party.member(matches.target) }) };
  }
 
  return Responses.stackMarkerOn();

diff --git a/ui/raidboss/data/05-shb/raid/e8s.ts b/ui/raidboss/data/05-shb/raid/e8s.ts
@@ -378,7 +378,7 @@ const triggerSet: TriggerSet<Data> = {
  return;
  if (data.akhMornTargets.includes(data.me))
  return;
- const players = data.akhMornTargets.map((x) => data.ShortName(x)).join(', ');
+ const players = data.akhMornTargets.map((x) => data.party.member(x));
  return { infoText: output.akhMornOn!({ players: players }) };
  },
  },
@@ -397,7 +397,7 @@ const triggerSet: TriggerSet<Data> = {
  if (data.me === matches.target)
  return output.mornAfahOnYou!();
 
- return output.mornAfahOn!({ player: data.ShortName(matches.target) });
+ return output.mornAfahOn!({ player: data.party.member(matches.target) });
  },
  outputStrings: {
  mornAfahOnYou: {

diff --git a/ui/raidboss/data/05-shb/raid/e9s.ts b/ui/raidboss/data/05-shb/raid/e9s.ts
@@ -186,7 +186,7 @@ const triggerSet: TriggerSet<Data> = {
  return output.tankSwap!();
 
  if (data.role === 'healer')
- return output.tankBusters!({ player: data.ShortName(matches.target) });
+ return output.tankBusters!({ player: data.party.member(matches.target) });
  },
  infoText: (data, _matches, output) => {
  if (data.role !== 'tank' && data.role !== 'healer')

diff --git a/ui/raidboss/data/05-shb/trial/hades-ex.ts b/ui/raidboss/data/05-shb/trial/hades-ex.ts
@@ -446,9 +446,9 @@ const triggerSet: TriggerSet<Data> = {
  return output.tankBusterOnYou!();
 
  if (data.role === 'healer')
- return output.busterOn!({ player: data.ShortName(matches.target) });
+ return output.busterOn!({ player: data.party.member(matches.target) });
 
- return output.awayFromPlayer!({ player: data.ShortName(matches.target) });
+ return output.awayFromPlayer!({ player: data.party.member(matches.target) });
  },
  outputStrings: {
  tankBusterOnYou: Outputs.tankBusterOnYou,

diff --git a/ui/raidboss/data/05-shb/trial/hades.ts b/ui/raidboss/data/05-shb/trial/hades.ts
@@ -31,12 +31,12 @@ const triggerSet: TriggerSet<Data> = {
  return output.tankBusterOnYou!();
 
  if (data.role === 'healer')
- return output.busterOn!({ player: data.ShortName(matches.target) });
+ return output.busterOn!({ player: data.party.member(matches.target) });
  },
  infoText: (data, matches, output) => {
  if (matches.target === data.me)
  return;
- return output.awayFromPlayer!({ player: data.ShortName(matches.target) });
+ return output.awayFromPlayer!({ player: data.party.member(matches.target) });
  },
  outputStrings: {
  awayFromPlayer: {
@@ -296,7 +296,7 @@ const triggerSet: TriggerSet<Data> = {
  if (!data.ancient || data.ancient[data.me] === undefined)
  return;
  const name = Object.keys(data.ancient).find((key) => data.ancient?.[key] === '003E');
- return output.text!({ player: data.ShortName(name) });
+ return output.text!({ player: data.party.member(name) });
  },
  outputStrings: {
  text: Outputs.stackOnPlayer,

diff --git a/ui/raidboss/data/05-shb/trial/shiva-un.ts b/ui/raidboss/data/05-shb/trial/shiva-un.ts
@@ -267,7 +267,8 @@ const triggerSet: TriggerSet<Data> = {
  type: 'Ability',
  netRegex: { id: '537A' },
  condition: Conditions.targetIsNotYou(),
- infoText: (data, matches, output) => output.text!({ player: data.ShortName(matches.target) }),
+ infoText: (data, matches, output) =>
+ output.text!({ player: data.party.member(matches.target) }),
  outputStrings: {
  text: {
  en: 'Free ${player}',

diff --git a/ui/raidboss/data/05-shb/trial/titania-ex.ts b/ui/raidboss/data/05-shb/trial/titania-ex.ts
@@ -273,7 +273,7 @@ const triggerSet: TriggerSet<Data> = {
  if (data.bomb && data.bomb[data.me])
  return;
 
- return output.stackOn!({ player: data.ShortName(matches.target) });
+ return output.stackOn!({ player: data.party.member(matches.target) });
  },
  outputStrings: {
  stackOnYou: Outputs.stackOnYou,

diff --git a/ui/raidboss/data/05-shb/trial/varis-ex.ts b/ui/raidboss/data/05-shb/trial/varis-ex.ts
@@ -144,7 +144,7 @@ const triggerSet: TriggerSet<Data> = {
  if (data.role === 'dps' && data.job !== 'BLU')
  return output.avoidTankCleave!();
 
- return output.tankBusterOn!({ player: data.ShortName(target) });
+ return output.tankBusterOn!({ player: data.party.member(target) });
  },
  outputStrings: {
  tankBusterOnYou: Outputs.tankBusterOnYou,

diff --git a/ui/raidboss/data/05-shb/trial/wol-ex.ts b/ui/raidboss/data/05-shb/trial/wol-ex.ts
@@ -567,7 +567,7 @@ const triggerSet: TriggerSet<Data> = {
  if (matches.target === data.me)
  return output.stackOnYou?.();
  if (!data.deluge)
- return output.stackOnTarget?.({ player: data.ShortName(matches.target) });
+ return output.stackOnTarget?.({ player: data.party.member(matches.target) });
  },
  outputStrings: {
  stackOnYou: Outputs.stackOnYou,