raidboss: update sb to use player objects

Followup to #5861.
quisquous · Nov 4, 2023 · 7ffe726 · 7ffe726
1 parent c5832a8
commit 7ffe726
Show file tree

Hide file tree

Showing 22 changed files with 49 additions and 50 deletions.
diff --git a/ui/raidboss/data/03-hw/dungeon/baelsars_wall.ts b/ui/raidboss/data/03-hw/dungeon/baelsars_wall.ts
@@ -88,7 +88,7 @@ const triggerSet: TriggerSet<Data> = {
       netRegex: { id: '1CC8', source: 'The Griffin' },
       condition: Conditions.targetIsNotYou(),
       alertText: (data, matches, output) =>
-        output.text!({ player: data.ShortName(matches.target) }),
+        output.text!({ player: data.party.member(matches.target) }),
       outputStrings: {
         text: {
           en: 'Break chain on ${player}',

diff --git a/ui/raidboss/data/03-hw/dungeon/baelsars_wall62.ts b/ui/raidboss/data/03-hw/dungeon/baelsars_wall62.ts
@@ -88,7 +88,7 @@ const triggerSet: TriggerSet<Data> = {
       netRegex: { id: '1CC8', source: 'The Griffin' },
       condition: Conditions.targetIsNotYou(),
       alertText: (data, matches, output) =>
-        output.text!({ player: data.ShortName(matches.target) }),
+        output.text!({ player: data.party.member(matches.target) }),
       outputStrings: {
         text: {
           en: 'Break chain on ${player}',

diff --git a/ui/raidboss/data/03-hw/raid/a4s.ts b/ui/raidboss/data/03-hw/raid/a4s.ts
@@ -30,7 +30,7 @@ const triggerSet: TriggerSet<Data> = {
       },
       infoText: (data, matches, output) => {
         if (data.me === matches.target)
-          return output.orbsOn!({ player: data.ShortName(matches.target) });
+          return output.orbsOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         orbsOn: {

diff --git a/ui/raidboss/data/03-hw/trial/sophia-ex.ts b/ui/raidboss/data/03-hw/trial/sophia-ex.ts
@@ -211,7 +211,7 @@ const triggerSet: TriggerSet<Data> = {
         if (data.me === matches.target)
           return output.infusionOnYou!();
 
-        return output.infusionOn!({ player: data.ShortName(matches.target) });
+        return output.infusionOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         infusionOnYou: {

diff --git a/ui/raidboss/data/03-hw/trial/zurvan-ex.ts b/ui/raidboss/data/03-hw/trial/zurvan-ex.ts
@@ -46,7 +46,7 @@ const triggerSet: TriggerSet<Data> = {
       },
       alertText: (data, matches, output) => {
         if (!(data.me === matches.target))
-          return output.avoidWaveCannon!({ target: data.ShortName(matches.target) });
+          return output.avoidWaveCannon!({ target: data.party.member(matches.target) });
       },
       outputStrings: {
         waveCannonTarget: {
@@ -76,7 +76,7 @@ const triggerSet: TriggerSet<Data> = {
           return;
         if (data.waveTarget === undefined)
           return output.unknownStackTarget!();
-        return output.stackOn!({ player: data.ShortName(data.waveTarget) });
+        return output.stackOn!({ player: data.party.member(data.waveTarget) });
       },
       outputStrings: {
         unknownStackTarget: Outputs.stackMarker,
@@ -126,7 +126,7 @@ const triggerSet: TriggerSet<Data> = {
           return;
         if (matches.target === data.me)
           return output.stackYou!();
-        return output.stackOn!({ player: data.ShortName(matches.target) });
+        return output.stackOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         stackYou: Outputs.stackOnYou,
@@ -234,7 +234,7 @@ const triggerSet: TriggerSet<Data> = {
         data.tetherBuddy ??= buddy;
       },
       alertText: (data, _matches, output) => {
-        return output.tetherBuddy!({ buddy: data.ShortName(data.tetherBuddy) });
+        return output.tetherBuddy!({ buddy: data.party.member(data.tetherBuddy) });
       },
       outputStrings: {
         tetherBuddy: {
@@ -301,7 +301,7 @@ const triggerSet: TriggerSet<Data> = {
         if (data.infiniteElement === 'ice')
           element = output.ice!();
         const buddy = data.tetherBuddy;
-        return output.sealTowers!({ element: element, buddy: data.ShortName(buddy) });
+        return output.sealTowers!({ element: element, buddy: data.party.member(buddy) });
       },
       outputStrings: {
         sealTowers: {

diff --git a/ui/raidboss/data/04-sb/dungeon/fractal_continuum_hard.ts b/ui/raidboss/data/04-sb/dungeon/fractal_continuum_hard.ts
@@ -197,7 +197,7 @@ const triggerSet: TriggerSet<Data> = {
         const partner = data.dischord?.[partnerId];
         if (partner === undefined)
           return;
-        return output.text!({ player: data.ShortName(partner) });
+        return output.text!({ player: data.party.member(partner) });
       },
       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
@@ -116,7 +116,8 @@ const triggerSet: TriggerSet<Data> = {
       type: 'StartsUsing',
       netRegex: { id: '1FE6', source: 'Ivon Coeurlfist' },
       condition: (data) => data.role === 'healer' || data.job === 'BLU',
-      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: 'Heal ${player} soon',

diff --git a/ui/raidboss/data/04-sb/raid/o10s.ts b/ui/raidboss/data/04-sb/raid/o10s.ts
@@ -37,7 +37,7 @@ const triggerSet: TriggerSet<Data> = {
       },
       infoText: (data, matches, output) => {
         if (data.me !== matches.target)
-          return output.fireOn!({ player: data.ShortName(matches.target) });
+          return output.fireOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         fireOnYou: {

diff --git a/ui/raidboss/data/04-sb/raid/o12n.ts b/ui/raidboss/data/04-sb/raid/o12n.ts
@@ -130,7 +130,7 @@ const triggerSet: TriggerSet<Data> = {
         // since it's stack, but also get away from Ground Zero purple marker.
         if (data.me === matches.target)
           return output.stackOnYou!();
-        return output.stackOnPlayer!({ player: data.ShortName(matches.target) });
+        return output.stackOnPlayer!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         stackOnYou: Outputs.stackOnYou,

diff --git a/ui/raidboss/data/04-sb/raid/o12s.ts b/ui/raidboss/data/04-sb/raid/o12s.ts
@@ -544,7 +544,7 @@ const triggerSet: TriggerSet<Data> = {
           return;
         if (data.role !== 'tank' && data.job !== 'BLU')
           return;
-        return output.vulnOn!({ player: data.ShortName(matches.target) });
+        return output.vulnOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         vulnOn: {
@@ -685,7 +685,7 @@ const triggerSet: TriggerSet<Data> = {
           // might need an extra shield.  However, common blu strats have
           // folks diamondback this, so it's just noise.
           if (data.job !== 'BLU')
-            return output.shortStackOn!({ player: data.ShortName(matches.target) });
+            return output.shortStackOn!({ player: data.party.member(matches.target) });
         }
         return;
       },
@@ -800,7 +800,7 @@ const triggerSet: TriggerSet<Data> = {
         for (const player in data.archiveMarkers) {
           if (data.archiveMarkers[player] !== '003E')
             continue;
-          return output.text!({ player: data.ShortName(player) });
+          return output.text!({ player: data.party.member(player) });
         }
       },
       outputStrings: {

diff --git a/ui/raidboss/data/04-sb/raid/o2n.ts b/ui/raidboss/data/04-sb/raid/o2n.ts
@@ -46,7 +46,7 @@ const triggerSet: TriggerSet<Data> = {
         if (data.me === matches.target)
           return output.stackMarkerOnYou!();
 
-        return output.stackOn!({ player: data.ShortName(matches.target) });
+        return output.stackOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         stackMarkerOnYou: {

diff --git a/ui/raidboss/data/04-sb/raid/o3s.ts b/ui/raidboss/data/04-sb/raid/o3s.ts
@@ -126,9 +126,9 @@ const triggerSet: TriggerSet<Data> = {
         } else {
           if (data.holyTargets.includes(data.me)) {
             ret.alertText = output.spread!();
-            ret.infoText = output.othersStackOnHoly!({ player: data.ShortName(stackTarget) });
+            ret.infoText = output.othersStackOnHoly!({ player: data.party.member(stackTarget) });
           } else {
-            ret.infoText = output.stackOnHoly!({ player: data.ShortName(stackTarget) });
+            ret.infoText = output.stackOnHoly!({ player: data.party.member(stackTarget) });
           }
         }
         return ret;
@@ -408,9 +408,9 @@ const triggerSet: TriggerSet<Data> = {
       netRegex: { id: '0012' },
       infoText: (data, matches, output) => {
         if (data.me === matches.target)
-          return output.breakTether!({ player: data.ShortName(matches.source) });
+          return output.breakTether!({ player: data.party.member(matches.source) });
         else if (data.me === matches.source)
-          return output.breakTether!({ player: data.ShortName(matches.target) });
+          return output.breakTether!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         breakTether: {

diff --git a/ui/raidboss/data/04-sb/raid/o7s.ts b/ui/raidboss/data/04-sb/raid/o7s.ts
@@ -115,7 +115,7 @@ const triggerSet: TriggerSet<Data> = {
       infoText: (data, matches, output) => {
         if (data.me === matches.target)
           return;
-        return output.blueMarkerOn!({ player: data.ShortName(matches.target) });
+        return output.blueMarkerOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         blueMarkerOn: {
@@ -175,7 +175,7 @@ const triggerSet: TriggerSet<Data> = {
         if (data.me === matches.target)
           return output.rotOnYou!();
 
-        return output.rotOn!({ player: data.ShortName(matches.target) });
+        return output.rotOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         rotOnYou: {

diff --git a/ui/raidboss/data/04-sb/raid/o8s.ts b/ui/raidboss/data/04-sb/raid/o8s.ts
@@ -276,7 +276,7 @@ const triggerSet: TriggerSet<Data> = {
         if (matches.target === data.me)
           return;
 
-        return output.embraceOn!({ player: data.ShortName(matches.target) });
+        return output.embraceOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         embraceOn: {

diff --git a/ui/raidboss/data/04-sb/trial/seiryu.ts b/ui/raidboss/data/04-sb/trial/seiryu.ts
@@ -91,7 +91,7 @@ const triggerSet: TriggerSet<Data> = {
           return;
         if (matches.target === data.me)
           return output.stackOnYou!();
-        return output.stackOnPlayer!({ player: data.ShortName(matches.target) });
+        return output.stackOnPlayer!({ player: data.party.member(matches.target) });
       },
       run: (data) => delete data.redRush,
       outputStrings: {

diff --git a/ui/raidboss/data/04-sb/trial/shinryu-ex.ts b/ui/raidboss/data/04-sb/trial/shinryu-ex.ts
@@ -57,7 +57,7 @@ const triggerSet: TriggerSet<Data> = {
         if (matches.target === data.me)
           return output.akhMornOnYou!();
         else if (data.role === 'tank')
-          return output.akhMornOn!({ player: data.ShortName(matches.target) });
+          return output.akhMornOn!({ player: data.party.member(matches.target) });
       },
       infoText: (data, matches, output) => {
         if (matches.target === data.me || data.role === 'tank')
@@ -386,11 +386,11 @@ const triggerSet: TriggerSet<Data> = {
         if (matches.target === data.me)
           return output.deathSentenceOnYou!();
         else if (data.role === 'healer')
-          return output.deathSentenceOn!({ player: data.ShortName(matches.target) });
+          return output.deathSentenceOn!({ player: data.party.member(matches.target) });
       },
       infoText: (data, matches, output) => {
         if (matches.target !== data.me && data.role !== 'healer')
-          return output.deathSentenceOn!({ player: data.ShortName(matches.target) });
+          return output.deathSentenceOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         deathSentenceOn: {

diff --git a/ui/raidboss/data/04-sb/trial/shinryu.ts b/ui/raidboss/data/04-sb/trial/shinryu.ts
@@ -22,7 +22,7 @@ const triggerSet: TriggerSet<Data> = {
         if (matches.target === data.me)
           return output.akhMornOnYou!();
         else if (data.role === 'tank')
-          return output.akhMornOn!({ player: data.ShortName(matches.target) });
+          return output.akhMornOn!({ player: data.party.member(matches.target) });
       },
       infoText: (data, matches, output) => {
         // Nobody with Akh Morn is a direct target for Akh Rai,

diff --git a/ui/raidboss/data/04-sb/trial/susano-ex.ts b/ui/raidboss/data/04-sb/trial/susano-ex.ts
@@ -205,7 +205,7 @@ const triggerSet: TriggerSet<Data> = {
         // It's sometimes hard for tanks to see the line, so just give a
         // sound indicator for jumping rope back and forth.
         if (data.role === 'tank')
-          return output.text!({ player: data.ShortName(matches.target) });
+          return output.text!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         text: {

diff --git a/ui/raidboss/data/04-sb/trial/tsukuyomi-ex.ts b/ui/raidboss/data/04-sb/trial/tsukuyomi-ex.ts
@@ -45,7 +45,7 @@ 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 || data.role === 'tank' || data.role === 'healer')

diff --git a/ui/raidboss/data/04-sb/trial/tsukuyomi.ts b/ui/raidboss/data/04-sb/trial/tsukuyomi.ts
@@ -36,7 +36,7 @@ const triggerSet: TriggerSet<Data> = {
       alertText: (data, matches, output) => {
         if (data.me === matches.target)
           return output.lineStackOnYou!();
-        return output.lineStackOn!({ player: data.ShortName(matches.target) });
+        return output.lineStackOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         lineStackOnYou: {

diff --git a/ui/raidboss/data/04-sb/ultimate/ultima_weapon_ultimate.ts b/ui/raidboss/data/04-sb/ultimate/ultima_weapon_ultimate.ts
@@ -792,7 +792,7 @@ const triggerSet: TriggerSet<Data> = {
       condition: (data, matches) => matches.target === data.me || matches.source === data.me,
       infoText: (data, matches, output) => {
         const otherPlayer = matches.target === data.me ? matches.source : matches.target;
-        return output.fetters!({ player: data.ShortName(otherPlayer) });
+        return output.fetters!({ player: data.party.member(otherPlayer) });
       },
       outputStrings: {
         fetters: {
@@ -1158,9 +1158,9 @@ const triggerSet: TriggerSet<Data> = {
         if (data.titanGaols.length !== 3)
           return;
         return output.text!({
-          player1: data.ShortName(data.titanGaols[0]),
-          player2: data.ShortName(data.titanGaols[1]),
-          player3: data.ShortName(data.titanGaols[2]),
+          player1: data.party.member(data.titanGaols[0]),
+          player2: data.party.member(data.titanGaols[1]),
+          player3: data.party.member(data.titanGaols[2]),
         });
       },
       outputStrings: {
@@ -1188,7 +1188,7 @@ const triggerSet: TriggerSet<Data> = {
         if (idx === -1)
           return;
         const numStr = output[`num${idx + 1}`]!();
-        return output.text!({ num: numStr, player: data.ShortName(matches.target) });
+        return output.text!({ num: numStr, player: data.party.member(matches.target) });
       },
       outputStrings: {
         // In case people want to replace 1/2/3 with front/mid/back or something.