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

Followup to #5861.
quisquous · Nov 4, 2023 · 1de0bc8 · 1de0bc8
1 parent 9d03b72
commit 1de0bc8
Show file tree

Hide file tree

Showing 21 changed files with 50 additions and 44 deletions.
diff --git a/ui/raidboss/data/03-hw/alliance/dun_scaith.ts b/ui/raidboss/data/03-hw/alliance/dun_scaith.ts
@@ -591,7 +591,7 @@ const triggerSet: TriggerSet<Data> = {
         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/ui/raidboss/data/03-hw/dungeon/sohm_al_hard.ts b/ui/raidboss/data/03-hw/dungeon/sohm_al_hard.ts
@@ -52,7 +52,9 @@ const triggerSet: TriggerSet<Data> = {
       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/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
@@ -27,8 +27,9 @@ const triggerSet: TriggerSet<Data> = {
       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/ui/raidboss/data/03-hw/dungeon/the_vault.ts b/ui/raidboss/data/03-hw/dungeon/the_vault.ts
@@ -63,7 +63,7 @@ const triggerSet: TriggerSet<Data> = {
       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/ui/raidboss/data/03-hw/dungeon/the_vault61.ts b/ui/raidboss/data/03-hw/dungeon/the_vault61.ts
@@ -63,7 +63,7 @@ const triggerSet: TriggerSet<Data> = {
       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/ui/raidboss/data/03-hw/raid/a10s.ts b/ui/raidboss/data/03-hw/raid/a10s.ts
@@ -191,7 +191,7 @@ const triggerSet: TriggerSet<Data> = {
           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/ui/raidboss/data/03-hw/raid/a11s.ts b/ui/raidboss/data/03-hw/raid/a11s.ts
@@ -142,7 +142,7 @@ const triggerSet: TriggerSet<Data> = {
       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: {
@@ -241,7 +241,7 @@ const triggerSet: TriggerSet<Data> = {
           return output.knockbackCharge!();
         }
 
-        return output.facePlayer!({ player: data.ShortName(partner) });
+        return output.facePlayer!({ player: data.party.member(partner) });
       },
       outputStrings: {
         knockbackCleave: {
@@ -290,7 +290,7 @@ const triggerSet: TriggerSet<Data> = {
           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: {
@@ -363,7 +363,7 @@ const triggerSet: TriggerSet<Data> = {
       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/ui/raidboss/data/03-hw/raid/a12n.ts b/ui/raidboss/data/03-hw/raid/a12n.ts
@@ -92,7 +92,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) });
       },
       run: (data) => delete data.assault,
       outputStrings: {

diff --git a/ui/raidboss/data/03-hw/raid/a12s.ts b/ui/raidboss/data/03-hw/raid/a12s.ts
@@ -85,10 +85,10 @@ const triggerSet: TriggerSet<Data> = {
         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: {
@@ -142,7 +142,7 @@ const triggerSet: TriggerSet<Data> = {
       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: {
@@ -162,7 +162,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: {

diff --git a/ui/raidboss/data/03-hw/raid/a1s.ts b/ui/raidboss/data/03-hw/raid/a1s.ts
@@ -76,7 +76,7 @@ const triggerSet: TriggerSet<Data> = {
       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/ui/raidboss/data/03-hw/raid/a2s.ts b/ui/raidboss/data/03-hw/raid/a2s.ts
@@ -60,7 +60,8 @@ const triggerSet: TriggerSet<Data> = {
       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/ui/raidboss/data/03-hw/raid/a3n.ts b/ui/raidboss/data/03-hw/raid/a3n.ts
@@ -172,8 +172,8 @@ const triggerSet: TriggerSet<Data> = {
           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/ui/raidboss/data/03-hw/raid/a3s.ts b/ui/raidboss/data/03-hw/raid/a3s.ts
@@ -203,8 +203,8 @@ const triggerSet: TriggerSet<Data> = {
           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: {
@@ -238,7 +238,7 @@ const triggerSet: TriggerSet<Data> = {
       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: {
@@ -261,7 +261,7 @@ const triggerSet: TriggerSet<Data> = {
       },
       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/ui/raidboss/data/03-hw/raid/a5s.ts b/ui/raidboss/data/03-hw/raid/a5s.ts
@@ -273,7 +273,9 @@ const triggerSet: TriggerSet<Data> = {
       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/ui/raidboss/data/03-hw/raid/a6n.ts b/ui/raidboss/data/03-hw/raid/a6n.ts
@@ -117,7 +117,7 @@ const triggerSet: TriggerSet<Data> = {
       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/ui/raidboss/data/03-hw/raid/a6s.ts b/ui/raidboss/data/03-hw/raid/a6s.ts
@@ -179,7 +179,7 @@ const triggerSet: TriggerSet<Data> = {
       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/ui/raidboss/data/03-hw/raid/a7s.ts b/ui/raidboss/data/03-hw/raid/a7s.ts
@@ -77,7 +77,7 @@ const triggerSet: TriggerSet<Data> = {
       },
       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/ui/raidboss/data/03-hw/raid/a8n.ts b/ui/raidboss/data/03-hw/raid/a8n.ts
@@ -162,7 +162,7 @@ const triggerSet: TriggerSet<Data> = {
       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: {
@@ -246,7 +246,7 @@ const triggerSet: TriggerSet<Data> = {
       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/ui/raidboss/data/03-hw/raid/a8s.ts b/ui/raidboss/data/03-hw/raid/a8s.ts
@@ -256,7 +256,7 @@ const triggerSet: TriggerSet<Data> = {
       },
       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: {
@@ -291,7 +291,7 @@ const triggerSet: TriggerSet<Data> = {
       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: {
@@ -311,7 +311,7 @@ const triggerSet: TriggerSet<Data> = {
       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: {
@@ -333,7 +333,7 @@ const triggerSet: TriggerSet<Data> = {
           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: {
@@ -389,7 +389,7 @@ const triggerSet: TriggerSet<Data> = {
         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;
@@ -420,7 +420,7 @@ const triggerSet: TriggerSet<Data> = {
       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: {
@@ -759,7 +759,7 @@ const triggerSet: TriggerSet<Data> = {
       },
       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: {
@@ -797,7 +797,7 @@ const triggerSet: TriggerSet<Data> = {
       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/ui/raidboss/data/03-hw/trial/thordan-ex.ts b/ui/raidboss/data/03-hw/trial/thordan-ex.ts
@@ -193,7 +193,7 @@ const triggerSet: TriggerSet<Data> = {
       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: {
@@ -336,8 +336,8 @@ const triggerSet: TriggerSet<Data> = {
       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/ui/raidboss/data/06-ew/trial/thordan-un.ts b/ui/raidboss/data/06-ew/trial/thordan-un.ts
@@ -196,7 +196,7 @@ const triggerSet: TriggerSet<Data> = {
       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: {
@@ -339,8 +339,8 @@ const triggerSet: TriggerSet<Data> = {
       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 });