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.

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/oopsy: add AMR #5718

Merged
merged 50 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
6bd8e79
raidboss/oopsy: add AMR
quisquous Jul 21, 2023
90b4e04
add Rousing Reincarnation
quisquous Jul 22, 2023
a6cde21
Shishio initial timeline
quisquous Jul 23, 2023
b6a940e
initial Gorai timeline/oopsy
quisquous Jul 23, 2023
924e716
devilish thrall safe spots
quisquous Jul 25, 2023
d5309ce
fix Shishu Fuko first trash triggers
quisquous Aug 15, 2023
d8052f3
a little bit more boss1/boss2 timeline
quisquous Aug 15, 2023
ee4bb17
trash 2 fixups
quisquous Aug 15, 2023
e6b92ee
fix limit cut
quisquous Aug 15, 2023
b55a716
initial moko
quisquous Aug 15, 2023
7b647a7
fix devilish thrall north spot oops
quisquous Aug 15, 2023
13aecaa
basic invocation trigger
quisquous Aug 15, 2023
bb8c4e2
add brazen ballad triggers
quisquous Aug 16, 2023
253fb64
fleeting and double iaigiri initial triggers
quisquous Aug 20, 2023
32e8ff0
accursed edge smarts
quisquous Aug 21, 2023
9e30ebb
extra ability listing
quisquous Aug 21, 2023
a39a332
howl
quisquous Aug 21, 2023
db5e856
initial sync files
quisquous Aug 21, 2023
03bd84b
noble pursuit
quisquous Aug 21, 2023
c07fcd1
malformed reincarnation
quisquous Aug 22, 2023
39cee8a
a few other moko abilities
quisquous Aug 22, 2023
68994f1
more oopsy
quisquous Aug 22, 2023
75e156a
double iaigiri fixups
quisquous Aug 22, 2023
90e232e
auspice
quisquous Aug 22, 2023
6efc858
final adds and safe half at least
quisquous Aug 22, 2023
26b67f5
moko more timeline and oopsy
quisquous Aug 22, 2023
88e8f65
shorten triple kasumi instructions
quisquous Aug 22, 2023
a55cc93
add oni claw
quisquous Aug 22, 2023
f0bbd7a
moko invocation fire safe spot
quisquous Aug 22, 2023
113d842
minor trigger updates
quisquous Sep 19, 2023
60c3f90
some savage trash 1 ids
quisquous Sep 19, 2023
f86cf06
gorai final tower / timeline improvements
quisquous Sep 19, 2023
9e74dd0
fix east west shadow kasumi giri
quisquous Sep 19, 2023
3cf1f32
better soldiers of death flex info
quisquous Sep 19, 2023
59773d7
more savage
quisquous Sep 20, 2023
dd1d2fb
add config option, clean up stack language
quisquous Sep 20, 2023
357fb90
fix shadow kasumi giri bug
quisquous Sep 22, 2023
d0f505c
a few more savage ids
quisquous Sep 26, 2023
94efb77
timeline fixups
quisquous Oct 13, 2023
3b64b98
a pile of trigger fixes
quisquous Oct 13, 2023
ea7f8fe
savage ids
quisquous Oct 13, 2023
5a4221a
better huton wording
quisquous Oct 14, 2023
a3650db
reisho tower fix
quisquous Oct 18, 2023
318934e
fix flintlock
quisquous Oct 19, 2023
631f5fc
Merge branch 'main' into another_mount_rokkon
quisquous Oct 19, 2023
97b82c3
fix a few syncs
quisquous Oct 25, 2023
59680b8
commit the rest of the syncs too oops
quisquous Oct 25, 2023
2a3318b
make timeline syncs more explicit to get replacements to work
quisquous Oct 25, 2023
fcac827
adjust gorai tower2 calls
quisquous Oct 25, 2023
924d710
adjust final mechanic to handle stack types
quisquous Oct 25, 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
164 changes: 164 additions & 0 deletions ui/oopsyraidsy/data/06-ew/dungeon/another_mount_rokkon-savage.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
// This file was autogenerated from running ts-node util/sync_files.ts.
// DO NOT EDIT THIS FILE DIRECTLY.

