Skip to content

Commit

Permalink
triggers build: raidboss: update ew to use player objects (#5905)
Browse files Browse the repository at this point in the history 
Followup to #5861. 5672f89
  • Loading branch information
github-actions committed Nov 5, 2023
1 parent 5b5f199 commit 656adf6
Show file tree
Hide file tree
Showing 26 changed files with 166 additions and 135 deletions.
4 changes: 2 additions & 2 deletions 06-ew/alliance/aglaia.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ Options.Triggers.push({
alertText: (data, matches, output) => {
if (data.naldSmeltingSpread.includes(data.me))
return;
return output.stackOnPlayer({ player: data.ShortName(matches.target) });
return output.stackOnPlayer({ player: data.party.member(matches.target) });
},
run: (data) => data.naldSmeltingSpread = [],
outputStrings: {
Expand Down Expand Up @@ -461,7 +461,7 @@ Options.Triggers.push({
delaySeconds: 0.5,
alertText: (data, matches, output) => {
if (data.naldLastColor === 'orange')
return output.lineStackOn({ player: data.ShortName(matches.target) });
return output.lineStackOn({ player: data.party.member(matches.target) });
},
outputStrings: {
lineStackOn: {
Expand Down
22 changes: 11 additions & 11 deletions 06-ew/dungeon/another_mount_rokkon-savage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ const stackSpreadResponse = (data, output, collect, stackId, spreadId, hideStack
const isStackFirst = stackTime < spreadTime;
const stackType = findStackPartners(data, stack1.target, stack2.target);
const stacks = [stack1, stack2].map((x) => x.target).sort();
const [player1, player2] = stacks.map((x) => data.ShortName(x));
const [player1, player2] = stacks.map((x) => data.party.member(x));
const stackInfo = hideStackList
? {}
: { infoText: output.stacks({ player1: player1, player2: player2 }) };
Expand Down Expand Up @@ -411,7 +411,7 @@ Options.Triggers.push({
};
if (matches.target === data.me)
return { alarmText: output.chargeOnYou() };
return { alertText: output.chargeOn({ player: data.ShortName(matches.target) }) };
return { alertText: output.chargeOn({ player: data.party.member(matches.target) }) };
},
},
{
Expand Down Expand Up @@ -646,7 +646,7 @@ Options.Triggers.push({
const outIn = isInFirst ? output.out() : output.in();
const args = { inOut: inOut, outIn: outIn };
const stacks = [stack1, stack2].map((x) => x.target).sort();
const [player1, player2] = stacks.map((x) => data.ShortName(x));
const [player1, player2] = stacks.map((x) => data.party.member(x));
const stackInfo = { infoText: output.stacks({ player1: player1, player2: player2 }) };
data.vortexSecondMechanic = isInFirst ? 'out' : 'in';
data.stackSpreadFirstMechanic = isStackFirst ? stackType : 'spread';
Expand Down Expand Up @@ -864,11 +864,11 @@ Options.Triggers.push({
if (spread.includes(data.me)) {
data.ghostMechanic = 'spread';
const otherPlayer = spread.find((x) => x !== data.me) ?? output.unknown();
return output.spread({ player: data.ShortName(otherPlayer) });
return output.spread({ player: data.party.member(otherPlayer) });
}
data.ghostMechanic = 'tower';
const otherPlayer = towers.find((x) => x !== data.me) ?? output.unknown();
return output.tower({ player: data.ShortName(otherPlayer) });
return output.tower({ player: data.party.member(otherPlayer) });
},
outputStrings: {
tower: {
Expand Down Expand Up @@ -1029,7 +1029,7 @@ Options.Triggers.push({
return;
const stackType = findStackPartners(data, stack1.target, stack2.target);
const stacks = [stack1, stack2].map((x) => x.target).sort();
const [player1, player2] = stacks.map((x) => data.ShortName(x));
const [player1, player2] = stacks.map((x) => data.party.member(x));
const stackInfo = { infoText: output.stacks({ player1: player1, player2: player2 }) };
if (stackType === 'melee') {
return { alertText: output.meleeStack(), ...stackInfo };
Expand Down Expand Up @@ -1125,7 +1125,7 @@ Options.Triggers.push({
if (matches.target === data.me)
return output.beBehindTank();
if (data.role === 'tank')
return output.blockLaser({ player: data.ShortName(matches.target) });
return output.blockLaser({ player: data.party.member(matches.target) });
return output.avoidLaser();
},
outputStrings: {
Expand Down Expand Up @@ -1329,7 +1329,7 @@ Options.Triggers.push({
let partner = output.unknown();
for (const [name, color] of Object.entries(firstColor)) {
if (name !== data.me && color === color1) {
partner = data.ShortName(name);
partner = data.party.member(name);
break;
}
}
Expand Down Expand Up @@ -1740,7 +1740,7 @@ Options.Triggers.push({
return { alarmText: output[outputKey]() };
}
const outputKey = `${thisAbility}OnPlayer`;
return { infoText: output[outputKey]({ player: data.ShortName(player) }) };
return { infoText: output[outputKey]({ player: data.party.member(player) }) };
},
},
{
Expand Down Expand Up @@ -1795,7 +1795,7 @@ Options.Triggers.push({
return x !== data.me && x !== player1 && x !== player2;
}) ?? output.unknown();
return {
alertText: output.unmarkedWithPlayer({ player: data.ShortName(remainingPlayer) }),
alertText: output.unmarkedWithPlayer({ player: data.party.member(remainingPlayer) }),
};
}
const otherPlayer = data.me === player1 ? player2 : player1;
Expand All @@ -1804,7 +1804,7 @@ Options.Triggers.push({
if (thisAbility === undefined)
return;
const outputKey = `${thisAbility}OnYou`;
return { alarmText: output[outputKey]({ player: data.ShortName(otherPlayer) }) };
return { alarmText: output[outputKey]({ player: data.party.member(otherPlayer) }) };
},
},
{
Expand Down
22 changes: 11 additions & 11 deletions 06-ew/dungeon/another_mount_rokkon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ const stackSpreadResponse = (data, output, collect, stackId, spreadId, hideStack
const isStackFirst = stackTime < spreadTime;
const stackType = findStackPartners(data, stack1.target, stack2.target);
const stacks = [stack1, stack2].map((x) => x.target).sort();
const [player1, player2] = stacks.map((x) => data.ShortName(x));
const [player1, player2] = stacks.map((x) => data.party.member(x));
const stackInfo = hideStackList
? {}
: { infoText: output.stacks({ player1: player1, player2: player2 }) };
Expand Down Expand Up @@ -409,7 +409,7 @@ Options.Triggers.push({
};
if (matches.target === data.me)
return { alarmText: output.chargeOnYou() };
return { alertText: output.chargeOn({ player: data.ShortName(matches.target) }) };
return { alertText: output.chargeOn({ player: data.party.member(matches.target) }) };
},
},
{
Expand Down Expand Up @@ -644,7 +644,7 @@ Options.Triggers.push({
const outIn = isInFirst ? output.out() : output.in();
const args = { inOut: inOut, outIn: outIn };
const stacks = [stack1, stack2].map((x) => x.target).sort();
const [player1, player2] = stacks.map((x) => data.ShortName(x));
const [player1, player2] = stacks.map((x) => data.party.member(x));
const stackInfo = { infoText: output.stacks({ player1: player1, player2: player2 }) };
data.vortexSecondMechanic = isInFirst ? 'out' : 'in';
data.stackSpreadFirstMechanic = isStackFirst ? stackType : 'spread';
Expand Down Expand Up @@ -862,11 +862,11 @@ Options.Triggers.push({
if (spread.includes(data.me)) {
data.ghostMechanic = 'spread';
const otherPlayer = spread.find((x) => x !== data.me) ?? output.unknown();
return output.spread({ player: data.ShortName(otherPlayer) });
return output.spread({ player: data.party.member(otherPlayer) });
}
data.ghostMechanic = 'tower';
const otherPlayer = towers.find((x) => x !== data.me) ?? output.unknown();
return output.tower({ player: data.ShortName(otherPlayer) });
return output.tower({ player: data.party.member(otherPlayer) });
},
outputStrings: {
tower: {
Expand Down Expand Up @@ -1027,7 +1027,7 @@ Options.Triggers.push({
return;
const stackType = findStackPartners(data, stack1.target, stack2.target);
const stacks = [stack1, stack2].map((x) => x.target).sort();
const [player1, player2] = stacks.map((x) => data.ShortName(x));
const [player1, player2] = stacks.map((x) => data.party.member(x));
const stackInfo = { infoText: output.stacks({ player1: player1, player2: player2 }) };
if (stackType === 'melee') {
return { alertText: output.meleeStack(), ...stackInfo };
Expand Down Expand Up @@ -1123,7 +1123,7 @@ Options.Triggers.push({
if (matches.target === data.me)
return output.beBehindTank();
if (data.role === 'tank')
return output.blockLaser({ player: data.ShortName(matches.target) });
return output.blockLaser({ player: data.party.member(matches.target) });
return output.avoidLaser();
},
outputStrings: {
Expand Down Expand Up @@ -1327,7 +1327,7 @@ Options.Triggers.push({
let partner = output.unknown();
for (const [name, color] of Object.entries(firstColor)) {
if (name !== data.me && color === color1) {
partner = data.ShortName(name);
partner = data.party.member(name);
break;
}
}
Expand Down Expand Up @@ -1738,7 +1738,7 @@ Options.Triggers.push({
return { alarmText: output[outputKey]() };
}
const outputKey = `${thisAbility}OnPlayer`;
return { infoText: output[outputKey]({ player: data.ShortName(player) }) };
return { infoText: output[outputKey]({ player: data.party.member(player) }) };
},
},
{
Expand Down Expand Up @@ -1793,7 +1793,7 @@ Options.Triggers.push({
return x !== data.me && x !== player1 && x !== player2;
}) ?? output.unknown();
return {
alertText: output.unmarkedWithPlayer({ player: data.ShortName(remainingPlayer) }),
alertText: output.unmarkedWithPlayer({ player: data.party.member(remainingPlayer) }),
};
}
const otherPlayer = data.me === player1 ? player2 : player1;
Expand All @@ -1802,7 +1802,7 @@ Options.Triggers.push({
if (thisAbility === undefined)
return;
const outputKey = `${thisAbility}OnYou`;
return { alarmText: output[outputKey]({ player: data.ShortName(otherPlayer) }) };
return { alarmText: output[outputKey]({ player: data.party.member(otherPlayer) }) };
},
},
{
Expand Down
18 changes: 10 additions & 8 deletions 06-ew/dungeon/another_sildihn_subterrane-savage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ Options.Triggers.push({
// Does not happen on first or third Slippery Soap
if (matches.target === data.me)
return output.getBehindPartyKnockback();
return output.getInFrontOfPlayerKnockback({ player: data.ShortName(matches.target) });
return output.getInFrontOfPlayerKnockback({ player: data.party.member(matches.target) });
}
if (matches.target === data.me) {
if (data.soapCounter === 1)
Expand All @@ -301,7 +301,7 @@ Options.Triggers.push({
return output.getBehindPuffs();
return output.getBehindParty();
}
return output.getInFrontOfPlayer({ player: data.ShortName(matches.target) });
return output.getInFrontOfPlayer({ player: data.party.member(matches.target) });
},
outputStrings: {
getBehindPuff: {
Expand Down Expand Up @@ -422,7 +422,7 @@ Options.Triggers.push({
}
if (data.role !== 'tank' && data.role !== 'healer')
return;
return { infoText: output.busterOnTarget({ player: data.ShortName(matches.target) }) };
return { infoText: output.busterOnTarget({ player: data.party.member(matches.target) }) };
},
},
{
Expand Down Expand Up @@ -981,7 +981,7 @@ Options.Triggers.push({
alertText: (data, matches, output) => {
if (matches.target === data.me)
return output.chargeOnYou();
return output.chargeOn({ player: data.ShortName(matches.target) });
return output.chargeOn({ player: data.party.member(matches.target) });
},
outputStrings: {
chargeOn: {
Expand Down Expand Up @@ -1046,15 +1046,17 @@ Options.Triggers.push({
return output.spreadThenStackOnYou();
if (data.thunderousEchoPlayer === undefined)
return output.spreadThenStack();
return output.spreadThenStackOn({ player: data.ShortName(data.thunderousEchoPlayer) });
return output.spreadThenStackOn({
player: data.party.member(data.thunderousEchoPlayer),
});
}
if (data.hasLingering)
return output.baitThenSpread();
if (data.me === data.thunderousEchoPlayer)
return output.stackOnYouThenSpread();
if (data.thunderousEchoPlayer === undefined)
return output.stackThenSpread();
return output.stackOnThenSpread({ player: data.ShortName(data.thunderousEchoPlayer) });
return output.stackOnThenSpread({ player: data.party.member(data.thunderousEchoPlayer) });
},
outputStrings: {
stackThenSpread: Outputs.stackThenSpread,
Expand Down Expand Up @@ -1165,7 +1167,7 @@ Options.Triggers.push({
return output.baitPuddle();
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: {
// TODO: should this also say "In", e.g. "In + Spread" or "Spread (In)"?
Expand Down Expand Up @@ -1524,7 +1526,7 @@ Options.Triggers.push({
if (name === data.me)
continue;
if (id === myBuff) {
partner = data.ShortName(name);
partner = data.party.member(name);
break;
}
}
Expand Down
18 changes: 10 additions & 8 deletions 06-ew/dungeon/another_sildihn_subterrane.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ Options.Triggers.push({
// Does not happen on first or third Slippery Soap
if (matches.target === data.me)
return output.getBehindPartyKnockback();
return output.getInFrontOfPlayerKnockback({ player: data.ShortName(matches.target) });
return output.getInFrontOfPlayerKnockback({ player: data.party.member(matches.target) });
}
if (matches.target === data.me) {
if (data.soapCounter === 1)
Expand All @@ -299,7 +299,7 @@ Options.Triggers.push({
return output.getBehindPuffs();
return output.getBehindParty();
}
return output.getInFrontOfPlayer({ player: data.ShortName(matches.target) });
return output.getInFrontOfPlayer({ player: data.party.member(matches.target) });
},
outputStrings: {
getBehindPuff: {
Expand Down Expand Up @@ -420,7 +420,7 @@ Options.Triggers.push({
}
if (data.role !== 'tank' && data.role !== 'healer')
return;
return { infoText: output.busterOnTarget({ player: data.ShortName(matches.target) }) };
return { infoText: output.busterOnTarget({ player: data.party.member(matches.target) }) };
},
},
{
Expand Down Expand Up @@ -979,7 +979,7 @@ Options.Triggers.push({
alertText: (data, matches, output) => {
if (matches.target === data.me)
return output.chargeOnYou();
return output.chargeOn({ player: data.ShortName(matches.target) });
return output.chargeOn({ player: data.party.member(matches.target) });
},
outputStrings: {
chargeOn: {
Expand Down Expand Up @@ -1044,15 +1044,17 @@ Options.Triggers.push({
return output.spreadThenStackOnYou();
if (data.thunderousEchoPlayer === undefined)
return output.spreadThenStack();
return output.spreadThenStackOn({ player: data.ShortName(data.thunderousEchoPlayer) });
return output.spreadThenStackOn({
player: data.party.member(data.thunderousEchoPlayer),
});
}
if (data.hasLingering)
return output.baitThenSpread();
if (data.me === data.thunderousEchoPlayer)
return output.stackOnYouThenSpread();
if (data.thunderousEchoPlayer === undefined)
return output.stackThenSpread();
return output.stackOnThenSpread({ player: data.ShortName(data.thunderousEchoPlayer) });
return output.stackOnThenSpread({ player: data.party.member(data.thunderousEchoPlayer) });
},
outputStrings: {
stackThenSpread: Outputs.stackThenSpread,
Expand Down Expand Up @@ -1163,7 +1165,7 @@ Options.Triggers.push({
return output.baitPuddle();
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: {
// TODO: should this also say "In", e.g. "In + Spread" or "Spread (In)"?
Expand Down Expand Up @@ -1522,7 +1524,7 @@ Options.Triggers.push({
if (name === data.me)
continue;
if (id === myBuff) {
partner = data.ShortName(name);
partner = data.party.member(name);
break;
}
}
Expand Down
3 changes: 2 additions & 1 deletion 06-ew/dungeon/lapis_manalis.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ Options.Triggers.push({
type: 'GainsEffect',
netRegex: { effectId: 'D24', source: 'Galatea Magna' },
condition: (data) => data.CanCleanse(),
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: 'Esuna ${player}',
Expand Down
9 changes: 5 additions & 4 deletions 06-ew/dungeon/the_dead_ends.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ Options.Triggers.push({
type: 'GainsEffect',
netRegex: { effectId: 'B95' },
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}',
Expand Down Expand Up @@ -132,9 +133,9 @@ Options.Triggers.push({
return { alertText: output.tankLaserOnYou() };
if (data.role === 'healer')
return {
alertText: output.tankLaserOnPlayer({ player: data.ShortName(matches.target) }),
alertText: output.tankLaserOnPlayer({ player: data.party.member(matches.target) }),
};
return { info: output.avoidLaserOnPlayer({ player: data.ShortName(matches.target) }) };
return { info: output.avoidLaserOnPlayer({ player: data.party.member(matches.target) }) };
},
},
{
Expand Down Expand Up @@ -196,7 +197,7 @@ Options.Triggers.push({
netRegex: { effectId: '6E9' },
condition: (data) => data.CanCleanse(),
alertText: (data, matches, output) =>
output.cleanse({ player: data.ShortName(matches.target) }),
output.cleanse({ player: data.party.member(matches.target) }),
outputStrings: {
cleanse: {
en: 'Heal ${player} to Full',
Expand Down
Loading

0 comments on commit 656adf6

Please sign in to comment.