triggers build: raidboss: update sb to use player objects (#5903)

Followup to #5861. 1466878
quisquous · Nov 4, 2023 · 6545d5e · 6545d5e
1 parent b69d1af
commit 6545d5e
Show file tree

Hide file tree

Showing 24 changed files with 57 additions and 56 deletions.
diff --git a/03-hw/dungeon/baelsars_wall.js b/03-hw/dungeon/baelsars_wall.js
@@ -79,7 +79,8 @@ Options.Triggers.push({
       type: 'StartsUsing',
       netRegex: { id: '1CC8', source: 'The Griffin' },
       condition: Conditions.targetIsNotYou(),
-      alertText: (data, matches, output) => output.text({ player: data.ShortName(matches.target) }),
+      alertText: (data, matches, output) =>
+        output.text({ player: data.party.member(matches.target) }),
       outputStrings: {
         text: {
           en: 'Break chain on ${player}',

diff --git a/03-hw/dungeon/baelsars_wall62.js b/03-hw/dungeon/baelsars_wall62.js
@@ -79,7 +79,8 @@ Options.Triggers.push({
       type: 'StartsUsing',
       netRegex: { id: '1CC8', source: 'The Griffin' },
       condition: Conditions.targetIsNotYou(),
-      alertText: (data, matches, output) => output.text({ player: data.ShortName(matches.target) }),
+      alertText: (data, matches, output) =>
+        output.text({ player: data.party.member(matches.target) }),
       outputStrings: {
         text: {
           en: 'Break chain on ${player}',

diff --git a/03-hw/raid/a4s.js b/03-hw/raid/a4s.js
@@ -22,7 +22,7 @@ Options.Triggers.push({
       },
       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/03-hw/trial/sophia-ex.js b/03-hw/trial/sophia-ex.js
@@ -190,7 +190,7 @@ Options.Triggers.push({
       infoText: (data, matches, output) => {
         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/03-hw/trial/zurvan-ex.js b/03-hw/trial/zurvan-ex.js
@@ -31,7 +31,7 @@ Options.Triggers.push({
       },
       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: {
@@ -61,7 +61,7 @@ Options.Triggers.push({
           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,
@@ -111,7 +111,7 @@ Options.Triggers.push({
           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,
@@ -219,7 +219,7 @@ Options.Triggers.push({
         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: {
@@ -286,7 +286,7 @@ Options.Triggers.push({
         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/04-sb/dungeon/fractal_continuum_hard.js b/04-sb/dungeon/fractal_continuum_hard.js
@@ -187,7 +187,7 @@ Options.Triggers.push({
         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/04-sb/dungeon/temple_of_the_fist.js b/04-sb/dungeon/temple_of_the_fist.js
@@ -108,7 +108,8 @@ Options.Triggers.push({
       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/04-sb/raid/o10s.js b/04-sb/raid/o10s.js
@@ -26,7 +26,7 @@ Options.Triggers.push({
       },
       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/04-sb/raid/o12n.js b/04-sb/raid/o12n.js
@@ -119,7 +119,7 @@ Options.Triggers.push({
         // 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/04-sb/raid/o12s.js b/04-sb/raid/o12s.js
@@ -514,7 +514,7 @@ Options.Triggers.push({
           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: {
@@ -654,7 +654,7 @@ Options.Triggers.push({
           // 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;
       },
@@ -769,7 +769,7 @@ Options.Triggers.push({
         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/04-sb/raid/o2n.js b/04-sb/raid/o2n.js
@@ -33,7 +33,7 @@ Options.Triggers.push({
       alertText: (data, matches, output) => {
         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/04-sb/raid/o3s.js b/04-sb/raid/o3s.js
@@ -103,9 +103,9 @@ Options.Triggers.push({
         } 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;
@@ -380,9 +380,9 @@ Options.Triggers.push({
       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/04-sb/raid/o7s.js b/04-sb/raid/o7s.js
@@ -100,7 +100,7 @@ Options.Triggers.push({
       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: {
@@ -159,7 +159,7 @@ Options.Triggers.push({
       infoText: (data, matches, output) => {
         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/04-sb/raid/o8s.js b/04-sb/raid/o8s.js
@@ -256,7 +256,7 @@ Options.Triggers.push({
       infoText: (data, matches, output) => {
         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/04-sb/trial/seiryu.js b/04-sb/trial/seiryu.js
@@ -80,7 +80,7 @@ Options.Triggers.push({
           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/04-sb/trial/shinryu-ex.js b/04-sb/trial/shinryu-ex.js
@@ -45,7 +45,7 @@ Options.Triggers.push({
         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')
@@ -371,11 +371,11 @@ Options.Triggers.push({
         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/04-sb/trial/shinryu.js b/04-sb/trial/shinryu.js
@@ -12,7 +12,7 @@ Options.Triggers.push({
         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/04-sb/trial/susano-ex.js b/04-sb/trial/susano-ex.js
@@ -188,7 +188,7 @@ Options.Triggers.push({
         // 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/04-sb/trial/tsukuyomi-ex.js b/04-sb/trial/tsukuyomi-ex.js
@@ -29,7 +29,7 @@ Options.Triggers.push({
         if (matches.target === data.me)
           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/04-sb/trial/tsukuyomi.js b/04-sb/trial/tsukuyomi.js
@@ -29,7 +29,7 @@ Options.Triggers.push({
       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/04-sb/ultimate/ultima_weapon_ultimate.js b/04-sb/ultimate/ultima_weapon_ultimate.js
@@ -693,7 +693,7 @@ Options.Triggers.push({
         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: {
@@ -1039,9 +1039,9 @@ Options.Triggers.push({
         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: {
@@ -1069,7 +1069,7 @@ Options.Triggers.push({
         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.