import NetRegexes from '../../../../../resources/netregexes';
import ZoneId from '../../../../../resources/zone_id';
import { OopsyData } from '../../../../../types/data';
import { OopsyTriggerSet } from '../../../../../types/oopsy';
import { playerDamageFields } from '../../../oopsy_common';

// TODO: does Shishu Onmitsugashira Issen 8674 cleave?
// TODO: does Splitting Cry 8442 cleave?
// TODO: taking both Vermilion Aura 8436 and Stygian Aura 8437
// TODO: taking two Unnatural Force 8440 stacks
// TODO: standing in outside of Shishio arena
// TODO: better track who didn't take Shishio towers
// TODO: does Gorai Torching Torment cleave?
// TODO: Humble Hammer share damage
// TODO: who missed Gorai towers or was not hit by protean
// TODO: does Lateral Slice cleave
// TODO: 85FD whose adds were too close

export type Data = OopsyData;

const triggerSet: OopsyTriggerSet<Data> = {
zoneId: ZoneId.AnotherMountRokkonSavage,
damageWarn: {
// Trash 1
'AMRS Shishu Raiko Disciples of Levin': '8668', // centered circle
'AMRS Shishu Raiko Master of Levin': '8667', // very large donut
'AMRS Shishu Furutsubaki Bloody Carress': '8669', // front conal
'AMRS Shishu Fuko Scythe Tail': '866C', // centered circle
'AMRS Red Shishu Penghou Tornado': '866D', // targeted circle
'AMRS Shishu Yuki Right Swipe': '8688', // 180 right cleave
'AMRS Shishu Yuki Left Swipe': '8689', // 180 left cleave

// Shishio
'AMRS Shishio Rokujo Revel': '8425', // Smokeater line
'AMRS Shishio Raiun Leaping Levin 1': '8426', // Raiun 1x Smokeater small cloud circles
'AMRS Shishio Raiun Leaping Levin 2': '8427', // Raiun 1x Smokeater medium cloud circles
'AMRS Shishio Raiun Leaping Levin 3': '8428', // Raiun 1x Smokeater large cloud circles
'AMRS Shishio Lightning Bolt': '842A', // initial Cloud to Cloud circles
'AMRS Shishio Cloud to Cloud 1': '842B', // 1x Smokeater small lines
'AMRS Shishio Cloud to Cloud 2': '824C', // 2x Smokeater medium lines
'AMRS Shishio Cloud to Cloud 3': '824D', // 3x Smokeater large lines
'AMRS Shishio Noble Pursuit 1': '842E', // initial charge line
'AMRS Shishio Noble Pursuit 2': '842F', // followup charge line
'AMRS Shishio Levinburst': '8430', // line damage during Noble Pursuit
'AMRS Shishio Devilish Thrall Right Swipe': '8432', // 180 right cleave from adds
'AMRS Shishio Devilish Thrall Left Swipe': '8433', // 180 left cleave from adds
'AMRS Shishio Haunting Thrall Reisho': '8434', // untelegraphed white explosions from Thralls
'AMRS Shishio Thunder Vortex': '8439', // donut
'AMRS Shishio Eye of the Thunder Vortex 1': '843A', // first "out" circle
'AMRS Shishio Eye of the Thunder Vortex 2': '843B', // second "in" donut
'AMRS Shishio Vortex of the Thunder Eye 1': '843C', // first "in" donut
'AMRS Shishio Vortex of the Thunder Eye 2': '843D', // second "out" circle
'AMRS Shishio Slither': '8443', // back conal

// Trash 2
'AMRS Shishu Yamabiko': '868A', // sprite line aoe
'AMRS Shishu Kotengu Blade of the Tengu': '8671', // Leftward/Rightward/Backward Blows
'AMRS Shishu Onmitsugashira Juji Shuriken': '8676', // untelegraphed front line
'AMRS Shishu Onmitsugashira Juji Shuriken Huton': '867E', // untelegraphed fast front line on all players

// Gorai
'AMRS Gorai Fire Spread Purple': '853C', // line damage after purple Brazen Ballad
'AMRS Gorai Fire Spread Blue': '853D', // line damage after blue Brazen Ballad
'AMRS Gorai Falling Rock Purple': '853F', // expanded rock damage after purple Brazen Ballad
'AMRS Gorai Falling Rock Blue': '8540', // donutified rock damage after purple Brazen Ballad
'AMRS Gorai Ball of Levin Shock Small': '8549', // small circle from Ball of Levin hit by Humble Hammer
'AMRS Gorai Ball of Levin Shock Big': '854A', // large circle from Ball of Levin
'AMRS Gorai Cloud to Ground 1': '854D', // initial cloud exaflare
'AMRS Gorai Cloud to Ground 2': '854E', // ongoing cloud exaflare
'AMRS Gorai Impure Purgation Second': '8553', // follow-up protean'

// Moko
'AMRS Moko Triple Kasumi-Giri 1': '85E4', // back red first
'AMRS Moko Triple Kasumi-Giri 2': '85E5', // left red first
'AMRS Moko Triple Kasumi-Giri 3': '85E6', // front red first
'AMRS Moko Triple Kasumi-Giri 4': '85E7', // right red first
'AMRS Moko Triple Kasumi-Giri 5': '85E8', // back red followup
'AMRS Moko Triple Kasumi-Giri 6': '85E8', // left red followup
'AMRS Moko Triple Kasumi-Giri 7': '85E8', // front red followup
'AMRS Moko Triple Kasumi-Giri 8': '85E8', // right red followup
'AMRS Moko Triple Kasumi-Giri 9': '85EE', // back blue first
'AMRS Moko Triple Kasumi-Giri 10': '85EF', // left blue first
'AMRS Moko Triple Kasumi-Giri 11': '85F0', // front blue first
'AMRS Moko Triple Kasumi-Giri 12': '85F1', // right blue first
'AMRS Moko Triple Kasumi-Giri 13': '85F2', // back blue followup
'AMRS Moko Triple Kasumi-Giri 14': '85F3', // left blue followup
'AMRS Moko Triple Kasumi-Giri 15': '85F4', // front blue followup
'AMRS Moko Triple Kasumi-Giri 16': '85F5', // right blue followup
'AMRS Moko Unbound Spirit': '85EC', // red "out" Triple Kasumi-Giri
'AMRS Moko Azure Coil': '85ED', // blue "in" Triple Kasumi-Giri

'AMRS Moko Scarlet Auspice': '8600', // "get out" before Boundless Scarlet
'AMRS Moko Boundless Scarlet': '8601', // initial red lines before they grow
'AMRS Moko Explosion': '8602', // growing red lines
'AMRS Moko Azure Auspice': '8603', // "get under" donut before Boundless Azure
'AMRS Moko Boundless Azure': '8604', // initial blue lines before they bounce
'AMRS Moko Upwell 1': '8605', // blue line first bounce
'AMRS Moko Upwell 2': '8606', // blue line ongoing bounces

'AMRS Moko Fleeting Iai-Giri 1': '85F6', // back purple
'AMRS Moko Fleeting Iai-Giri 2': '85F7', // left purple
'AMRS Moko Fleeting Iai-Giri 3': '85F8', // right purple

'AMRS Moko Shadow Kasumi-Giri 1': '85F9', // back purple first
'AMRS Moko Shadow Kasumi-giri 2': '86CC', // left purple followup
'AMRS Moko Shadow Kasumi-giri 3': '86CD', // front purple followup
'AMRS Moko Shadow Kasumi-giri 4': '86CE', // right purple followup

'AMRS Moko Oni\'s Claw Clearout 1': '8C22', // hit 1 of large circles
'AMRS Moko Oni\'s Claw Clearout 2': '8C28', // hit 2 of large circles
'AMRS Moko Oni\'s Claw Clearout 3': '860B', // hit 3 of large circles

'AMRS Moko Ashigaru Kyuhei Iron Rain 1': '85FE', // initial medium circle damage from red Ashigaru Kyuheis
'AMRS Moko Ashigaru Kyuhei Iron Rain 2': '87A9', // followup medium circle damage from red Ashigaru Kyuheis
'AMRS Moko Ashigaru Kyuhei Iron Storm 1': '85FF', // initial big circle damage from blue Ashigaru Kyuhei
'AMRS Moko Ashigaru Kyuhei Iron Storm 2': '87AA', // followup big circle damage from blue Ashigaru Kyuhei
},
damageFail: {
'AMRS Shishio Unmitigated Explosion': '8438', // not taking towers
},
gainsEffectWarn: {
// BF9 = 9999s duration, BFA = 15s duration
'AMRS Gorai Burns': 'BF9', // standing in outside square of Gorai
},
shareWarn: {
'AMRS Shishu Raiko Barreling Smash': '8665', // line charge
'AMRS Gorai Pointed Purgation': '8548', // protean tether during towers
'AMRS Gorai Impure Purgation': '8552', // initial protean for double hit protean
},
shareFail: {
'AMRS Shishio Unnatural Ailment': '843F', // spread during Unnatural Wail
'AMRS Gorai Great Ball of Fire': '853A', // spread damage from Live Candle debuff
'AMRS Gorai Worldy Pursuit': '8550', // cross jumps
'AMRS Moko Vengeful Flame': '8608', // spreads during Fleeting Iai-giri
'AMRS Moko Accursed Edge': '8607', // bind on players from Far Edge / Near Edge
},
soloFail: {
'AMRS Shishio Unnatural Force': '8440', // pair stack during Unnatural Wail
'AMRS Gorai Greater Ball of Fire': '8539', // pair stack from Live Brazier debuff
'AMRS Gorai Flintlock': '854C', // tank block line share
'AMRS Moko Vengeful Pyre': '8609', // pair stack during Fleeting Iai-giri
},
triggers: [
{
id: 'AMRS Shishu Kotengu Gaze of the Tengu',
type: 'Ability',
netRegex: NetRegexes.ability({ id: '8673', ...playerDamageFields }),
condition: (data, matches) => data.DamageFromMatches(matches) > 0,
mistake: (_data, matches) => {
return {
type: 'fail',
blame: matches.target,
reportId: matches.targetId,
text: matches.ability,
};
},
},
],
};

