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: small p12s pangenesis adjustments #5604

Merged
merged 1 commit into from
Jun 23, 2023
Merged

raidboss: small p12s pangenesis adjustments #5604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 16 additions & 5 deletions ui/raidboss/data/06-ew/raid/p12s.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1545,8 +1545,10 @@ const triggerSet: TriggerSet<Data> = {
delaySeconds: 0.5,
durationSeconds: (data) => {
// There's ~13 seconds until the first tower and ~18 until the second tower.
// Some strats have 'not' take the first tower or the second tower,
// so to avoid noisy alerts only extend duration for the long tilts.
const myRole = data.pangenesisRole[data.me];
return myRole === 'not' || myRole === 'longDark' || myRole === 'longLight' ? 17 : 12;
return myRole === 'longDark' || myRole === 'longLight' ? 17 : 12;
},
suppressSeconds: 999999,
alertText: (data, _matches, output) => {
Expand Down Expand Up @@ -1666,6 +1668,12 @@ const triggerSet: TriggerSet<Data> = {
darkTower: {
en: 'Dark Tower',
},
lightTowerSwitch: {
en: 'Light Tower (switch)',
},
darkTowerSwitch: {
en: 'Dark Tower (switch)',
},
};

let tower: typeof data.pangenesisCurrentColor;
Expand All @@ -1679,10 +1687,13 @@ const triggerSet: TriggerSet<Data> = {
if (tower === undefined)
return;

// TODO: should we also say "Dark Tower (again)" or "Dark Tower (switch)" for emphasis?
const severity = tower === data.lastPangenesisTowerColor ? 'infoText' : 'alertText';
const text = tower === 'light' ? output.lightTower!() : output.darkTower!();
return { [severity]: text };
const isSameTower = tower === data.lastPangenesisTowerColor;
if (isSameTower)
return { infoText: tower === 'light' ? output.lightTower!() : output.darkTower!() };

if (tower === 'light')
return { alertText: output.lightTowerSwitch!() };
return { alertText: output.darkTowerSwitch!() };
},
},
],
Expand Down