triggers build: raidboss: update hw to use player objects (#5899)

Followup to #5861. 1de0bc8
quisquous · Nov 4, 2023 · e5af2a2 · e5af2a2
1 parent 2b1f29c
commit e5af2a2
Show file tree

Hide file tree

Showing 21 changed files with 50 additions and 43 deletions.
diff --git a/03-hw/alliance/dun_scaith.js b/03-hw/alliance/dun_scaith.js
@@ -574,7 +574,7 @@ Options.Triggers.push({
       alertText: (data, matches, output) => {
         if (matches.target === data.me)
           return output.gazeStackOnYou();
-        return output.stackOnAndLookAway({ player: data.ShortName(matches.target) });
+        return output.stackOnAndLookAway({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         gazeStackOnYou: {

diff --git a/03-hw/dungeon/sohm_al_hard.js b/03-hw/dungeon/sohm_al_hard.js
@@ -44,7 +44,9 @@ Options.Triggers.push({
       type: 'GainsEffect',
       netRegex: { effectId: '0E' },
       condition: (data) => data.CanCleanse(),
-      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: 'Cleanse ${player}',

diff --git a/03-hw/dungeon/the_lost_city_of_amdapor_hard.js b/03-hw/dungeon/the_lost_city_of_amdapor_hard.js
@@ -16,7 +16,9 @@ Options.Triggers.push({
       type: 'StartsUsing',
       netRegex: { id: '775', source: 'Ranting Ranks Gremlin' },
       condition: Conditions.targetIsNotYou(),
-      infoText: (data, matches, output) => output.comfort({ name: data.ShortName(matches.target) }),
+      infoText: (data, matches, output) => {
+        return output.comfort({ name: data.party.member(matches.target) });
+      },
       outputStrings: {
         comfort: {
           en: '/comfort ${name}',

diff --git a/03-hw/dungeon/the_vault.js b/03-hw/dungeon/the_vault.js
@@ -53,7 +53,7 @@ Options.Triggers.push({
       netRegex: { id: '101F', source: 'Ser Adelphel' },
       condition: (data) => data.role === 'healer',
       alertText: (data, matches, output) => {
-        return output.text({ player: data.ShortName(matches.target) });
+        return output.text({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         text: {

diff --git a/03-hw/dungeon/the_vault61.js b/03-hw/dungeon/the_vault61.js
@@ -53,7 +53,7 @@ Options.Triggers.push({
       netRegex: { id: '101F', source: 'Ser Adelphel' },
       condition: (data) => data.role === 'healer',
       alertText: (data, matches, output) => {
-        return output.text({ player: data.ShortName(matches.target) });
+        return output.text({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         text: {

diff --git a/03-hw/raid/a10s.js b/03-hw/raid/a10s.js
@@ -173,7 +173,7 @@ Options.Triggers.push({
         if (data.role === 'tank')
           return output.tankSwap();
         if (data.role === 'healer' || data.job === 'BLU')
-          return output.shieldPlayer({ player: data.ShortName(matches.target) });
+          return output.shieldPlayer({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         tankSwap: Outputs.tankSwap,

diff --git a/03-hw/raid/a11s.js b/03-hw/raid/a11s.js
@@ -130,7 +130,7 @@ Options.Triggers.push({
       infoText: (data, matches, output) => {
         if (data.me === matches.target)
           return;
-        return output.gaOn({ player: data.ShortName(matches.target) });
+        return output.gaOn({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         gaOn: {
@@ -225,7 +225,7 @@ Options.Triggers.push({
           // In case something goes awry?
           return output.knockbackCharge();
         }
-        return output.facePlayer({ player: data.ShortName(partner) });
+        return output.facePlayer({ player: data.party.member(partner) });
       },
       outputStrings: {
         knockbackCleave: {
@@ -273,7 +273,7 @@ Options.Triggers.push({
         if (data.me === matches.target)
           return output.sharedTankbusterOnYou();
         if (data.role === 'tank' || data.role === 'healer' || data.job === 'BLU')
-          return output.sharedTankbusterOn({ player: data.ShortName(matches.target) });
+          return output.sharedTankbusterOn({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         sharedTankbusterOnYou: {
@@ -345,7 +345,7 @@ Options.Triggers.push({
       alertText: (data, matches, output) => {
         if (data.me === matches.target)
           return;
-        return output.chargeOn({ player: data.ShortName(matches.target) });
+        return output.chargeOn({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         chargeOn: {

diff --git a/03-hw/raid/a12n.js b/03-hw/raid/a12n.js
@@ -80,7 +80,7 @@ Options.Triggers.push({
           return;
         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) });
       },
       run: (data) => delete data.assault,
       outputStrings: {

diff --git a/03-hw/raid/a12s.js b/03-hw/raid/a12s.js
@@ -73,10 +73,10 @@ Options.Triggers.push({
         // Ignore Holy Scourge later in the fight.
         if (data.scourge.length > 2)
           return false;
-        const names = data.scourge.map((x) => data.ShortName(x)).sort();
+        const names = data.scourge.map((x) => data.party.member(x)).sort();
         if (names.length === 0)
           return;
-        return output.text({ players: names.join(', ') });
+        return output.text({ players: names });
       },
       outputStrings: {
         text: {
@@ -130,7 +130,7 @@ Options.Triggers.push({
       condition: (data, matches) => matches.source === data.me || matches.target === data.me,
       infoText: (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: {
@@ -150,7 +150,7 @@ Options.Triggers.push({
       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: {

diff --git a/03-hw/raid/a1s.js b/03-hw/raid/a1s.js
@@ -64,7 +64,7 @@ Options.Triggers.push({
       infoText: (data, _matches, output) => {
         if (data.hydro.length === 0)
           return;
-        return output.text({ players: data.hydro.map((x) => data.ShortName(x)).join(', ') });
+        return output.text({ players: data.hydro.map((x) => data.party.member(x)) });
       },
       outputStrings: {
         text: {

diff --git a/03-hw/raid/a2s.js b/03-hw/raid/a2s.js
@@ -50,7 +50,8 @@ Options.Triggers.push({
       netRegex: { source: 'Magitek Gobwidow G-IX', id: '1413' },
       condition: (data) => data.role === 'healer' || data.job === 'BLU',
       suppressSeconds: 10,
-      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: 'Keep ${player} topped',

diff --git a/03-hw/raid/a3n.js b/03-hw/raid/a3n.js
@@ -158,8 +158,8 @@ Options.Triggers.push({
         if (partner === undefined || marker1 === undefined || marker2 === undefined)
           return `${matches.ability} (???)`;
         if (marker1 === marker2)
-          return output.repel({ player: data.ShortName(partner) });
-        return output.attract({ player: data.ShortName(partner) });
+          return output.repel({ player: data.party.member(partner) });
+        return output.attract({ player: data.party.member(partner) });
       },
       outputStrings: {
         repel: {

diff --git a/03-hw/raid/a3s.js b/03-hw/raid/a3s.js
@@ -190,8 +190,8 @@ Options.Triggers.push({
         if (partner === undefined || marker1 === undefined || marker2 === undefined)
           return `${matches.ability} (???)`;
         if (marker1 === marker2)
-          return output.repel({ player: data.ShortName(partner) });
-        return output.attract({ player: data.ShortName(partner) });
+          return output.repel({ player: data.party.member(partner) });
+        return output.attract({ player: data.party.member(partner) });
       },
       outputStrings: {
         repel: {
@@ -225,7 +225,7 @@ Options.Triggers.push({
       netRegex: { source: 'Liquid Rage', id: 'F1A' },
       condition: (data) => data.CanCleanse(),
       alertText: (data, matches, output) => {
-        return output.text({ player: data.ShortName(matches.target) });
+        return output.text({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         text: {
@@ -248,7 +248,7 @@ Options.Triggers.push({
       },
       infoText: (data, matches, output) => {
         if (data.me !== matches.target)
-          return output.clawOn({ player: data.ShortName(matches.target) });
+          return output.clawOn({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         clawOn: {

diff --git a/03-hw/raid/a5s.js b/03-hw/raid/a5s.js
@@ -253,7 +253,9 @@ Options.Triggers.push({
       type: 'HeadMarker',
       netRegex: { id: '001E' },
       condition: (data) => data.role === 'healer',
-      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: 'Shield ${player}',

diff --git a/03-hw/raid/a6n.js b/03-hw/raid/a6n.js
@@ -109,7 +109,7 @@ Options.Triggers.push({
       infoText: (data, matches, output) => {
         // 0040 = 2, 0041 = 3, 0042 = 4
         const count = 2 + parseInt(matches.id, 16) - parseInt('0040', 16);
-        return output.text({ player: data.ShortName(matches.target), count: count });
+        return output.text({ player: data.party.member(matches.target), count: count });
       },
       outputStrings: {
         text: {

diff --git a/03-hw/raid/a6s.js b/03-hw/raid/a6s.js
@@ -166,7 +166,7 @@ Options.Triggers.push({
       infoText: (data, matches, output) => {
         // 0040 = 2, 0041 = 3, 0042 = 4
         const count = 2 + parseInt(matches.id, 16) - parseInt('0040', 16);
-        return output.text({ player: data.ShortName(matches.target), count: count });
+        return output.text({ player: data.party.member(matches.target), count: count });
       },
       outputStrings: {
         text: {

diff --git a/03-hw/raid/a7s.js b/03-hw/raid/a7s.js
@@ -62,7 +62,7 @@ Options.Triggers.push({
       },
       infoText: (data, matches, output) => {
         if (matches.target !== data.me)
-          return output.sizzlebeamOn({ player: data.ShortName(matches.target) });
+          return output.sizzlebeamOn({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         sizzlebeamOn: {

diff --git a/03-hw/raid/a8n.js b/03-hw/raid/a8n.js
@@ -150,7 +150,7 @@ Options.Triggers.push({
       infoText: (data, matches, output) => {
         // 0040 = 2, 0041 = 3, 0042 = 4
         const count = 2 + parseInt(matches.id, 16) - parseInt('0040', 16);
-        return output.text({ player: data.ShortName(matches.target), count: count });
+        return output.text({ player: data.party.member(matches.target), count: count });
       },
       outputStrings: {
         text: {
@@ -234,7 +234,7 @@ Options.Triggers.push({
       infoText: (data, matches, output) => {
         if (data.me === matches.target)
           return;
-        return output.superJumpOn({ player: data.ShortName(matches.target) });
+        return output.superJumpOn({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         superJumpOn: {

diff --git a/03-hw/raid/a8s.js b/03-hw/raid/a8s.js
@@ -238,7 +238,7 @@ Options.Triggers.push({
       },
       infoText: (data, matches, output) => {
         if (data.me !== matches.target)
-          return output.thunderOn({ player: data.ShortName(matches.target) });
+          return output.thunderOn({ player: data.party.member(matches.target) });
       },
       run: (data, matches) => data.lightning = matches.target,
       outputStrings: {
@@ -273,7 +273,7 @@ Options.Triggers.push({
       condition: (data) => data.lightning !== undefined,
       delaySeconds: (_data, matches) => parseFloat(matches.duration) - 5,
       infoText: (data, _matches, output) => {
-        return output.text({ player: data.ShortName(data.lightning) });
+        return output.text({ player: data.party.member(data.lightning) });
       },
       outputStrings: {
         text: {
@@ -293,7 +293,7 @@ Options.Triggers.push({
       infoText: (data, matches, output) => {
         // 0040 = 2, 0041 = 3, 0042 = 4
         const count = 2 + parseInt(matches.id, 16) - parseInt('0040', 16);
-        return output.text({ player: data.ShortName(matches.target), count: count });
+        return output.text({ player: data.party.member(matches.target), count: count });
       },
       outputStrings: {
         text: {
@@ -314,7 +314,7 @@ Options.Triggers.push({
         if (data.me === matches.target)
           return output.sharedTankbusterOnYou();
         if (data.role === 'tank' || data.role === 'healer')
-          return output.sharedTankbusterOn({ player: data.ShortName(matches.target) });
+          return output.sharedTankbusterOn({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         sharedTankbusterOnYou: {
@@ -369,7 +369,7 @@ Options.Triggers.push({
         const target = data.longNeedleStack;
         if (target === data.me)
           return output.stackOnYou();
-        return output.stackOn({ player: data.ShortName(target) });
+        return output.stackOn({ player: data.party.member(target) });
       },
       run: (data) => {
         delete data.longNeedleStack;
@@ -400,7 +400,7 @@ Options.Triggers.push({
       infoText: (data, matches, output) => {
         if (data.me === matches.target)
           return;
-        return output.superJumpOn({ player: data.ShortName(matches.target) });
+        return output.superJumpOn({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         superJumpOn: {
@@ -739,7 +739,7 @@ Options.Triggers.push({
       },
       infoText: (data, matches, output) => {
         if (data.me !== matches.target)
-          return output.waterOn({ player: data.ShortName(matches.target) });
+          return output.waterOn({ player: data.party.member(matches.target) });
       },
       run: (data, matches) => data.water = matches.target,
       outputStrings: {
@@ -777,7 +777,7 @@ Options.Triggers.push({
       condition: (data) => data.water !== undefined,
       delaySeconds: (_data, matches) => parseFloat(matches.duration) - 5,
       infoText: (data, _matches, output) => {
-        return output.text({ player: data.ShortName(data.water) });
+        return output.text({ player: data.party.member(data.water) });
       },
       outputStrings: {
         text: {

diff --git a/03-hw/trial/thordan-ex.js b/03-hw/trial/thordan-ex.js
@@ -170,7 +170,7 @@ Options.Triggers.push({
       condition: (data, matches) => data.me === matches.source || data.me === matches.target,
       alertText: (data, matches, output) => {
         const partner = data.me === matches.source ? matches.target : matches.source;
-        return output.breakChains({ partner: data.ShortName(partner) });
+        return output.breakChains({ partner: data.party.member(partner) });
       },
       outputStrings: {
         breakChains: {
@@ -313,8 +313,8 @@ Options.Triggers.push({
       alertText: (data, _matches, output) => {
         if (data.swordTarget === undefined || data.shieldTarget === undefined)
           return output.unknownDance();
-        const swordTarget = data.ShortName(data.swordTarget);
-        const shieldTarget = data.ShortName(data.shieldTarget);
+        const swordTarget = data.party.member(data.swordTarget);
+        const shieldTarget = data.party.member(data.shieldTarget);
         if (data.swordTarget === data.shieldTarget)
           return output.singleDance({ target: swordTarget });
         return output.doubleDance({ sword: swordTarget, shield: shieldTarget });

diff --git a/06-ew/trial/thordan-un.js b/06-ew/trial/thordan-un.js
@@ -172,7 +172,7 @@ Options.Triggers.push({
       condition: (data, matches) => data.me === matches.source || data.me === matches.target,
       alertText: (data, matches, output) => {
         const partner = data.me === matches.source ? matches.target : matches.source;
-        return output.breakChains({ partner: data.ShortName(partner) });
+        return output.breakChains({ partner: data.party.member(partner) });
       },
       outputStrings: {
         breakChains: {
@@ -315,8 +315,8 @@ Options.Triggers.push({
       alertText: (data, _matches, output) => {
         if (data.swordTarget === undefined || data.shieldTarget === undefined)
           return output.unknownDance();
-        const swordTarget = data.ShortName(data.swordTarget);
-        const shieldTarget = data.ShortName(data.shieldTarget);
+        const swordTarget = data.party.member(data.swordTarget);
+        const shieldTarget = data.party.member(data.shieldTarget);
         if (data.swordTarget === data.shieldTarget)
           return output.singleDance({ target: swordTarget });
         return output.doubleDance({ sword: swordTarget, shield: shieldTarget });