export default triggerSet;
161 changes: 161 additions & 0 deletions ui/oopsyraidsy/data/06-ew/dungeon/another_mount_rokkon.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
import NetRegexes from '../../../../../resources/netregexes';
import ZoneId from '../../../../../resources/zone_id';
import { OopsyData } from '../../../../../types/data';
import { OopsyTriggerSet } from '../../../../../types/oopsy';
import { playerDamageFields } from '../../../oopsy_common';

// TODO: does Shishu Onmitsugashira Issen 8662 cleave?
// TODO: does Splitting Cry 841B cleave?
// TODO: taking both Vermilion Aura 840F and Stygian Aura 8410
// TODO: taking two Unnatural Force 8419 stacks
// TODO: standing in outside of Shishio arena
// TODO: better track who didn't take Shishio towers
// TODO: does Gorai Torching Torment cleave?
// TODO: Humble Hammer share damage
// TODO: who missed Gorai towers or was not hit by protean
// TODO: does Lateral Slice cleave
// TODO: 85CE whose adds were too close

export type Data = OopsyData;

const triggerSet: OopsyTriggerSet<Data> = {
zoneId: ZoneId.AnotherMountRokkon,
damageWarn: {
// Trash 1
'AMR Shishu Raiko Disciples of Levin': '8656', // centered circle
'AMR Shishu Raiko Master of Levin': '8655', // very large donut
'AMR Shishu Furutsubaki Bloody Carress': '8657', // front conal
'AMR Shishu Fuko Scythe Tail': '865A', // centered circle
'AMR Red Shishu Penghou Tornado': '865B', // targeted circle
'AMR Shishu Yuki Right Swipe': '8685', // 180 right cleave
'AMR Shishu Yuki Left Swipe': '8686', // 180 left cleave

// Shishio
'AMR Shishio Rokujo Revel': '83FE', // Smokeater line
'AMR Shishio Raiun Leaping Levin 1': '83FF', // Raiun 1x Smokeater small cloud circles
'AMR Shishio Raiun Leaping Levin 2': '8400', // Raiun 1x Smokeater medium cloud circles
'AMR Shishio Raiun Leaping Levin 3': '8401', // Raiun 1x Smokeater large cloud circles
'AMR Shishio Lightning Bolt': '8403', // initial Cloud to Cloud circles
'AMR Shishio Cloud to Cloud 1': '8404', // 1x Smokeater small lines
'AMR Shishio Cloud to Cloud 2': '8405', // 2x Smokeater medium lines
'AMR Shishio Cloud to Cloud 3': '8406', // 3x Smokeater large lines
'AMR Shishio Noble Pursuit 1': '8407', // initial charge line
'AMR Shishio Noble Pursuit 2': '8408', // followup charge line
'AMR Shishio Levinburst': '8409', // line damage during Noble Pursuit
'AMR Shishio Devilish Thrall Right Swipe': '840B', // 180 right cleave from adds
'AMR Shishio Devilish Thrall Left Swipe': '840C', // 180 left cleave from adds
'AMR Shishio Haunting Thrall Reisho': '840D', // untelegraphed white explosions from Thralls
'AMR Shishio Thunder Vortex': '8412', // donut
'AMR Shishio Eye of the Thunder Vortex 1': '8413', // first "out" circle
'AMR Shishio Eye of the Thunder Vortex 2': '8414', // second "in" donut
'AMR Shishio Vortex of the Thunder Eye 1': '8415', // first "in" donut
'AMR Shishio Vortex of the Thunder Eye 2': '8416', // second "out" circle
'AMR Shishio Slither': '841C', // back conal

// Trash 2
'AMR Shishu Yamabiko': '8687', // sprite line aoe
'AMR Shishu Kotengu Blade of the Tengu': '865F', // Leftward/Rightward/Backward Blows
'AMR Shishu Onmitsugashira Juji Shuriken': '8664', // untelegraphed front line
'AMR Shishu Onmitsugashira Juji Shuriken Huton': '867D', // untelegraphed fast front line on all players

// Gorai
'AMR Gorai Fire Spread Purple': '850B', // line damage after purple Brazen Ballad
'AMR Gorai Fire Spread Blue': '850C', // line damage after blue Brazen Ballad
'AMR Gorai Falling Rock Purple': '850E', // expanded rock damage after purple Brazen Ballad
'AMR Gorai Falling Rock Blue': '850F', // donutified rock damage after purple Brazen Ballad
'AMR Gorai Ball of Levin Shock Small': '8522', // small circle from Ball of Levin hit by Humble Hammer
'AMR Gorai Ball of Levin Shock Big': '8523', // large circle from Ball of Levin
'AMR Gorai Cloud to Ground 1': '8529', // initial cloud exaflare
'AMR Gorai Cloud to Ground 2': '852A', // ongoing cloud exaflare
'AMR Gorai Impure Purgation Second': '8531', // follow-up protean'

// Moko
'AMR Moko Triple Kasumi-Giri 1': '85B0', // back red first
'AMR Moko Triple Kasumi-Giri 2': '85B1', // left red first
'AMR Moko Triple Kasumi-Giri 3': '85B2', // front red first
'AMR Moko Triple Kasumi-Giri 4': '85B3', // right red first
'AMR Moko Triple Kasumi-Giri 5': '85B4', // back red followup
'AMR Moko Triple Kasumi-Giri 6': '85B4', // left red followup
'AMR Moko Triple Kasumi-Giri 7': '85B4', // front red followup
'AMR Moko Triple Kasumi-Giri 8': '85B4', // right red followup
'AMR Moko Triple Kasumi-Giri 9': '85BA', // back blue first
'AMR Moko Triple Kasumi-Giri 10': '85BB', // left blue first
'AMR Moko Triple Kasumi-Giri 11': '85BC', // front blue first
'AMR Moko Triple Kasumi-Giri 12': '85BD', // right blue first
'AMR Moko Triple Kasumi-Giri 13': '85BE', // back blue followup
'AMR Moko Triple Kasumi-Giri 14': '85BF', // left blue followup
'AMR Moko Triple Kasumi-Giri 15': '85C0', // front blue followup
'AMR Moko Triple Kasumi-Giri 16': '85C1', // right blue followup
'AMR Moko Unbound Spirit': '85B8', // red "out" Triple Kasumi-Giri
'AMR Moko Azure Coil': '85B9', // blue "in" Triple Kasumi-Giri

'AMR Moko Scarlet Auspice': '85D1', // "get out" before Boundless Scarlet
'AMR Moko Boundless Scarlet': '85D2', // initial red lines before they grow
'AMR Moko Explosion': '85D3', // growing red lines
'AMR Moko Azure Auspice': '85D4', // "get under" donut before Boundless Azure
'AMR Moko Boundless Azure': '85D5', // initial blue lines before they bounce
'AMR Moko Upwell 1': '85D6', // blue line first bounce
'AMR Moko Upwell 2': '85D7', // blue line ongoing bounces

'AMR Moko Fleeting Iai-Giri 1': '85C4', // back purple
'AMR Moko Fleeting Iai-Giri 2': '85C5', // left purple
'AMR Moko Fleeting Iai-Giri 3': '85C6', // right purple

'AMR Moko Shadow Kasumi-Giri 1': '85CA', // back purple first
'AMR Moko Shadow Kasumi-giri 2': '86C4', // left purple followup
'AMR Moko Shadow Kasumi-giri 3': '86C5', // front purple followup
'AMR Moko Shadow Kasumi-giri 4': '86C6', // right purple followup

'AMR Moko Oni\'s Claw Clearout 1': '8C21', // hit 1 of large circles
'AMR Moko Oni\'s Claw Clearout 2': '8C27', // hit 2 of large circles
'AMR Moko Oni\'s Claw Clearout 3': '85DF', // hit 3 of large circles

'AMR Moko Ashigaru Kyuhei Iron Rain 1': '85CF', // initial medium circle damage from red Ashigaru Kyuheis
'AMR Moko Ashigaru Kyuhei Iron Rain 2': '87A7', // followup medium circle damage from red Ashigaru Kyuheis
'AMR Moko Ashigaru Kyuhei Iron Storm 1': '85D0', // initial big circle damage from blue Ashigaru Kyuhei
'AMR Moko Ashigaru Kyuhei Iron Storm 2': '87A8', // followup big circle damage from blue Ashigaru Kyuhei
},
damageFail: {
'AMR Shishio Unmitigated Explosion': '8411', // not taking towers
},
gainsEffectWarn: {
// BF9 = 9999s duration, BFA = 15s duration
'AMR Gorai Burns': 'BF9', // standing in outside square of Gorai
},
shareWarn: {
'AMR Shishu Raiko Barreling Smash': '8653', // line charge
'AMR Gorai Pointed Purgation': '851F', // protean tether during towers
'AMR Gorai Impure Purgation': '8530', // initial protean for double hit protean
},
shareFail: {
'AMR Shishio Unnatural Ailment': '8418', // spread during Unnatural Wail
'AMR Gorai Great Ball of Fire': '8506', // spread damage from Live Candle debuff
'AMR Gorai Worldy Pursuit': '850D', // cross jumps
'AMR Moko Vengeful Flame': '85DC', // spreads during Fleeting Iai-giri
'AMR Moko Accursed Edge': '85DA', // bind on players from Far Edge / Near Edge
},
soloFail: {
'AMR Shishio Unnatural Force': '8419', // pair stack during Unnatural Wail
'AMR Gorai Greater Ball of Fire': '8505', // pair stack from Live Brazier debuff
'AMR Gorai Flintlock': '8527', // tank block line share
'AMR Moko Vengeful Pyre': '85DD', // pair stack during Fleeting Iai-giri
},
triggers: [
{
id: 'AMR Shishu Kotengu Gaze of the Tengu',
type: 'Ability',
netRegex: NetRegexes.ability({ id: '8661', ...playerDamageFields }),
condition: (data, matches) => data.DamageFromMatches(matches) > 0,
mistake: (_data, matches) => {
return {
type: 'fail',
blame: matches.target,
reportId: matches.targetId,
text: matches.ability,
};
},
},
],
};

export default triggerSet;
Loading