Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

raidboss: enhancement for p8s orogenic deformation #5209

Merged
merged 3 commits into from
Jan 17, 2023
Merged

raidboss: enhancement for p8s orogenic deformation #5209

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43c9bc2
p8s update orogenic deformation triggers
wexxlee Jan 17, 2023
b9aad38
fix lint
wexxlee Jan 17, 2023
106f095
fix lint
wexxlee Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 112 additions & 11 deletions ui/raidboss/data/06-ew/raid/p8s.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,10 @@ export interface Data extends RaidbossData {
myTower?: number;
flareCounter: number;
inverseMagics: { [name: string]: boolean };
deformationTargets: string[];
deformationHit: string[];
deformationNotHit: string[];
deformationOnMe: boolean;
deformationPartner?: string;
}

const centerX = 100;
Expand Down Expand Up @@ -181,7 +184,9 @@ const triggerSet: TriggerSet<Data> = {
burstCounter: 0,
flareCounter: 0,
inverseMagics: {},
deformationTargets: [],
deformationHit: [],
deformationNotHit: [],
deformationOnMe: false,
};
},
timelineTriggers: [
Expand Down Expand Up @@ -2558,19 +2563,75 @@ const triggerSet: TriggerSet<Data> = {
type: 'StartsUsing',
netRegex: { id: '79D9', source: 'Hephaistos', capture: false },
response: Responses.spread('alert'),
run: (data) => data.deformationTargets = [],
run: (data) => {
data.deformationHit = [];
data.deformationNotHit = [...data.party.partyNames];
data.deformationOnMe = false;
data.deformationPartner = '';
},
},
{
id: 'P8S Orogenic Deformation Collect',
type: 'Ability',
netRegex: { id: '79DB', source: 'Hephaistos' },
run: (data, matches) => {
const idx = data.deformationNotHit.indexOf(matches.target);
if (idx !== -1)
data.deformationNotHit.splice(idx, 1);
if (data.me === matches.target) {
data.deformationOnMe = true;
} else {
data.deformationHit.push(matches.target);
}
},
},
{
id: 'P8S Orogenic Deformation Hit',
type: 'Ability',
netRegex: { id: '79DB', source: 'Hephaistos' },
preRun: (data, matches) => data.deformationTargets.push(matches.target),
infoText: (data, matches, output) => {
if (data.me === matches.target)
return output.text!();
condition: (data, matches) => data.me === matches.target,
delaySeconds: 0.5,
durationSeconds: 10,
infoText: (data, _matches, output) => {
const myRole = data.party.isDPS(data.me) ? 'dps' : 'support';
let partnerCount = 0;
for (const p of data.deformationHit) {
const pRole = data.party.isDPS(p) ? 'dps' : 'support';
if (pRole === myRole) {
partnerCount++;
data.deformationPartner = data.ShortName(p);
}
}
if (data.deformationHit.length === 3 && partnerCount !== 1) {
// non-standard party comp with multiple possible role partners - show all hit
return output.multiple!({
player1: data.ShortName(data.deformationHit[0]),
player2: data.ShortName(data.deformationHit[1]),
player3: data.ShortName(data.deformationHit[2]),
});
} else if (partnerCount === 1) {
return output.partner!({ player: data.deformationPartner });
}
return output.unknown!();
},
outputStrings: {
text: {
multiple: {
en: 'Second Towers (w/ ${player1}, ${player2}, ${player3})',
de: 'Zweite Türme (+ ${player1}, ${player2}, ${player3})',
fr: 'Secondes tours (+ ${player1}, ${player2}, ${player3})',
ja: '2番目で入る (${player1}, ${player2}, ${player3})',
cn: '第二轮塔 (+ ${player1}, ${player2}, ${player3})',
ko: '두번째 기둥 (+ ${player1}, ${player2}, ${player3})',
},
partner: {
en: 'Second Towers (with ${player})',
de: 'Zweite Türme (mit ${player})',
fr: 'Secondes tours (avec ${player})',
ja: '2番目で入る (+${player})',
cn: '第二轮塔 (与 ${player})',
ko: '두번째 기둥 (+ ${player})',
},
unknown: {
en: 'Second Towers',
de: 'Zweite Türme',
fr: 'Secondes tours',
Expand All @@ -2585,13 +2646,53 @@ const triggerSet: TriggerSet<Data> = {
type: 'Ability',
netRegex: { id: '79DB', source: 'Hephaistos', capture: false },
delaySeconds: 0.5,
durationSeconds: 5,
suppressSeconds: 1,
alertText: (data, _matches, output) => {
if (!data.deformationTargets.includes(data.me))
return output.text!();
if (!data.deformationOnMe) {
const idx = data.deformationNotHit.indexOf(data.me);
if (idx !== -1)
data.deformationNotHit.splice(idx, 1);
const myRole = data.party.isDPS(data.me) ? 'dps' : 'support';
let partnerCount = 0;
for (const p of data.deformationNotHit) {
const pRole = data.party.isDPS(p) ? 'dps' : 'support';
if (pRole === myRole) {
partnerCount++;
data.deformationPartner = data.ShortName(p);
}
}
if (data.deformationNotHit.length === 3 && partnerCount !== 1) {
// non-standard party comp with multiple possible role partners - show all not hit
return output.multiple!({
player1: data.ShortName(data.deformationNotHit[0]),
player2: data.ShortName(data.deformationNotHit[1]),
player3: data.ShortName(data.deformationNotHit[2]),
});
} else if (partnerCount === 1) {
return output.partner!({ player: data.deformationPartner });
}
return output.unknown!();
}
},
outputStrings: {
text: {
multiple: {
en: 'First Towers (w/ ${player1}, ${player2}, ${player3})',
de: 'Erste Türme (+ ${player1}, ${player2}, ${player3})',
fr: 'Premières tours (+ ${player1}, ${player2}, ${player3})',
ja: '先に入る (${player1}, ${player2}, ${player3})',
cn: '第一轮塔 (+ ${player1}, ${player2}, ${player3})',
ko: '첫번째 기둥 (+ ${player1}, ${player2}, ${player3})',
},
partner: {
en: 'First Towers (with ${player})',
de: 'Erste Türme (mit ${player})',
fr: 'Premières tours (avec ${player})',
ja: '先に入る (+${player})',
cn: '第一轮塔 (与 ${player})',
ko: '첫번째 기둥 (+ ${player})',
},
unknown: {
en: 'First Towers',
de: 'Erste Türme',
fr: 'Premières tours',
Expand Down