Skip to content

raidboss: sort r9s bat positions for consistency #985

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

Open
jacob-keller wants to merge 7 commits into
base: main
Choose a base branch
from
+15 −2
Open

raidboss: sort r9s bat positions for consistency #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
73a8a87
raidboss: sort r9s bat positions for consistency
jacob-keller Feb 2, 2026
1088c23
Merge branch 'main' into jk-r9s-sort-blast-beat-bat-positions
jacob-keller Feb 2, 2026
dab5246
add a custom sorting function for directions
jacob-keller Feb 3, 2026
64b0952
Merge branch 'main' into jk-r9s-sort-blast-beat-bat-positions
jacob-keller Feb 3, 2026
8a7d9e4
remove unnecessary type juggling
jacob-keller Feb 3, 2026
d0b5f58
fix sorting of 'unknown' and simplify expression
jacob-keller Feb 3, 2026
618a391
Merge branch 'main' into jk-r9s-sort-blast-beat-bat-positions
jacob-keller Feb 3, 2026
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
13 changes: 13 additions & 0 deletions resources/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,18 @@ const output16Dir: DirectionOutput16[] = [
const outputCardinalDir: DirectionOutputCardinal[] = ['dirN', 'dirE', 'dirS', 'dirW'];
const outputIntercardDir: DirectionOutputIntercard[] = ['dirNE', 'dirSE', 'dirSW', 'dirNW'];

const compareDirectionOutput = (a: DirectionOutput16, b: DirectionOutput16): number => {
const getIndex = (n: DirectionOutput16) => {
const index = output16Dir.indexOf(n);
// Values outside of output16Dir (i.e. 'unknown') sort last
if (index < 0)
return output16Dir.length;
return index;
};

return getIndex(a) - getIndex(b);
};

const outputStrings16Dir: OutputStrings = {
dirN: Outputs.dirN,
dirNNE: Outputs.dirNNE,
Expand Down Expand Up @@ -375,6 +387,7 @@ export const Directions = {
output16Dir: output16Dir,
outputCardinalDir: outputCardinalDir,
outputIntercardDir: outputIntercardDir,
compareDirectionOutput: compareDirectionOutput,
outputStrings16Dir: outputStrings16Dir,
outputStrings8Dir: outputStrings8Dir,
outputStringsCardinalDir: outputStringsCardinalDir,
Expand Down
4 changes: 2 additions & 2 deletions ui/raidboss/data/07-dt/raid/r9s.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ const triggerSet: TriggerSet<Data> = {
durationSeconds: 5.5,
suppressSeconds: 1,
infoText: (data, _matches, output) => {
const [dir1, dir2] = data.bats.inner;
const [dir1, dir2] = data.bats.inner.sort(Directions.compareDirectionOutput);

return output.away!({
dir1: output[dir1 ?? 'unknown']!(),
Expand Down Expand Up @@ -202,7 +202,7 @@ const triggerSet: TriggerSet<Data> = {
durationSeconds: 3.4,
suppressSeconds: 1,
infoText: (data, _matches, output) => {
const [dir1, dir2, dir3] = data.bats.middle;
const [dir1, dir2, dir3] = data.bats.middle.sort(Directions.compareDirectionOutput);

return output.away!({
dir1: output[dir1 ?? 'unknown']!(),
Expand Down