From b240398b6b11daec0d695f19575e1255e9bd77bc Mon Sep 17 00:00:00 2001 From: Adrienne Walker Date: Fri, 15 Dec 2023 13:09:11 -0800 Subject: [PATCH] raidboss: timeline netregex for idGroups `/(?<=\w* {[^}]*id: )"\((?[^)]*)\)"/ Related to #5977. e11n was manually fixed up (this line was missing [presumably] 56): `358.5 "Blastburn/Burnout" # Ability { id: "56(2D|2F|31)", source: "Fatebreaker" }` --- ui/raidboss/data/02-arr/trial/ultima-ex.txt | 24 +-- .../data/03-hw/alliance/dun_scaith.txt | 2 +- ui/raidboss/data/03-hw/raid/a10n.txt | 26 +-- ui/raidboss/data/03-hw/raid/a3n.txt | 4 +- ui/raidboss/data/03-hw/raid/a6n.txt | 4 +- ui/raidboss/data/03-hw/raid/a8s.txt | 8 +- ui/raidboss/data/03-hw/trial/sephirot-ex.txt | 56 +++---- ui/raidboss/data/03-hw/trial/sophia-ex.txt | 26 +-- ui/raidboss/data/03-hw/trial/thordan-ex.txt | 10 +- ui/raidboss/data/03-hw/trial/zurvan-ex.txt | 26 +-- .../alliance/royal_city_of_rabanastre.txt | 38 ++--- .../04-sb/dungeon/drowned_city_of_skalla.txt | 16 +- .../data/04-sb/dungeon/ghimlyt_dark.txt | 2 +- .../data/04-sb/dungeon/ghimlyt_dark64.txt | 2 +- .../data/04-sb/eureka/eureka_hydatos.txt | 52 +++--- ui/raidboss/data/04-sb/raid/o4s.txt | 32 ++-- ui/raidboss/data/04-sb/raid/o7s.txt | 32 ++-- ui/raidboss/data/04-sb/raid/o8n.txt | 4 +- ui/raidboss/data/04-sb/trial/lakshmi.txt | 4 +- ui/raidboss/data/04-sb/trial/seiryu-ex.txt | 40 ++--- ui/raidboss/data/04-sb/trial/shinryu-ex.txt | 14 +- ui/raidboss/data/04-sb/trial/tsukuyomi-ex.txt | 4 +- ui/raidboss/data/04-sb/trial/tsukuyomi.txt | 16 +- .../05-shb/alliance/the_puppets_bunker.txt | 22 +-- .../the_tower_at_paradigms_breach.txt | 10 +- .../data/05-shb/dungeon/anamnesis_anyder.txt | 2 +- ui/raidboss/data/05-shb/dungeon/paglthan.txt | 2 +- .../data/05-shb/dungeon/qitana_ravel.txt | 12 +- .../05-shb/eureka/bozjan_southern_front.txt | 20 +-- .../data/05-shb/eureka/delubrum_reginae.txt | 24 +-- .../05-shb/eureka/delubrum_reginae_savage.txt | 12 +- ui/raidboss/data/05-shb/eureka/zadnor.txt | 12 +- ui/raidboss/data/05-shb/raid/e10s.txt | 20 +-- ui/raidboss/data/05-shb/raid/e11n.txt | 4 +- ui/raidboss/data/05-shb/raid/e12s.txt | 8 +- ui/raidboss/data/05-shb/raid/e2s.txt | 18 +-- ui/raidboss/data/05-shb/raid/e3s.txt | 28 ++-- ui/raidboss/data/05-shb/raid/e4n.txt | 8 +- ui/raidboss/data/05-shb/raid/e4s.txt | 8 +- ui/raidboss/data/05-shb/raid/e7n.txt | 14 +- ui/raidboss/data/05-shb/raid/e8n.txt | 6 +- .../data/05-shb/trial/diamond_weapon-ex.txt | 4 +- .../data/05-shb/trial/emerald_weapon-ex.txt | 4 +- .../data/05-shb/trial/emerald_weapon.txt | 6 +- ui/raidboss/data/05-shb/trial/hades-ex.txt | 8 +- ui/raidboss/data/05-shb/trial/hades.txt | 2 +- .../data/05-shb/trial/ruby_weapon-ex.txt | 8 +- ui/raidboss/data/05-shb/trial/ruby_weapon.txt | 4 +- ui/raidboss/data/05-shb/trial/varis-ex.txt | 4 +- ui/raidboss/data/05-shb/trial/wol-ex.txt | 8 +- ui/raidboss/data/06-ew/alliance/aglaia.txt | 60 +++---- .../data/06-ew/alliance/euphrosyne.txt | 72 ++++----- ui/raidboss/data/06-ew/alliance/thaleia.txt | 150 +++++++++--------- .../data/06-ew/dungeon/aloalo_island.txt | 38 ++--- .../data/06-ew/dungeon/alzadaals_legacy.txt | 44 ++--- .../dungeon/another_aloalo_island-savage.txt | 48 +++--- .../06-ew/dungeon/another_aloalo_island.txt | 48 +++--- .../dungeon/another_mount_rokkon-savage.txt | 76 ++++----- .../06-ew/dungeon/another_mount_rokkon.txt | 76 ++++----- .../another_sildihn_subterrane-savage.txt | 32 ++-- .../dungeon/another_sildihn_subterrane.txt | 32 ++-- .../data/06-ew/dungeon/ktisis_hyperboreia.txt | 20 +-- .../data/06-ew/dungeon/lapis_manalis.txt | 34 ++-- .../data/06-ew/dungeon/mount_rokkon.txt | 50 +++--- ui/raidboss/data/06-ew/dungeon/smileton.txt | 8 +- .../data/06-ew/dungeon/stigma_dreamscape.txt | 22 +-- .../data/06-ew/dungeon/the_dead_ends.txt | 6 +- .../06-ew/dungeon/the_fell_court_of_troia.txt | 4 +- .../06-ew/dungeon/the_sildihn_subterrane.txt | 74 ++++----- .../data/06-ew/dungeon/the_tower_of_babil.txt | 20 +-- .../data/06-ew/dungeon/the_tower_of_zot.txt | 22 +-- ui/raidboss/data/06-ew/raid/p10s.txt | 32 ++-- ui/raidboss/data/06-ew/raid/p11n.txt | 50 +++--- ui/raidboss/data/06-ew/raid/p11s.txt | 78 ++++----- ui/raidboss/data/06-ew/raid/p12s.txt | 18 +-- ui/raidboss/data/06-ew/raid/p1n.txt | 46 +++--- ui/raidboss/data/06-ew/raid/p1s.txt | 4 +- ui/raidboss/data/06-ew/raid/p2n.txt | 10 +- ui/raidboss/data/06-ew/raid/p2s.txt | 18 +-- ui/raidboss/data/06-ew/raid/p3n.txt | 28 ++-- ui/raidboss/data/06-ew/raid/p3s.txt | 36 ++--- ui/raidboss/data/06-ew/raid/p4n.txt | 28 ++-- ui/raidboss/data/06-ew/raid/p4s.txt | 54 +++---- ui/raidboss/data/06-ew/raid/p5s.txt | 20 +-- ui/raidboss/data/06-ew/raid/p6n.txt | 12 +- ui/raidboss/data/06-ew/raid/p6s.txt | 62 ++++---- ui/raidboss/data/06-ew/raid/p7n.txt | 18 +-- ui/raidboss/data/06-ew/raid/p7s.txt | 16 +- ui/raidboss/data/06-ew/raid/p8n.txt | 40 ++--- ui/raidboss/data/06-ew/raid/p8s.txt | 80 +++++----- ui/raidboss/data/06-ew/raid/p9n.txt | 8 +- ui/raidboss/data/06-ew/raid/p9s.txt | 92 +++++------ .../data/06-ew/trial/barbariccia-ex.txt | 70 ++++---- ui/raidboss/data/06-ew/trial/hydaelyn-ex.txt | 40 ++--- ui/raidboss/data/06-ew/trial/hydaelyn.txt | 28 ++-- ui/raidboss/data/06-ew/trial/rubicante-ex.txt | 18 +-- ui/raidboss/data/06-ew/trial/sephirot-un.txt | 56 +++---- ui/raidboss/data/06-ew/trial/sophia-un.txt | 26 +-- ui/raidboss/data/06-ew/trial/thordan-un.txt | 10 +- ui/raidboss/data/06-ew/trial/ultima-un.txt | 18 +-- ui/raidboss/data/06-ew/trial/zodiark.txt | 26 +-- ui/raidboss/data/06-ew/trial/zurvan-un.txt | 26 +-- .../ultimate/dragonsongs_reprise_ultimate.txt | 72 ++++----- .../06-ew/ultimate/the_omega_protocol.txt | 14 +- 104 files changed, 1405 insertions(+), 1405 deletions(-) diff --git a/ui/raidboss/data/02-arr/trial/ultima-ex.txt b/ui/raidboss/data/02-arr/trial/ultima-ex.txt index b97be20067..bcf5b8bd41 100644 --- a/ui/raidboss/data/02-arr/trial/ultima-ex.txt +++ b/ui/raidboss/data/02-arr/trial/ultima-ex.txt @@ -243,9 +243,9 @@ hideall "--sync--" 1015.6 "Homing Lasers" Ability { id: "5E1", source: "The Ultima Weapon" } 1019.9 "Ceruleum Vent" Ability { id: "5E0", source: "The Ultima Weapon" } 1023.1 "Viscous Aetheroplasm" Ability { id: "5DF", source: "The Ultima Weapon" } -1034.1 "Magitek Ray 1" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" } -1037.1 "Magitek Ray 2" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" } -1040.1 "Magitek Ray 3" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" } +1034.1 "Magitek Ray 1" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" } +1037.1 "Magitek Ray 2" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" } +1040.1 "Magitek Ray 3" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" } 1042.7 "--sync--" StartsUsing { id: "5EA", source: "The Ultima Weapon" } window 45,45 1045.9 "Tank Purge" Ability { id: "5EA", source: "The Ultima Weapon" } @@ -254,17 +254,17 @@ hideall "--sync--" 1054.8 "Homing Lasers" Ability { id: "5E1", source: "The Ultima Weapon" } window 20,20 1059.1 "Ceruleum Vent" Ability { id: "5E0", source: "The Ultima Weapon" } 1062.4 "Viscous Aetheroplasm" Ability { id: "5DF", source: "The Ultima Weapon" } -1070.5 "Magitek Ray 1" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" } window 15,1 -1073.5 "Magitek Ray 2" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" } -1076.5 "Magitek Ray 3" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" } +1070.5 "Magitek Ray 1" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" } window 15,1 +1073.5 "Magitek Ray 2" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" } +1076.5 "Magitek Ray 3" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" } 1080.8 "Viscous Aetheroplasm" Ability { id: "5DF", source: "The Ultima Weapon" } 1084.1 "Diffractive Laser" Ability { id: "5E2", source: "The Ultima Weapon" } window 10,20 1086.4 "Homing Lasers" Ability { id: "5E1", source: "The Ultima Weapon" } window 10,20 1090.7 "Ceruleum Vent" Ability { id: "5E0", source: "The Ultima Weapon" } 1094.0 "Viscous Aetheroplasm" Ability { id: "5DF", source: "The Ultima Weapon" } -1105.1 "Magitek Ray 1" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" } window 15,1 -1108.1 "Magitek Ray 2" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" } -1111.0 "Magitek Ray 3" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" } +1105.1 "Magitek Ray 1" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" } window 15,1 +1108.1 "Magitek Ray 2" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" } +1111.0 "Magitek Ray 3" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" } 1113.6 "--sync--" StartsUsing { id: "5EA", source: "The Ultima Weapon" } window 45,45 jump 1042.7 1116.8 "Tank Purge" Ability { id: "5EA", source: "The Ultima Weapon" } @@ -273,9 +273,9 @@ hideall "--sync--" 1125.8 "Homing Lasers" Ability { id: "5E1", source: "The Ultima Weapon" } 1130.1 "Ceruleum Vent" Ability { id: "5E0", source: "The Ultima Weapon" } 1133.4 "Viscous Aetheroplasm" Ability { id: "5DF", source: "The Ultima Weapon" } -1141.5 "Magitek Ray 1" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" } -1144.5 "Magitek Ray 2" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" } -1147.5 "Magitek Ray 3" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" } +1141.5 "Magitek Ray 1" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" } +1144.5 "Magitek Ray 2" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" } +1147.5 "Magitek Ray 3" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" } 1151.8 "Viscous Aetheroplasm" Ability { id: "5DF", source: "The Ultima Weapon" } diff --git a/ui/raidboss/data/03-hw/alliance/dun_scaith.txt b/ui/raidboss/data/03-hw/alliance/dun_scaith.txt index ad4a4b715b..985d338252 100644 --- a/ui/raidboss/data/03-hw/alliance/dun_scaith.txt +++ b/ui/raidboss/data/03-hw/alliance/dun_scaith.txt @@ -253,7 +253,7 @@ hideall "--sync--" 3013.1 "Thirty Thorns" Ability { id: "1D2B", source: "Scathach" } 3030.2 "Thirty Arrows" Ability { id: "1D2F", source: "Scathach" } window 30,5 3037.4 "Manos" Ability { id: "1CD3", source: "Scathach" } window 30,5 -3047.7 "--sync--" Ability { id: "(1D1[EF])", source: "Scathach" } +3047.7 "--sync--" Ability { id: ["1D1[EF]"], source: "Scathach" } 3049.0 "Shadespin" Ability { id: "1D20", source: "Scathach" } 3052.8 "Thirty Sickles" Ability { id: "1D31", source: "Scathach" } 3056.0 "Soar" Ability { id: "1D1B", source: "Scathach" } diff --git a/ui/raidboss/data/03-hw/raid/a10n.txt b/ui/raidboss/data/03-hw/raid/a10n.txt index 7760e74702..c242176f89 100644 --- a/ui/raidboss/data/03-hw/raid/a10n.txt +++ b/ui/raidboss/data/03-hw/raid/a10n.txt @@ -16,13 +16,13 @@ hideall "--sync--" 37.5 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" } 45.6 "Gobrush Rushgob" Ability { id: "1ACF", source: "Lamebrix Strikebocks" } 49.7 "Gobsway Rumblerocks" Ability { id: "1AD0", source: "Lamebrix Strikebocks" } -56.7 "Trap" Ability { id: "(1AB0|1AB1)", source: "Lamebrix Strikebocks" } window 56.7,5 +56.7 "Trap" Ability { id: ["1AB0", "1AB1"], source: "Lamebrix Strikebocks" } window 56.7,5 58.0 "--sync--" Ability { id: "1AA2", source: "Lamebrix Strikebocks" } 61.1 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" } -61.7 "Frostbite/Impact" Ability { id: "(1AC7|1AC6)", source: ["Blizzard Arrow", "Weight of the World"] } -69.0 "Trap" Ability { id: "(1AB0|1AB1)", source: "Lamebrix Strikebocks" } +61.7 "Frostbite/Impact" Ability { id: ["1AC7", "1AC6"], source: ["Blizzard Arrow", "Weight of the World"] } +69.0 "Trap" Ability { id: ["1AB0", "1AB1"], source: "Lamebrix Strikebocks" } 70.3 "--sync--" Ability { id: "1AA2", source: "Lamebrix Strikebocks" } -74.0 "Impact/Frostbite" Ability { id: "(1AC7|1AC6)", source: ["Blizzard Arrow", "Weight of the World"] } +74.0 "Impact/Frostbite" Ability { id: ["1AC7", "1AC6"], source: ["Blizzard Arrow", "Weight of the World"] } 74.9 "Illuminati Hand Cannon" Ability { id: "1AD2", source: "Lamebrix Strikebocks" } 78.0 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" } 87.1 "Gobslash Slicetops" Ability { id: "1AD1", source: "Lamebrix Strikebocks" } @@ -62,15 +62,15 @@ hideall "--sync--" 309.2 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" } window 200,10 317.3 "Gobrush Rushgob" Ability { id: "1ACF", source: "Lamebrix Strikebocks" } -321.4 "--sync--" Ability { id: "(1AB8|1AB9)", source: "Lamebrix Strikebocks" } +321.4 "--sync--" Ability { id: ["1AB8", "1AB9"], source: "Lamebrix Strikebocks" } 324.6 "--sync--" Ability { id: "1A97", source: "Lamebrix Strikebocks" } -325.5 "Gobspin Whooshdrops/Gobswipe Conklops" Ability { id: "(1ACB|1ACC)", source: "Lamebrix Strikebocks" } window 25,10 +325.5 "Gobspin Whooshdrops/Gobswipe Conklops" Ability { id: ["1ACB", "1ACC"], source: "Lamebrix Strikebocks" } window 25,10 331.6 "Gobsway Rumblerocks" Ability { id: "1AD0", source: "Lamebrix Strikebocks" } 335.6 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" } 339.7 "Gobsway Rumblerocks" Ability { id: "1AD0", source: "Lamebrix Strikebocks" } -344.7 "--sync--" Ability { id: "(1AB8|1AB9)", source: "Lamebrix Strikebocks" } +344.7 "--sync--" Ability { id: ["1AB8", "1AB9"], source: "Lamebrix Strikebocks" } 347.9 "--sync--" Ability { id: "1A97", source: "Lamebrix Strikebocks" } -348.8 "Gobswipe Conklops/Gobspin Whooshdrops" Ability { id: "(1ACB|1ACC)", source: "Lamebrix Strikebocks" } window 10,10 +348.8 "Gobswipe Conklops/Gobspin Whooshdrops" Ability { id: ["1ACB", "1ACC"], source: "Lamebrix Strikebocks" } window 10,10 355.9 "Gobsway Rumblerocks" Ability { id: "1AD0", source: "Lamebrix Strikebocks" } 360.0 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" } 368.1 "Gobrush Rushgob" Ability { id: "1ACF", source: "Lamebrix Strikebocks" } @@ -81,11 +81,11 @@ hideall "--sync--" 385.3 "Gobsway Rumblerocks" Ability { id: "1AD0", source: "Lamebrix Strikebocks" } 389.3 "Gobsway Rumblerocks" Ability { id: "1AD0", source: "Lamebrix Strikebocks" } 393.3 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" } -398.2 "Trap #1" Ability { id: "(1AB0|1AB1)", source: "Lamebrix Strikebocks" } window 100,2.5 -402.3 "Trap #2" Ability { id: "(1AB0|1AB1)", source: "Lamebrix Strikebocks" } -403.2 "Frostbite/Impact" Ability { id: "(1AC7|1AC6)", source: ["Blizzard Arrow", "Weight of the World"] } +398.2 "Trap #1" Ability { id: ["1AB0", "1AB1"], source: "Lamebrix Strikebocks" } window 100,2.5 +402.3 "Trap #2" Ability { id: ["1AB0", "1AB1"], source: "Lamebrix Strikebocks" } +403.2 "Frostbite/Impact" Ability { id: ["1AC7", "1AC6"], source: ["Blizzard Arrow", "Weight of the World"] } 403.6 "--sync--" Ability { id: "1AA2", source: "Lamebrix Strikebocks" } -407.3 "Impact/Frostbite" Ability { id: "(1AC7|1AC6)", source: ["Blizzard Arrow", "Weight of the World"] } +407.3 "Impact/Frostbite" Ability { id: ["1AC7", "1AC6"], source: ["Blizzard Arrow", "Weight of the World"] } 408.9 "Illuminati Hand Cannon" Ability { id: "1AD2", source: "Lamebrix Strikebocks" } 418.1 "Gobslash Slicetops" Ability { id: "1AD1", source: "Lamebrix Strikebocks" } 422.1 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" } @@ -101,7 +101,7 @@ hideall "--sync--" 467.2 "Gobrush Rushgob" Ability { id: "1ACF", source: "Lamebrix Strikebocks" } 470.3 "Gobsway Rumblerocks" Ability { id: "1AD0", source: "Lamebrix Strikebocks" } -474.4 "--sync--" Ability { id: "(1AB8|1AB9)", source: "Lamebrix Strikebocks" } window 30,10 jump 321.4 +474.4 "--sync--" Ability { id: ["1AB8", "1AB9"], source: "Lamebrix Strikebocks" } window 30,10 jump 321.4 477.6 "Single Charge" 478.5 "Gobspin Whooshdrops/Gobswipe Conklops" 484.6 "Gobsway Rumblerocks" diff --git a/ui/raidboss/data/03-hw/raid/a3n.txt b/ui/raidboss/data/03-hw/raid/a3n.txt index 449d92b7bf..2d1ba8c24c 100644 --- a/ui/raidboss/data/03-hw/raid/a3n.txt +++ b/ui/raidboss/data/03-hw/raid/a3n.txt @@ -83,11 +83,11 @@ hideall "--sync--" 326.6 "Sluice" Ability { id: "12F2", source: "Living Liquid" } 329.6 "--sync--" Ability { id: "12F3", source: "Living Liquid" } 331.6 "--sync--" Ability { id: "12F4", source: "Living Liquid" } -335.9 "Magnetism/Repel" Ability { id: "(1307|1309)", source: "Living Liquid" } +335.9 "Magnetism/Repel" Ability { id: ["1307", "1309"], source: "Living Liquid" } 344.0 "Fluid Swing" Ability { id: "12F5", source: "Living Liquid" } window 17.4,2.5 346.1 "Splash x4" # Ability { id: "12EF", source: "Living Liquid" } 350.5 "Fluid Swing" Ability { id: "12F5", source: "Living Liquid" } -359.8 "Magnetism/Repel" Ability { id: "(1307|1309)", source: "Living Liquid" } +359.8 "Magnetism/Repel" Ability { id: ["1307", "1309"], source: "Living Liquid" } 365.9 "Fluid Swing" Ability { id: "12F5", source: "Living Liquid" } window 10,2.5 372.0 "Sluice" Ability { id: "12F2", source: "Living Liquid" } 375.0 "--sync--" Ability { id: "12F3", source: "Living Liquid" } diff --git a/ui/raidboss/data/03-hw/raid/a6n.txt b/ui/raidboss/data/03-hw/raid/a6n.txt index c70bdefe3e..beae02cc4b 100644 --- a/ui/raidboss/data/03-hw/raid/a6n.txt +++ b/ui/raidboss/data/03-hw/raid/a6n.txt @@ -30,11 +30,11 @@ 1000.0 "--sync--" SystemLogMessage { id: "7DC", param1: "6B8" } window 1000,0 1008.7 "Magicked Mark" Ability { id: "1715", source: "Brawler" } window 8.7,5 1010.8 "Attachment" Ability { id: "1601", source: "Brawler" } -1017.0 "Single Buster/Double Buster/Rocket Drill" Ability { id: "(1717|1718|1719)", source: "Brawler" } +1017.0 "Single Buster/Double Buster/Rocket Drill" Ability { id: ["1717", "1718", "1719"], source: "Brawler" } 1022.1 "Magicked Mark" Ability { id: "1715", source: "Brawler" } 1024.2 "Attachment" Ability { id: "1601", source: "Brawler" } window 5,5 -1030.3 "Single Buster/Double Buster/Rocket Drill" Ability { id: "(1717|1718|1719)", source: "Brawler" } +1030.3 "Single Buster/Double Buster/Rocket Drill" Ability { id: ["1717", "1718", "1719"], source: "Brawler" } 1035.4 "Magicked Mark" Ability { id: "1715", source: "Brawler" } jump 1022.1 1037.5 "Attachment" diff --git a/ui/raidboss/data/03-hw/raid/a8s.txt b/ui/raidboss/data/03-hw/raid/a8s.txt index 1b436f1b89..51ad0ed559 100644 --- a/ui/raidboss/data/03-hw/raid/a8s.txt +++ b/ui/raidboss/data/03-hw/raid/a8s.txt @@ -74,7 +74,7 @@ hideall "Brute Force" 322.4 "Mind Blast?" #Ability { id: "1639", source: "Blaster" } # 3 second cast, interruptible 324.5 "Brute Force" #Ability { id: "1638", source: "Blaster Mirage" } 325.6 "Brute Force" Ability { id: "1638", source: "Blaster" } -326.0 "Brawler Mechanic" Ability { id: "(163D|163E|163F|1640)", source: "Brawler" } +326.0 "Brawler Mechanic" Ability { id: ["163D", "163E", "163F", "1640"], source: "Brawler" } 329.4 "Swindler (east)" #NameToggle { name: "Swindler", toggle: "01" } 330.1 "Auxiliary Power" Ability { id: "164B", source: "Brawler" } @@ -90,7 +90,7 @@ hideall "Brute Force" 352.4 "Vortexer (south)" #NameToggle { name: "Vortexer", toggle: "01" } 354.6 "Magicked Mark" Ability { id: "1646", source: "Swindler" } -355.5 "Brawler Mechanic" Ability { id: "(163D|163E|163F|1640)", source: "Brawler" } +355.5 "Brawler Mechanic" Ability { id: ["163D", "163E", "163F", "1640"], source: "Brawler" } 359.6 "Auxiliary Power" Ability { id: "164B", source: "Brawler" } 360.4 "Brute Force" Ability { id: "164D", source: "Vortexer" } 363.7 "Magicked Mark" Ability { id: "163B", source: "Brawler" } @@ -99,11 +99,11 @@ hideall "Brute Force" 375.9 "Auxiliary Power" Ability { id: "164B", source: "Brawler" } 379.0 "Attachment" Ability { id: "163C", source: "Brawler" } 380.5 "Brute Force" Ability { id: "164D", source: "Vortexer" } -385.0 "Brawler Mechanic" Ability { id: "(163D|163E|163F|1640)", source: "Brawler" } +385.0 "Brawler Mechanic" Ability { id: ["163D", "163E", "163F", "1640"], source: "Brawler" } 390.2 "Auxiliary Power" Ability { id: "164B", source: "Brawler" } 390.6 "Brute Force" Ability { id: "164D", source: "Vortexer" } 393.4 "Attachment" Ability { id: "163C", source: "Brawler" } -399.5 "Brawler Mechanic" Ability { id: "(163D|163E|163F|1640)", source: "Brawler" } +399.5 "Brawler Mechanic" Ability { id: ["163D", "163E", "163F", "1640"], source: "Brawler" } 400.7 "Brute Force" Ability { id: "164D", source: "Vortexer" } 403.6 "Auxiliary Power" Ability { id: "164B", source: "Brawler" } 407.7 "Magicked Mark" Ability { id: "163B", source: "Brawler" } diff --git a/ui/raidboss/data/03-hw/trial/sephirot-ex.txt b/ui/raidboss/data/03-hw/trial/sephirot-ex.txt index 277ee2d248..32b6fe368f 100644 --- a/ui/raidboss/data/03-hw/trial/sephirot-ex.txt +++ b/ui/raidboss/data/03-hw/trial/sephirot-ex.txt @@ -64,19 +64,19 @@ hideall "--sync--" # Phase 2 rotation block, 197.3 seconds 1013.2 "Yesod" Ability { id: "157E", source: "Sephirot" } window 30,30 1016.2 "Force Field" Ability { id: "1587", source: "Sephirot" } -1028.4 "Chesed Gevurah" Ability { id: "(1578|1579)", source: "Sephirot" } -1029.0 "Life Force + Spirit" Ability { id: "(157A|157B)", source: "Sephirot" } +1028.4 "Chesed Gevurah" Ability { id: ["1578", "1579"], source: "Sephirot" } +1029.0 "Life Force + Spirit" Ability { id: ["157A", "157B"], source: "Sephirot" } 1034.6 "Fiendish Wail" Ability { id: "1576", source: "Sephirot" } 1042.7 "Da'at Tethers" duration 5 #Ability { id: "1574", source: "Sephirot" } 1053.3 "Fiendish Wail" Ability { id: "1576", source: "Sephirot" } -1060.3 "Chesed Gevurah" Ability { id: "(1578|1579)", source: "Sephirot" } -1060.9 "Life Force + Spirit" Ability { id: "(157A|157B)", source: "Sephirot" } +1060.3 "Chesed Gevurah" Ability { id: ["1578", "1579"], source: "Sephirot" } +1060.9 "Life Force + Spirit" Ability { id: ["157A", "157B"], source: "Sephirot" } 1068.4 "Earth Shaker" Ability { id: "157D", source: "Sephirot" } 1070.1 "Yesod" Ability { id: "157E", source: "Sephirot" } window 20,20 1077.7 "Da'at spread" duration 3.2 #Ability { id: "1573", source: "Sephirot" } 1085.1 "Fiendish Wail" Ability { id: "1576", source: "Sephirot" } -1092.2 "Chesed Gevurah" Ability { id: "(1578|1579)", source: "Sephirot" } -1092.9 "Life Force + Spirit" Ability { id: "(157A|157B)", source: "Sephirot" } +1092.2 "Chesed Gevurah" Ability { id: ["1578", "1579"], source: "Sephirot" } +1092.9 "Life Force + Spirit" Ability { id: ["157A", "157B"], source: "Sephirot" } 1101.0 "Pillar of Mercy 1" Ability { id: "1580", source: "Sephirot" } 1101.3 "Yesod" Ability { id: "157E", source: "Sephirot" } window 20,20 1106.2 "Pillar of Mercy 2" Ability { id: "1580", source: "Sephirot" } @@ -85,38 +85,38 @@ hideall "--sync--" 1128.8 "Da'at spread" duration 3.2 #Ability { id: "1573", source: "Sephirot" } 1129.7 "Yesod" Ability { id: "157E", source: "Sephirot" } window 20,20 1136.1 "Fiendish Wail" Ability { id: "1576", source: "Sephirot" } -1143.2 "Chesed Gevurah" Ability { id: "(1578|1579)", source: "Sephirot" } -1143.8 "Life Force + Spirit" Ability { id: "(157A|157B)", source: "Sephirot" } +1143.2 "Chesed Gevurah" Ability { id: ["1578", "1579"], source: "Sephirot" } +1143.8 "Life Force + Spirit" Ability { id: ["157A", "157B"], source: "Sephirot" } 1149.4 "Malkuth" Ability { id: "1582", source: "Sephirot" } window 30,30 1150.5 "Adds Spawn" AddedCombatant { name: "Storm Of Words" } -1158.7 "Chesed Gevurah" Ability { id: "(1578|1579)", source: "Sephirot" } -1159.3 "Life Force + Spirit" Ability { id: "(157A|157B)", source: "Sephirot" } +1158.7 "Chesed Gevurah" Ability { id: ["1578", "1579"], source: "Sephirot" } +1159.3 "Life Force + Spirit" Ability { id: ["157A", "157B"], source: "Sephirot" } 1164.9 "Fiendish Wail" Ability { id: "1576", source: "Sephirot" } 1166.5 "Yesod" Ability { id: "157E", source: "Sephirot" } -1172.2 "Chesed Gevurah" Ability { id: "(1578|1579)", source: "Sephirot" } -1172.8 "Life Force + Spirit" Ability { id: "(157A|157B)", source: "Sephirot" } +1172.2 "Chesed Gevurah" Ability { id: ["1578", "1579"], source: "Sephirot" } +1172.8 "Life Force + Spirit" Ability { id: ["157A", "157B"], source: "Sephirot" } 1185.8 "Yesod" Ability { id: "157E", source: "Sephirot" } -1188.4 "Chesed Gevurah" Ability { id: "(1578|1579)", source: "Sephirot" } -1189.0 "Life Force + Spirit" Ability { id: "(157A|157B)", source: "Sephirot" } +1188.4 "Chesed Gevurah" Ability { id: ["1578", "1579"], source: "Sephirot" } +1189.0 "Life Force + Spirit" Ability { id: ["157A", "157B"], source: "Sephirot" } 1191.6 "Pillar of Severity" Ability { id: "1585", source: "Sephirot" } 1195.3 "Impact of Hod" Ability { id: "172C", source: "Sephirot" } 1199.7 "Ascension" Ability { id: "1584", source: "Coronal Wind" } 1210.4 "Yesod" Ability { id: "157E", source: "Sephirot" } window 30,30 1213.5 "Force Field" Ability { id: "1587", source: "Sephirot" } -1225.7 "Chesed Gevurah" Ability { id: "(1578|1579)", source: "Sephirot" } -1226.3 "Life Force + Spirit" Ability { id: "(157A|157B)", source: "Sephirot" } +1225.7 "Chesed Gevurah" Ability { id: ["1578", "1579"], source: "Sephirot" } +1226.3 "Life Force + Spirit" Ability { id: ["157A", "157B"], source: "Sephirot" } 1231.9 "Fiendish Wail" Ability { id: "1576", source: "Sephirot" } 1240.0 "Da'at Tethers" duration 5 #Ability { id: "1574", source: "Sephirot" } 1250.6 "Fiendish Wail" Ability { id: "1576", source: "Sephirot" } -1257.6 "Chesed Gevurah" Ability { id: "(1578|1579)", source: "Sephirot" } -1258.2 "Life Force + Spirit" Ability { id: "(157A|157B)", source: "Sephirot" } +1257.6 "Chesed Gevurah" Ability { id: ["1578", "1579"], source: "Sephirot" } +1258.2 "Life Force + Spirit" Ability { id: ["157A", "157B"], source: "Sephirot" } 1265.7 "Earth Shaker" Ability { id: "157D", source: "Sephirot" } 1267.4 "Yesod" Ability { id: "157E", source: "Sephirot" } window 20,20 1275.0 "Da'at spread" duration 3.2 #Ability { id: "1573", source: "Sephirot" } 1282.4 "Fiendish Wail" Ability { id: "1576", source: "Sephirot" } -1289.5 "Chesed Gevurah" Ability { id: "(1578|1579)", source: "Sephirot" } -1290.2 "Life Force + Spirit" Ability { id: "(157A|157B)", source: "Sephirot" } +1289.5 "Chesed Gevurah" Ability { id: ["1578", "1579"], source: "Sephirot" } +1290.2 "Life Force + Spirit" Ability { id: ["157A", "157B"], source: "Sephirot" } 1298.3 "Pillar of Mercy 1" Ability { id: "1580", source: "Sephirot" } 1298.6 "Yesod" Ability { id: "157E", source: "Sephirot" } window 20,20 1303.5 "Pillar of Mercy 2" Ability { id: "1580", source: "Sephirot" } @@ -125,19 +125,19 @@ hideall "--sync--" 1326.1 "Da'at spread" duration 3.2 #Ability { id: "1573", source: "Sephirot" } 1327.0 "Yesod" Ability { id: "157E", source: "Sephirot" } window 20,20 1333.4 "Fiendish Wail" Ability { id: "1576", source: "Sephirot" } -1340.5 "Chesed Gevurah" Ability { id: "(1578|1579)", source: "Sephirot" } -1341.1 "Life Force + Spirit" Ability { id: "(157A|157B)", source: "Sephirot" } +1340.5 "Chesed Gevurah" Ability { id: ["1578", "1579"], source: "Sephirot" } +1341.1 "Life Force + Spirit" Ability { id: ["157A", "157B"], source: "Sephirot" } 1346.7 "Malkuth" Ability { id: "1582", source: "Sephirot" } 1347.8 "Adds Spawn" AddedCombatant { name: "Storm Of Words" } -1356.0 "Chesed Gevurah" Ability { id: "(1578|1579)", source: "Sephirot" } -1356.6 "Life Force + Spirit" Ability { id: "(157A|157B)", source: "Sephirot" } +1356.0 "Chesed Gevurah" Ability { id: ["1578", "1579"], source: "Sephirot" } +1356.6 "Life Force + Spirit" Ability { id: ["157A", "157B"], source: "Sephirot" } 1362.2 "Fiendish Wail" Ability { id: "1576", source: "Sephirot" } 1363.8 "Yesod" Ability { id: "157E", source: "Sephirot" } -1369.5 "Chesed Gevurah" Ability { id: "(1578|1579)", source: "Sephirot" } -1370.1 "Life Force + Spirit" Ability { id: "(157A|157B)", source: "Sephirot" } +1369.5 "Chesed Gevurah" Ability { id: ["1578", "1579"], source: "Sephirot" } +1370.1 "Life Force + Spirit" Ability { id: ["157A", "157B"], source: "Sephirot" } 1382.9 "Yesod" Ability { id: "157E", source: "Sephirot" } -1385.7 "Chesed Gevurah" Ability { id: "(1578|1579)", source: "Sephirot" } -1386.3 "Life Force + Spirit" Ability { id: "(157A|157B)", source: "Sephirot" } +1385.7 "Chesed Gevurah" Ability { id: ["1578", "1579"], source: "Sephirot" } +1386.3 "Life Force + Spirit" Ability { id: ["157A", "157B"], source: "Sephirot" } 1388.9 "Pillar of Severity" Ability { id: "1585", source: "Sephirot" } 1392.6 "Impact of Hod" Ability { id: "172C", source: "Sephirot" } 1397.0 "Pillar of Severity Enrage" Ability { id: "1585", source: "Sephirot" } diff --git a/ui/raidboss/data/03-hw/trial/sophia-ex.txt b/ui/raidboss/data/03-hw/trial/sophia-ex.txt index 95d76075d4..a602efb597 100644 --- a/ui/raidboss/data/03-hw/trial/sophia-ex.txt +++ b/ui/raidboss/data/03-hw/trial/sophia-ex.txt @@ -19,7 +19,7 @@ hideall "--sync--" # This section will be reached either at 56.0, or at the time she is pushed to 90% 56.0 "--clones appear--" AddedCombatant { name: "Aion Teleos" } window 56,5 -63.6 "Thunder II/III" Ability { id: "(19AC|19B0)", source: "Sophia" } +63.6 "Thunder II/III" Ability { id: ["19AC", "19B0"], source: "Sophia" } 63.6 "--sync--" Ability { id: "19AB", source: "Aion Teleos" } window 30,2.5 69.7 "Aero III" Ability { id: "19AE", source: "Sophia" } 69.7 "--sync--" Ability { id: "19AB", source: "Aion Teleos" } @@ -33,22 +33,22 @@ hideall "--sync--" 110.6 "Cloudy Heavens" Ability { id: "19BE", source: "Sophia" } window 110.6 111.6 "--untargetable--" 111.6 "--adds spawn--" -120.9 "Horizontal Kenoma/Vertical Kenoma" Ability { id: "(19BB|19BC)", source: "The First Demiurge" } +120.9 "Horizontal Kenoma/Vertical Kenoma" Ability { id: ["19BB", "19BC"], source: "The First Demiurge" } 121.9 "Gnostic Spear" Ability { id: "19B9", source: "The Third Demiurge" } 125.9 "Divine Spark" # Ability { id: "19B6", source: "The Second Demiurge" } 129.0 "Ring Of Pain" Ability { id: "19BA", source: "The Third Demiurge" } -135.1 "Horizontal Kenoma/Vertical Kenoma" Ability { id: "(19BB|19BC)", source: "The First Demiurge" } +135.1 "Horizontal Kenoma/Vertical Kenoma" Ability { id: ["19BB", "19BC"], source: "The First Demiurge" } 147.3 "Gnostic Spear?" Ability { id: "19B9", source: "The Third Demiurge" } -149.2 "Horizontal Kenoma/Vertical Kenoma" Ability { id: "(19BB|19BC)", source: "The First Demiurge" } +149.2 "Horizontal Kenoma/Vertical Kenoma" Ability { id: ["19BB", "19BC"], source: "The First Demiurge" } 191.6 "Zombification Enrage?" # There's an introductory block leading into a rotation. 250.0 "The Scales Of Wisdom" Ability { id: "1981", source: "Sophia" } window 250,5 267.5 "The Scales Of Wisdom" Ability { id: "1AE1", source: "Sophia" } 272.9 "--targetable--" -280.8 "Quasar (Snapshot)" Ability { id: "(196E|19A7)", source: "Sophia" } +280.8 "Quasar (Snapshot)" Ability { id: ["196E", "19A7"], source: "Sophia" } 286.8 "Quasar (Meteor Detonate)" Ability { id: "1A87", source: "Sophia" } -291.3 "Aero III/Thunder II/Thunder III" Ability { id: "(19AC|19AE|19B0)", source: "Sophia" } window 41.3,5 +291.3 "Aero III/Thunder II/Thunder III" Ability { id: ["19AC", "19AE", "19B0"], source: "Sophia" } window 41.3,5 297.1 "Quasar Tethers" Ability { id: "196E", source: "Sophia" } 305.7 "Quasar (Tilt)" Ability { id: "1A4C", source: "Sophia" } 310.7 "Cintamani x2" duration 3 # Ability { id: "19C5", source: "Sophia" } @@ -61,13 +61,13 @@ hideall "--sync--" 341.2 "Onrush" Ability { id: "19C1", source: "Sophia" } 341.8 "Quasar (Tilt)" # Ability { id: "1A4C", source: "Sophia" } 345.4 "--targetable--" -361.5 "Dischordant Cleansing" # Ability { id: "(19B3|19B5)", source: "Sophia" } +361.5 "Dischordant Cleansing" # Ability { id: ["19B3", "19B5"], source: "Sophia" } 361.5 "Cintamani x2" duration 3 # Ability { id: "19C5", source: "Sophia" } 370.8 "Arms Of Wisdom" Ability { id: "19C4", source: "Sophia" } window 30,5 379.0 "--clones appear--" AddedCombatant { name: "Aion Teleos" } window 60,20 382.0 "Cintamani x3" duration 6 # Ability { id: "19C5", source: "Sophia" } 393.3 "--sync--" Ability { id: "19AB", source: "Aion Teleos" } -393.3 "Thunder II/III" Ability { id: "(19AC|19B0)", source: "Sophia" } +393.3 "Thunder II/III" Ability { id: ["19AC", "19B0"], source: "Sophia" } 399.4 "--sync--" Ability { id: "19AB", source: "Aion Teleos" } 399.4 "Aero III" Ability { id: "19AE", source: "Sophia" } window 30,5 408.5 "Arms Of Wisdom" Ability { id: "19C4", source: "Sophia" } @@ -93,23 +93,23 @@ hideall "--sync--" 507.1 "Cintamani x3" duration 6 # Ability { id: "19C5", source: "Sophia" } 518.3 "Arms Of Wisdom" Ability { id: "19C4", source: "Sophia" } 525.4 "Thunder II" Ability { id: "19B0", source: "Sophia" } -535.9 "Dischordant Cleansing" # Ability { id: "(19B3|19B5)", source: "Sophia" } +535.9 "Dischordant Cleansing" # Ability { id: ["19B3", "19B5"], source: "Sophia" } 539.7 "Gnosis" Ability { id: "19C2", source: "Barbelo" } window 30,5 552.2 "Arms Of Wisdom" Ability { id: "19C4", source: "Sophia" } 567.0 "Quasar Tethers" Ability { id: "196E", source: "Sophia" } -568.3 "Dischordant Cleansing" # Ability { id: "(19B3|19B5)", source: "Sophia" } +568.3 "Dischordant Cleansing" # Ability { id: ["19B3", "19B5"], source: "Sophia" } 575.7 "Quasar (Tilt)" # Ability { id: "1A4C", source: "Sophia" } 581.5 "Cintamani x3" duration 6 # Ability { id: "19C5", source: "Sophia" } 577.5 "--clones appear--" AddedCombatant { name: "Aion Teleos" } window 60,5 592.8 "Arms Of Wisdom" Ability { id: "19C4", source: "Sophia" } 599.9 "--sync--" Ability { id: "19AB", source: "Aion Teleos" } window 10,2.5 -599.9 "Thunder II/III" Ability { id: "(19AC|19B0)", source: "Sophia" } +599.9 "Thunder II/III" Ability { id: ["19AC", "19B0"], source: "Sophia" } 606.1 "--sync--" Ability { id: "19AB", source: "Aion Teleos" } 606.1 "Aero III" Ability { id: "19AE", source: "Sophia" } -611.9 "Quasar (Snapshot)" Ability { id: "(196E|19A7)", source: "Sophia" } +611.9 "Quasar (Snapshot)" Ability { id: ["196E", "19A7"], source: "Sophia" } 617.9 "Quasar (Meteor Detonate)" Ability { id: "1A87", source: "Sophia" } 624.4 "Arms Of Wisdom" Ability { id: "19C4", source: "Sophia" } -636.6 "Dischordant Cleansing" # Ability { id: "(19B3|19B5)", source: "Sophia" } +636.6 "Dischordant Cleansing" # Ability { id: ["19B3", "19B5"], source: "Sophia" } 639.0 "Execute" Ability { id: "19AA", source: "Sophia" } window 30,30 jump 420.5 650.9 "Cintamani x3" diff --git a/ui/raidboss/data/03-hw/trial/thordan-ex.txt b/ui/raidboss/data/03-hw/trial/thordan-ex.txt index a018bce7e9..a84d41813c 100644 --- a/ui/raidboss/data/03-hw/trial/thordan-ex.txt +++ b/ui/raidboss/data/03-hw/trial/thordan-ex.txt @@ -123,14 +123,14 @@ hideall "--sync--" 488.1 "Holy Shield Bash" Ability { id: "1497", source: ["Ser Adelphel", "Ser Janlenoux"] } 497.1 "Spear Of the Fury" Ability { id: "1492", source: "Ser Zephirin" } # A smile better suits a hero 499.5 "Heavenly Heel" Ability { id: "1487", source: "King Thordan" } -504.6 "The Dragon's Gaze/The Dragon's Glory" Ability { id: "(1489|148A)", source: "King Thordan" } +504.6 "The Dragon's Gaze/The Dragon's Glory" Ability { id: ["1489", "148A"], source: "King Thordan" } 516.6 "Ancient Quaga" Ability { id: "1485", source: "King Thordan" } #Phase 4 # Conviction Trio 521.8 "the Dragon's Eye" Ability { id: "1488", source: "King Thordan" } 532.0 "Knights Of the Round" Ability { id: "148C", source: "King Thordan" } -543.1 "The Dragon's Gaze/The Dragon's Glory" Ability { id: "(1489|148A)", source: "King Thordan" } +543.1 "The Dragon's Gaze/The Dragon's Glory" Ability { id: ["1489", "148A"], source: "King Thordan" } 543.2 "Conviction" Ability { id: "149C", source: "Ser Hermenost" } 544.1 "Heavy Impact 1" Ability { id: "14A0", source: "Ser Guerrique" } 546.0 "Conviction" Ability { id: "149D", source: "Ser Hermenost" } @@ -164,7 +164,7 @@ hideall "--sync--" 641.5 "--chains appear--" 642.4 "Holy Meteor" Ability { id: "14B0", source: "Ser Noudenet" } 643.5 "Comet x4" duration 4 #Ability { id: "14B5", source: "Ser Noudenet" } -643.5 "The Dragon's Gaze/The Dragon's Glory" Ability { id: "(1489|148A)", source: "King Thordan" } +643.5 "The Dragon's Gaze/The Dragon's Glory" Ability { id: ["1489", "148A"], source: "King Thordan" } 643.8 "--sync--" Ability { id: "14AB", source: "Ser Charibert" } # Heavensflame (cast) 644.2 "Heavensflame 1" #Ability { id: "14AC", source: "Ser Charibert" } 645.3 "Heavensflame 2" #Ability { id: "14AC", source: "Ser Charibert" } @@ -187,10 +187,10 @@ hideall "--sync--" 707.6 "Heavensward Leap 2" Ability { id: "14AA", source: "Ser Paulecrain" } 710.6 "Heavensward Leap 3" Ability { id: "14AA", source: "Ser Ignasse" } 718.7 "Sacred Cross" StartsUsing { id: "1491", source: "Ser Zephirin" } duration 24.7 -724.6 "Pure Of Soul" Ability { id: "(14B1|14B2)", source: ["Ser Charibert", "Ser Noudenet", "Ser Haumeric"] } +724.6 "Pure Of Soul" Ability { id: ["14B1", "14B2"], source: ["Ser Charibert", "Ser Noudenet", "Ser Haumeric"] } 732.6 "Absolute Conviction 1" Ability { id: "14A4", source: "Ser Guerrique" } 735.5 "Absolute Conviction 2" Ability { id: "14A5", source: "Ser Hermenost" } -740.6 "The Dragon's Gaze/The Dragon's Glory" Ability { id: "(1489|148A)", source: "King Thordan" } +740.6 "The Dragon's Gaze/The Dragon's Glory" Ability { id: ["1489", "148A"], source: "King Thordan" } 743.4 "--sync--" Ability { id: "1491", source: "Ser Zephirin" } # Sacred Cross resolves 750.7 "Ancient Quaga" Ability { id: "1485", source: "King Thordan" } diff --git a/ui/raidboss/data/03-hw/trial/zurvan-ex.txt b/ui/raidboss/data/03-hw/trial/zurvan-ex.txt index 7bdfb440e1..2246b6b8c0 100644 --- a/ui/raidboss/data/03-hw/trial/zurvan-ex.txt +++ b/ui/raidboss/data/03-hw/trial/zurvan-ex.txt @@ -105,7 +105,7 @@ hideall "--sync--" 429.3 "Southern Cross (snapshot)" Ability { id: "1C5C", source: "Zurvan" } window 430,10 432.9 "Southern Cross (puddle)" Ability { id: "1C5D", source: "Zurvan" } 434.6 "Metal Cutter" Ability { id: "1C70", source: "Zurvan" } -444.7 "Biting Halberd/Ciclicle/Tail End" Ability { id: "(1C59|1C5A|1C5B)", source: "Zurvan" } +444.7 "Biting Halberd/Ciclicle/Tail End" Ability { id: ["1C59", "1C5A", "1C5B"], source: "Zurvan" } # This is the earliest point this phase can push 448.8 "Metal Cutter" Ability { id: "1C70", source: "Zurvan" } @@ -134,7 +134,7 @@ hideall "--sync--" 990.3 "Sarva" Ability { id: "1C5F", source: "Zurvan" } window 500,10 1000.0 "Ahura Mazda" Ability { id: "1C60", source: "Zurvan" } window 1000,10 1018.2 "--targetable--" -1024.4 "Infinite Fire/Infinite Ice" Ability { id: "(1C67|1C68)", source: "Zurvan" } +1024.4 "Infinite Fire/Infinite Ice" Ability { id: ["1C67", "1C68"], source: "Zurvan" } 1032.5 "Wave Cannon (avoid)" Ability { id: "1C73", source: "Zurvan" } 1039.7 "Tyrfing x5" Ability { id: "1C6D", source: "Zurvan" } duration 5 window 1040,5 1044.8 "Fire III" Ability { id: "1C6F", source: "Zurvan" } @@ -142,9 +142,9 @@ hideall "--sync--" 1054.5 "Southern Cross (puddle)" Ability { id: "1C5D", source: "Zurvan" } 1056.2 "Metal Cutter" Ability { id: "1C70", source: "Zurvan" } 1065.3 "Broken Seal" Ability { id: "1DC7", source: "Zurvan" } window 30,30 -1081.0 "Biting Halberd/Ciclicle/Tail End" Ability { id: "(1C59|1C5B|1C5A)", source: "Zurvan" } +1081.0 "Biting Halberd/Ciclicle/Tail End" Ability { id: ["1C59", "1C5B", "1C5A"], source: "Zurvan" } 1086.3 "Metal Cutter" Ability { id: "1C70", source: "Zurvan" } -1091.1 "Infinite Fire/Infinite Ice" Ability { id: "(1C67|1C68)", source: "Zurvan" } +1091.1 "Infinite Fire/Infinite Ice" Ability { id: ["1C67", "1C68"], source: "Zurvan" } 1099.5 "Wave Cannon (avoid)" Ability { id: "1C73", source: "Zurvan" } 1106.6 "Tyrfing x6" Ability { id: "1C6D", source: "Zurvan" } duration 6 1112.7 "Fire III" Ability { id: "1C6F", source: "Zurvan" } @@ -152,7 +152,7 @@ hideall "--sync--" 1122.4 "Southern Cross (puddle)" Ability { id: "1C5D", source: "Zurvan" } 1124.1 "Metal Cutter" Ability { id: "1C70", source: "Zurvan" } 1133.2 "Broken Seal" Ability { id: "1DC7", source: "Zurvan" } -1147.9 "Biting Halberd/Ciclicle/Tail End" Ability { id: "(1C59|1C5B|1C5A)", source: "Zurvan" } +1147.9 "Biting Halberd/Ciclicle/Tail End" Ability { id: ["1C59", "1C5B", "1C5A"], source: "Zurvan" } 1154.0 "Metal Cutter" Ability { id: "1C70", source: "Zurvan" } 1164.1 "Soar" Ability { id: "1E09", source: "Zurvan" } window 100,20 1164.2 "--untargetable--" @@ -162,7 +162,7 @@ hideall "--sync--" 1181.3 "--targetable--" 1187.4 "The Demon's Claw" Ability { id: "1C71", source: "Zurvan" } 1194.5 "Wave Cannon (stack)" Ability { id: "1C72", source: "Zurvan" } -1200.6 "Infinite Fire/Infinite Ice" Ability { id: "(1C67|1C68)", source: "Zurvan" } +1200.6 "Infinite Fire/Infinite Ice" Ability { id: ["1C67", "1C68"], source: "Zurvan" } 1208.7 "Wave Cannon (avoid)" Ability { id: "1C73", source: "Zurvan" } 1215.8 "Tyrfing x7" Ability { id: "1C6D", source: "Zurvan" } duration 7 1222.9 "Fire III" Ability { id: "1C6F", source: "Zurvan" } @@ -170,9 +170,9 @@ hideall "--sync--" 1232.6 "Southern Cross (puddle)" Ability { id: "1C5D", source: "Zurvan" } 1234.3 "Metal Cutter" Ability { id: "1C70", source: "Zurvan" } 1243.4 "Broken Seal" Ability { id: "1DC7", source: "Zurvan" } window 30,30 -1258.4 "Biting Halberd/Ciclicle/Tail End" Ability { id: "(1C59|1C5B|1C5A)", source: "Zurvan" } +1258.4 "Biting Halberd/Ciclicle/Tail End" Ability { id: ["1C59", "1C5B", "1C5A"], source: "Zurvan" } 1264.5 "Metal Cutter" Ability { id: "1C70", source: "Zurvan" } -1269.6 "Infinite Fire/Infinite Ice" Ability { id: "(1C67|1C68)", source: "Zurvan" } +1269.6 "Infinite Fire/Infinite Ice" Ability { id: ["1C67", "1C68"], source: "Zurvan" } 1277.7 "Wave Cannon (avoid)" Ability { id: "1C73", source: "Zurvan" } 1284.8 "Tyrfing x8" Ability { id: "1C6D", source: "Zurvan" } duration 8 1292.9 "Fire III" Ability { id: "1C6F", source: "Zurvan" } @@ -180,7 +180,7 @@ hideall "--sync--" 1302.6 "Southern Cross (puddle)" Ability { id: "1C5D", source: "Zurvan" } 1304.3 "Metal Cutter" Ability { id: "1C70", source: "Zurvan" } 1313.4 "Broken Seal" Ability { id: "1DC7", source: "Zurvan" } -1328.6 "Biting Halberd/Ciclicle/Tail End" Ability { id: "(1C59|1C5B|1C5A)", source: "Zurvan" } +1328.6 "Biting Halberd/Ciclicle/Tail End" Ability { id: ["1C59", "1C5B", "1C5A"], source: "Zurvan" } 1334.8 "Metal Cutter" Ability { id: "1C70", source: "Zurvan" } 1344.8 "Soar" Ability { id: "1E09", source: "Zurvan" } window 100,20 1344.9 "--untargetable--" @@ -190,7 +190,7 @@ hideall "--sync--" 1362.0 "--targetable--" 1368.1 "The Demon's Claw" Ability { id: "1C71", source: "Zurvan" } 1375.2 "Wave Cannon (stack)" Ability { id: "1C72", source: "Zurvan" } -1381.3 "Infinite Fire/Infinite Ice" Ability { id: "(1C67|1C68)", source: "Zurvan" } +1381.3 "Infinite Fire/Infinite Ice" Ability { id: ["1C67", "1C68"], source: "Zurvan" } 1389.5 "Wave Cannon (avoid)" Ability { id: "1C73", source: "Zurvan" } 1396.6 "Tyrfing x9" Ability { id: "1C6D", source: "Zurvan" } duration 9 1405.7 "Fire III" Ability { id: "1C6F", source: "Zurvan" } @@ -198,12 +198,12 @@ hideall "--sync--" 1415.4 "Southern Cross (puddle)" Ability { id: "1C5D", source: "Zurvan" } 1417.1 "Metal Cutter" Ability { id: "1C70", source: "Zurvan" } 1426.2 "Broken Seal" Ability { id: "1DC7", source: "Zurvan" } window 30,30 -1441.2 "Biting Halberd/Ciclicle/Tail End" Ability { id: "(1C59|1C5B|1C5A)", source: "Zurvan" } +1441.2 "Biting Halberd/Ciclicle/Tail End" Ability { id: ["1C59", "1C5B", "1C5A"], source: "Zurvan" } # It should theoretically be impossible to reach here before enrage, # but just in case we'll unroll a bit more to get to 10x Tyrfings. 1447.4 "Metal Cutter" Ability { id: "1C70", source: "Zurvan" } -1452.5 "Infinite Fire/Infinite Ice" Ability { id: "(1C67|1C68)", source: "Zurvan" } +1452.5 "Infinite Fire/Infinite Ice" Ability { id: ["1C67", "1C68"], source: "Zurvan" } 1460.6 "Wave Cannon (avoid)" Ability { id: "1C73", source: "Zurvan" } 1467.7 "Tyrfing x10" Ability { id: "1C6D", source: "Zurvan" } duration 10 1475.8 "Fire III" Ability { id: "1C6F", source: "Zurvan" } @@ -211,7 +211,7 @@ hideall "--sync--" 1485.5 "Southern Cross (puddle)" Ability { id: "1C5D", source: "Zurvan" } 1487.2 "Metal Cutter" Ability { id: "1C70", source: "Zurvan" } 1496.3 "Broken Seal" Ability { id: "1DC7", source: "Zurvan" } -1511.5 "Biting Halberd/Ciclicle/Tail End" Ability { id: "(1C59|1C5B|1C5A)", source: "Zurvan" } +1511.5 "Biting Halberd/Ciclicle/Tail End" Ability { id: ["1C59", "1C5B", "1C5A"], source: "Zurvan" } 1517.7 "Metal Cutter" Ability { id: "1C70", source: "Zurvan" } 1527.7 "Soar" Ability { id: "1E09", source: "Zurvan" } 1527.8 "--untargetable--" diff --git a/ui/raidboss/data/04-sb/alliance/royal_city_of_rabanastre.txt b/ui/raidboss/data/04-sb/alliance/royal_city_of_rabanastre.txt index 9605c1728a..1b976cc816 100644 --- a/ui/raidboss/data/04-sb/alliance/royal_city_of_rabanastre.txt +++ b/ui/raidboss/data/04-sb/alliance/royal_city_of_rabanastre.txt @@ -73,7 +73,7 @@ hideall "--start--" 1031.8 "Sanction" Ability { id: "25C3", source: "Hashmal, Bringer of Order" } 1038.1 "--untargetable--" # ??? from video 1039.4 "Towerfall" Ability { id: "25C4", source: "Control Tower" } -1046.2 "Extreme Edge" Ability { id: "(25CE|25D0)", source: "Hashmal, Bringer of Order" } +1046.2 "Extreme Edge" Ability { id: ["25CE", "25D0"], source: "Hashmal, Bringer of Order" } 1050.1 "--targetable--" # ??? from video 1056.1 "Earth Hammer" Ability { id: "25CB", source: "Hashmal, Bringer of Order" } @@ -113,7 +113,7 @@ hideall "--start--" 1341.7 "Towerfall" Ability { id: "25C4", source: "Control Tower" } 1343.9 "--untargetable--" # ??? from video 1348.2 "Jagged Edge 1" #Ability { id: "25CD", source: "Hashmal, Bringer of Order" } -1348.5 "Extreme Edge" Ability { id: "(25CE|25D0)", source: "Hashmal, Bringer of Order" } +1348.5 "Extreme Edge" Ability { id: ["25CE", "25D0"], source: "Hashmal, Bringer of Order" } 1350.3 "Jagged Edge 2" #Ability { id: "25CD", source: "Hashmal, Bringer of Order" } 1352.3 "Jagged Edge 3" #Ability { id: "25CD", source: "Hashmal, Bringer of Order" } 1355.4 "--targetable--" # ??? from video @@ -143,8 +143,8 @@ hideall "--start--" 1469.7 "Falling Boulder" Ability { id: "25D2", source: "Hashmal, Bringer of Order" } # Starts roughly after Sand Sphere adds are dead, guessing at this natural time if To Dust goes off -1480.6 "--sync--" StartsUsing { id: "(25CE|25D0)", source: "Hashmal, Bringer of Order" } window 40,40 -1486.6 "Extreme Edge" Ability { id: "(25CE|25D0)", source: "Hashmal, Bringer of Order" } +1480.6 "--sync--" StartsUsing { id: ["25CE", "25D0"], source: "Hashmal, Bringer of Order" } window 40,40 +1486.6 "Extreme Edge" Ability { id: ["25CE", "25D0"], source: "Hashmal, Bringer of Order" } 1489.1 "Falling Rock" Ability { id: "25D3", source: "Hashmal, Bringer of Order" } 1499.3 "Quake IV" Ability { id: "25D8", source: "Hashmal, Bringer of Order" } 1508.5 "Rock Cutter" Ability { id: "25D7", source: "Hashmal, Bringer of Order" } @@ -162,7 +162,7 @@ hideall "--start--" 1543.1 "Towerfall" #Ability { id: "25C4", source: "Control Tower" } 1545.3 "--untargetable--" # ??? from video 1549.6 "Jagged Edge 1" #Ability { id: "25CD", source: "Hashmal, Bringer of Order" } -1549.9 "Extreme Edge" #Ability { id: "(25CE|25D0)", source: "Hashmal, Bringer of Order" } +1549.9 "Extreme Edge" #Ability { id: ["25CE", "25D0"], source: "Hashmal, Bringer of Order" } 1551.7 "Jagged Edge 2" #Ability { id: "25CD", source: "Hashmal, Bringer of Order" } 1553.7 "Jagged Edge 3" #Ability { id: "25CD", source: "Hashmal, Bringer of Order" } 1556.8 "--targetable--" # ??? from video @@ -216,8 +216,8 @@ hideall "--start--" # => variable time turning off the lights # Seen 2734 only once in the loop fflogs link below. -2700.0 "--sync--" StartsUsing { id: "(2734|2726)", source: "Rofocale" } window 160,0 -2706.0 "Maverick" Ability { id: "(2734|2726)", source: "Rofocale" } +2700.0 "--sync--" StartsUsing { id: ["2734", "2726"], source: "Rofocale" } window 160,0 +2706.0 "Maverick" Ability { id: ["2734", "2726"], source: "Rofocale" } 2716.9 "Crush Helm" Ability { id: "2680", source: "Rofocale" } 2726.3 "Embrace" Ability { id: "2685", source: "Rofocale" } 2735.5 "Maverick" Ability { id: "2689", source: "Rofocale" } @@ -230,8 +230,8 @@ hideall "--start--" 2779.1 "Dark Geas" Ability { id: "2688", source: "Rofocale" } # => variable time turning off the lights -2900.0 "--sync--" StartsUsing { id: "(2734|2726)", source: "Rofocale" } window 160,0 -2906.0 "Maverick" Ability { id: "(2734|2726)", source: "Rofocale" } +2900.0 "--sync--" StartsUsing { id: ["2734", "2726"], source: "Rofocale" } window 160,0 +2906.0 "Maverick" Ability { id: ["2734", "2726"], source: "Rofocale" } 2917.3 "Crush Weapon x4" Ability { id: "2683", source: "Rofocale" } 2924.2 "Trample" Ability { id: "2676", source: "Rofocale" } 2931.0 "Cry Of Victory" Ability { id: "274C", source: "Rofocale" } @@ -351,9 +351,9 @@ hideall "--start--" # (probably, based on https://www.fflogs.com/reports/8Wmfp6FZ72DtcjKn#fight=last at hp=67%) ## Phase 3: ~45% (can push early) -4795.0 "Mask Of Truth/Mask Of Lies" Ability { id: "(2619|261A)", source: "Argath Thadalfus" } window 100,10 +4795.0 "Mask Of Truth/Mask Of Lies" Ability { id: ["2619", "261A"], source: "Argath Thadalfus" } window 100,10 4803.0 "The Word" Ability { id: "24A0", source: "Argath Thadalfus" } -4813.6 "Mask Of Truth/Mask Of Lies" Ability { id: "(2619|261A)", source: "Argath Thadalfus" } +4813.6 "Mask Of Truth/Mask Of Lies" Ability { id: ["2619", "261A"], source: "Argath Thadalfus" } 4821.8 "The Word" Ability { id: "24A0", source: "Argath Thadalfus" } 4828.8 "Judgment Blade?" Ability { id: "2629", source: "Argath Thadalfus" } window 100,100 jump 5000 4830.7 "Gnawing Dread?" Ability { id: "2621", source: "Argath Thadalfus" } window 100,100 jump 5300 @@ -372,9 +372,9 @@ hideall "--start--" 5058.6 "Rail Of The Rat 2" Ability { id: "2624", source: "Argath Thadalfus" } 5061.6 "Rail Of The Rat 3" Ability { id: "2624", source: "Argath Thadalfus" } 5065.8 "Soulfix" Ability { id: "262A", source: "Argath Thadalfus" } -5076.4 "Mask Of Truth/Mask Of Lies" Ability { id: "(2619|261A)", source: "Argath Thadalfus" } +5076.4 "Mask Of Truth/Mask Of Lies" Ability { id: ["2619", "261A"], source: "Argath Thadalfus" } 5084.5 "The Word" Ability { id: "24A0", source: "Argath Thadalfus" } -5095.0 "Mask Of Truth/Mask Of Lies" Ability { id: "(2619|261A)", source: "Argath Thadalfus" } +5095.0 "Mask Of Truth/Mask Of Lies" Ability { id: ["2619", "261A"], source: "Argath Thadalfus" } 5103.1 "The Word" Ability { id: "24A0", source: "Argath Thadalfus" } 5112.0 "Gnawing Dread" Ability { id: "2621", source: "Argath Thadalfus" } 5114.1 "--sync--" Ability { id: "2625", source: "Argath Thadalfus" } @@ -389,9 +389,9 @@ hideall "--start--" 5197.1 "Crippling Blow" Ability { id: "262D", source: "Argath Thadalfus" } # loop -5207.2 "Mask Of Truth/Mask Of Lies" Ability { id: "(2619|261A)", source: "Argath Thadalfus" } window 100,100 jump 4795 +5207.2 "Mask Of Truth/Mask Of Lies" Ability { id: ["2619", "261A"], source: "Argath Thadalfus" } window 100,100 jump 4795 5215.3 "The Word" #Ability { id: "24A0", source: "Argath Thadalfus" } -5225.6 "Mask Of Truth/Mask Of Lies" #Ability { id: "(2619|261A)", source: "Argath Thadalfus" } +5225.6 "Mask Of Truth/Mask Of Lies" #Ability { id: ["2619", "261A"], source: "Argath Thadalfus" } 5233.7 "The Word" #Ability { id: "24A0", source: "Argath Thadalfus" } @@ -408,9 +408,9 @@ hideall "--start--" 5363.8 "Rail Of The Rat 2" Ability { id: "2624", source: "Argath Thadalfus" } 5366.9 "Rail Of The Rat 3" Ability { id: "2624", source: "Argath Thadalfus" } 5371.1 "Soulfix" Ability { id: "262A", source: "Argath Thadalfus" } -5384.3 "Mask Of Truth/Mask Of Lies" Ability { id: "(2619|261A)", source: "Argath Thadalfus" } +5384.3 "Mask Of Truth/Mask Of Lies" Ability { id: ["2619", "261A"], source: "Argath Thadalfus" } 5392.3 "The Word" Ability { id: "24A0", source: "Argath Thadalfus" } -5402.9 "Mask Of Truth/Mask Of Lies" Ability { id: "(2619|261A)", source: "Argath Thadalfus" } +5402.9 "Mask Of Truth/Mask Of Lies" Ability { id: ["2619", "261A"], source: "Argath Thadalfus" } 5411.1 "The Word" Ability { id: "24A0", source: "Argath Thadalfus" } 5418.0 "Judgment Blade" Ability { id: "2629", source: "Argath Thadalfus" } 5424.4 "Unrelenting" Ability { id: "262B", source: "Argath Thadalfus" } @@ -426,7 +426,7 @@ hideall "--start--" 5498.3 "Crippling Blow" Ability { id: "262D", source: "Argath Thadalfus" } # loop -5508.4 "Mask Of Truth/Mask Of Lies" Ability { id: "(2619|261A)", source: "Argath Thadalfus" } window 100,100 jump 4795 +5508.4 "Mask Of Truth/Mask Of Lies" Ability { id: ["2619", "261A"], source: "Argath Thadalfus" } window 100,100 jump 4795 5516.5 "The Word" #Ability { id: "24A0", source: "Argath Thadalfus" } -5526.8 "Mask Of Truth/Mask Of Lies" #Ability { id: "(2619|261A)", source: "Argath Thadalfus" } +5526.8 "Mask Of Truth/Mask Of Lies" #Ability { id: ["2619", "261A"], source: "Argath Thadalfus" } 5534.9 "The Word" #Ability { id: "24A0", source: "Argath Thadalfus" } diff --git a/ui/raidboss/data/04-sb/dungeon/drowned_city_of_skalla.txt b/ui/raidboss/data/04-sb/dungeon/drowned_city_of_skalla.txt index 0864f8245b..74173a2139 100644 --- a/ui/raidboss/data/04-sb/dungeon/drowned_city_of_skalla.txt +++ b/ui/raidboss/data/04-sb/dungeon/drowned_city_of_skalla.txt @@ -13,13 +13,13 @@ hideall "--sync--" 7.4 "Torpedo" Ability { id: "264F", source: "Kelpie" } window 7.4,5 15.0 "Rising Seas" Ability { id: "2650", source: "Kelpie" } 26.7 "Gallop" Ability { id: "2653", source: "Kelpie" } -37.0 "Hydro Pull/Hydro Push" Ability { id: "(2651|2652)", source: "Kelpie" } +37.0 "Hydro Pull/Hydro Push" Ability { id: ["2651", "2652"], source: "Kelpie" } 43.5 "Torpedo" Ability { id: "264F", source: "Kelpie" } 51.1 "Rising Seas" Ability { id: "2650", source: "Kelpie" } 62.7 "Bloody Puddle" Ability { id: "2654", source: "Kelpie" } 65.9 "Gallop" Ability { id: "2653", source: "Kelpie" } window 20,20 73.9 "Bubble Burst" Ability { id: "261B", source: "Hydrosphere" } -76.2 "Hydro Pull/Hydro Push" Ability { id: "(2651|2652)", source: "Kelpie" } +76.2 "Hydro Pull/Hydro Push" Ability { id: ["2651", "2652"], source: "Kelpie" } 92.6 "Rising Seas" Ability { id: "2650", source: "Kelpie" } # A near-perfect 50-second rotation @@ -28,7 +28,7 @@ hideall "--sync--" 117.3 "Bloody Puddle" Ability { id: "2654", source: "Kelpie" } 120.5 "Gallop" Ability { id: "2653", source: "Kelpie" } 128.6 "Bubble Burst" Ability { id: "261B", source: "Hydrosphere" } -130.7 "Hydro Pull/Hydro Push" Ability { id: "(2651|2652)", source: "Kelpie" } +130.7 "Hydro Pull/Hydro Push" Ability { id: ["2651", "2652"], source: "Kelpie" } 152.2 "Torpedo" Ability { id: "264F", source: "Kelpie" } window 20,20 jump 102.2 157.8 "Rising Seas" @@ -106,33 +106,33 @@ hideall "--sync--" 2046.7 "Ring Of Chaos" Ability { id: "2667", source: "Hrodric Poisontongue" } 2052.2 "Eye Of The Fire" Ability { id: "2665", source: "Hrodric Poisontongue" } window 2052.2,10 2057.9 "--sync--" Ability { id: "2666", source: "Hrodric Poisontongue" } -2063.0 "Cross Of Chaos/Circle Of Chaos" Ability { id: "(2668|2669)", source: "Hrodric Poisontongue" } +2063.0 "Cross Of Chaos/Circle Of Chaos" Ability { id: ["2668", "2669"], source: "Hrodric Poisontongue" } 2068.7 "Words Of Woe" Ability { id: "2662", source: "Hrodric Poisontongue" } 2074.4 "Words Of Woe" Ability { id: "2662", source: "Hrodric Poisontongue" } 2080.2 "Words Of Woe" Ability { id: "2662", source: "Hrodric Poisontongue" } 2087.9 "--sync--" Ability { id: "2666", source: "Hrodric Poisontongue" } window 15,2.5 # Solo/duo runners will see only one or two lasers -2093.0 "Ring Of Chaos/Cross Of Chaos" Ability { id: "(2667|2668)", source: "Hrodric Poisontongue" } +2093.0 "Ring Of Chaos/Cross Of Chaos" Ability { id: ["2667", "2668"], source: "Hrodric Poisontongue" } 2095.5 "--sync--" Ability { id: "2666", source: "Hrodric Poisontongue" } 2100.6 "Ring Of Chaos" Ability { id: "2667", source: "Hrodric Poisontongue" } 2103.0 "Tail Drive" Ability { id: "2663", source: "Hrodric Poisontongue" } 2115.6 "The Spin" Ability { id: "2664", source: "Hrodric Poisontongue" } window 30,30 2126.3 "Rusting Claw" Ability { id: "2661", source: "Hrodric Poisontongue" } 2132.0 "--sync--" Ability { id: "2666", source: "Hrodric Poisontongue" } -2137.1 "Cross Of Chaos/Circle Of Chaos" Ability { id: "(2668|2669)", source: "Hrodric Poisontongue" } +2137.1 "Cross Of Chaos/Circle Of Chaos" Ability { id: ["2668", "2669"], source: "Hrodric Poisontongue" } 2139.6 "--sync--" Ability { id: "2666", source: "Hrodric Poisontongue" } 2144.7 "Ring Of Chaos" Ability { id: "2667", source: "Hrodric Poisontongue" } 2145.2 "Eye Of The Fire" Ability { id: "2665", source: "Hrodric Poisontongue" } window 30,30 2155.8 "Rusting Claw" Ability { id: "2661", source: "Hrodric Poisontongue" } 2166.4 "Tail Drive" Ability { id: "2663", source: "Hrodric Poisontongue" } 2174.1 "--sync--" Ability { id: "2666", source: "Hrodric Poisontongue" } -2179.2 "Ring Of Chaos/Circle Of Chaos" Ability { id: "(2667|2669)", source: "Hrodric Poisontongue" } +2179.2 "Ring Of Chaos/Circle Of Chaos" Ability { id: ["2667", "2669"], source: "Hrodric Poisontongue" } 2181.7 "--sync--" Ability { id: "2666", source: "Hrodric Poisontongue" } 2186.8 "Cross Of Chaos" Ability { id: "2668", source: "Hrodric Poisontongue" } 2187.5 "Words Of Woe" Ability { id: "2662", source: "Hrodric Poisontongue" } 2195.2 "--sync--" Ability { id: "2666", source: "Hrodric Poisontongue" } -2200.3 "Ring Of Chaos/Cross Of Chaos" Ability { id: "(2667|2668)", source: "Hrodric Poisontongue" } jump 2093.0 +2200.3 "Ring Of Chaos/Cross Of Chaos" Ability { id: ["2667", "2668"], source: "Hrodric Poisontongue" } jump 2093.0 2202.8 "--sync--" 2207.9 "Ring Of Chaos" 2210.3 "Tail Drive" diff --git a/ui/raidboss/data/04-sb/dungeon/ghimlyt_dark.txt b/ui/raidboss/data/04-sb/dungeon/ghimlyt_dark.txt index 6df3b050ec..6472172b00 100644 --- a/ui/raidboss/data/04-sb/dungeon/ghimlyt_dark.txt +++ b/ui/raidboss/data/04-sb/dungeon/ghimlyt_dark.txt @@ -57,7 +57,7 @@ hideall "--sync--" 1056.2 "Unbreakable Cermet Drill" Ability { id: "3459", source: "Prometheus" } window 30,30 1068.3 "Needle Gun" Ability { id: "345A", source: "Prometheus" } -1075.4 "Needle Gun/Oil Shower" Ability { id: "(345A|3456)", source: "Prometheus" } +1075.4 "Needle Gun/Oil Shower" Ability { id: ["345A", "3456"], source: "Prometheus" } 1086.4 "Nitrospin" Ability { id: "3455", source: "Prometheus" } 1097.8 "Freezing Missile (windup)" Ability { id: "345B", source: "Prometheus" } 1100.4 "--untargetable--" diff --git a/ui/raidboss/data/04-sb/dungeon/ghimlyt_dark64.txt b/ui/raidboss/data/04-sb/dungeon/ghimlyt_dark64.txt index a171b276d6..981c0a36af 100644 --- a/ui/raidboss/data/04-sb/dungeon/ghimlyt_dark64.txt +++ b/ui/raidboss/data/04-sb/dungeon/ghimlyt_dark64.txt @@ -57,7 +57,7 @@ hideall "--sync--" 1056.2 "Unbreakable Cermet Drill" Ability { id: "3459", source: "Prometheus" } window 30,30 1068.3 "Needle Gun" Ability { id: "345A", source: "Prometheus" } -1075.4 "Needle Gun/Oil Shower" Ability { id: "(345A|3456)", source: "Prometheus" } +1075.4 "Needle Gun/Oil Shower" Ability { id: ["345A", "3456"], source: "Prometheus" } 1086.4 "Nitrospin" Ability { id: "3455", source: "Prometheus" } 1097.8 "Freezing Missile (windup)" Ability { id: "345B", source: "Prometheus" } 1100.4 "--untargetable--" diff --git a/ui/raidboss/data/04-sb/eureka/eureka_hydatos.txt b/ui/raidboss/data/04-sb/eureka/eureka_hydatos.txt index 3ccc4d9635..d598b461af 100644 --- a/ui/raidboss/data/04-sb/eureka/eureka_hydatos.txt +++ b/ui/raidboss/data/04-sb/eureka/eureka_hydatos.txt @@ -267,14 +267,14 @@ hideall "--sync--" 5062.5 "Soak Attack" Ability { id: "37B6", source: "Ozma" } 5068.5 "Soak Attack" Ability { id: "37B6", source: "Ozma" } -5070.5 "Sphere Form" Ability { id: "(37B3|37A5|379F)", source: "Proto Ozma" } +5070.5 "Sphere Form" Ability { id: ["37B3", "37A5", "379F"], source: "Proto Ozma" } 5079.5 "Black Hole" Ability { id: "379D", source: "Proto Ozma" } -5092.5 "Random Shade" Ability { id: "(37A4|37B2|379E)", source: "Ozmashade" } -5099.5 "--sync--" Ability { id: "(37A6|37B4|37A0)", source: "Ozmashade" } -5101.0 "Shade Ability" # Ability { id: "(37A7|37B5|37A1)", source: "Shadow" } +5092.5 "Random Shade" Ability { id: ["37A4", "37B2", "379E"], source: "Ozmashade" } +5099.5 "--sync--" Ability { id: ["37A6", "37B4", "37A0"], source: "Ozmashade" } +5101.0 "Shade Ability" # Ability { id: ["37A7", "37B5", "37A1"], source: "Shadow" } -5121.5 "Random Shade" Ability { id: "(37A4|37B2|379E)", source: "Ozmashade" } +5121.5 "Random Shade" Ability { id: ["37A4", "37B2", "379E"], source: "Ozmashade" } # fake loop 5125.5 "Random Form" @@ -293,8 +293,8 @@ hideall "--sync--" ### Pyramid Phase 5300.0 "Pyramid Form" Ability { id: "37A4", source: "Proto Ozma" } window 800,800 -5303.0 "--sync--" Ability { id: "(37A6|37B4|37A0)", source: "Ozmashade" } -5304.5 "Shade Ability" # Ability { id: "(37A7|37B5|37A1)", source: "Shadow" } +5303.0 "--sync--" Ability { id: ["37A6", "37B4", "37A0"], source: "Ozmashade" } +5304.5 "Shade Ability" # Ability { id: ["37A7", "37B5", "37A1"], source: "Shadow" } 5307.0 "--sync--" Ability { id: "37A6", source: "Proto Ozma" } 5308.7 "Execration" Ability { id: "37A7", source: "Ozma" } @@ -307,18 +307,18 @@ hideall "--sync--" 5337.0 "Bleed Attack" Ability { id: "37AD", source: "Ozma" } 5343.0 "Bleed Attack" Ability { id: "37AD", source: "Ozma" } -5346.0 "Random Shade" Ability { id: "(37A4|37B2|379E)", source: "Ozmashade" } +5346.0 "Random Shade" Ability { id: ["37A4", "37B2", "379E"], source: "Ozmashade" } 5349.0 "Acceleration Bomb" Ability { id: "37AA", source: "Proto Ozma" } -5353.0 "--sync--" Ability { id: "(37A6|37B4|37A0)", source: "Ozmashade" } -5354.5 "Shade Ability" # Ability { id: "(37A7|37B5|37A1)", source: "Shadow" } +5353.0 "--sync--" Ability { id: ["37A6", "37B4", "37A0"], source: "Ozmashade" } +5354.5 "Shade Ability" # Ability { id: ["37A7", "37B5", "37A1"], source: "Shadow" } 5364.0 "Meteor (Stack)" Ability { id: "37A8", source: "Ozma" } 5370.0 "Bleed Attack" Ability { id: "37AD", source: "Ozma" } -5373.0 "Sphere Form" Ability { id: "(37B3|37A5|379F)", source: "Proto Ozma" } +5373.0 "Sphere Form" Ability { id: ["37B3", "37A5", "379F"], source: "Proto Ozma" } 5382.0 "Black Hole" Ability { id: "379D", source: "Proto Ozma" } -5395.0 "Random Shade" Ability { id: "(37A4|37B2|379E)", source: "Ozmashade" } +5395.0 "Random Shade" Ability { id: ["37A4", "37B2", "379E"], source: "Ozmashade" } # fake loop 5399.0 "Random Form" @@ -338,8 +338,8 @@ hideall "--sync--" ### Cube Phase 5600.0 "Cube Form" Ability { id: "379E", source: "Proto Ozma" } window 800,800 -5603.0 "--sync--" Ability { id: "(37A6|37B4|37A0)", source: "Ozmashade" } -5604.5 "Shade Ability" # Ability { id: "(37A7|37B5|37A1)", source: "Shadow" } +5603.0 "--sync--" Ability { id: ["37A6", "37B4", "37A0"], source: "Ozmashade" } +5604.5 "Shade Ability" # Ability { id: ["37A7", "37B5", "37A1"], source: "Shadow" } 5607.0 "--sync--" Ability { id: "37A0", source: "Proto Ozma" } 5608.5 "Flare Star" Ability { id: "37A1", source: "Ozma" } @@ -347,16 +347,16 @@ hideall "--sync--" 5619.0 "Meteor (Stack)" Ability { id: "37A8", source: "Ozma" } 5622.0 "Holy" Ability { id: "37A9", source: "Proto Ozma" } -5649.0 "Random Shade" Ability { id: "(37A4|37B2|379E)", source: "Ozmashade" } +5649.0 "Random Shade" Ability { id: ["37A4", "37B2", "379E"], source: "Ozmashade" } 5655.0 "Meteor (Stack)" Ability { id: "37A8", source: "Ozma" } 5656.0 "Holy" Ability { id: "37A9", source: "Proto Ozma" } -5656.0 "--sync--" Ability { id: "(37A6|37B4|37A0)", source: "Ozmashade" } -5657.5 "Shade Ability" # Ability { id: "(37A7|37B5|37A1)", source: "Shadow" } +5656.0 "--sync--" Ability { id: ["37A6", "37B4", "37A0"], source: "Ozmashade" } +5657.5 "Shade Ability" # Ability { id: ["37A7", "37B5", "37A1"], source: "Shadow" } -5673.0 "Sphere Form" Ability { id: "(37B3|37A5|379F)", source: "Proto Ozma" } +5673.0 "Sphere Form" Ability { id: ["37B3", "37A5", "379F"], source: "Proto Ozma" } 5682.0 "Black Hole" Ability { id: "379D", source: "Proto Ozma" } -5695.0 "Random Shade" Ability { id: "(37A4|37B2|379E)", source: "Ozmashade" } +5695.0 "Random Shade" Ability { id: ["37A4", "37B2", "379E"], source: "Ozmashade" } # fake loop 5699.0 "Random Form" @@ -375,8 +375,8 @@ hideall "--sync--" ### Star Phase 5900.0 "Star Form" Ability { id: "37B2", source: "Proto Ozma" } window 800,800 -5903.0 "--sync--" Ability { id: "(37A6|37B4|37A0)", source: "Ozmashade" } -5904.5 "Shade Ability" # Ability { id: "(37A7|37B5|37A1)", source: "Shadow" } +5903.0 "--sync--" Ability { id: ["37A6", "37B4", "37A0"], source: "Ozmashade" } +5904.5 "Shade Ability" # Ability { id: ["37A7", "37B5", "37A1"], source: "Shadow" } 5907.0 "--sync--" Ability { id: "37B4", source: "Proto Ozma" } 5908.0 "Mourning Star" Ability { id: "37B5", source: "Ozma" } 5911.0 "Soak Attack" Ability { id: "37B6", source: "Ozma" } @@ -386,18 +386,18 @@ hideall "--sync--" 5938.0 "Soak Attack" Ability { id: "37B6", source: "Ozma" } 5944.0 "Soak Attack" Ability { id: "37B6", source: "Ozma" } -5949.0 "Random Shade" Ability { id: "(37A4|37B2|379E)", source: "Ozmashade" } +5949.0 "Random Shade" Ability { id: ["37A4", "37B2", "379E"], source: "Ozmashade" } 5954.0 "Shooting Star" Ability { id: "37B7", source: "Proto Ozma" } -5956.0 "--sync--" Ability { id: "(37A6|37B4|37A0)", source: "Ozmashade" } -5957.5 "Shade Ability" # Ability { id: "(37A7|37B5|37A1)", source: "Shadow" } +5956.0 "--sync--" Ability { id: ["37A6", "37B4", "37A0"], source: "Ozmashade" } +5957.5 "Shade Ability" # Ability { id: ["37A7", "37B5", "37A1"], source: "Shadow" } 5959.0 "Soak Attack" Ability { id: "37B6", source: "Ozma" } 5959.0 "Soak Attack" Ability { id: "37B6", source: "Ozma" } 5965.0 "Soak Attack" Ability { id: "37B6", source: "Ozma" } -5973.0 "Sphere Form" Ability { id: "(37B3|37A5|379F)", source: "Proto Ozma" } +5973.0 "Sphere Form" Ability { id: ["37B3", "37A5", "379F"], source: "Proto Ozma" } 5982.0 "Black Hole" Ability { id: "379D", source: "Proto Ozma" } -5995.0 "Random Shade" Ability { id: "(37A4|37B2|379E)", source: "Ozmashade" } +5995.0 "Random Shade" Ability { id: ["37A4", "37B2", "379E"], source: "Ozmashade" } # fake loop 5999.0 "Random Form" diff --git a/ui/raidboss/data/04-sb/raid/o4s.txt b/ui/raidboss/data/04-sb/raid/o4s.txt index 94a86660a0..e7ae72d8c9 100644 --- a/ui/raidboss/data/04-sb/raid/o4s.txt +++ b/ui/raidboss/data/04-sb/raid/o4s.txt @@ -95,14 +95,14 @@ hideall "--sync--" 1045.8 "--untargetable--" 1048.9 "--targetable--" 1053.7 "Flood Of Naught (charge)" Ability { id: "2416", source: "Neo Exdeath" } -1061.7 "Flood Of Naught (colors)" Ability { id: "(2411|2412)", source: "Neo Exdeath" } +1061.7 "Flood Of Naught (colors)" Ability { id: ["2411", "2412"], source: "Neo Exdeath" } 1073.2 "Double Attack" Ability { id: "241C", source: "Neo Exdeath" } 1083.8 "Emptiness x8" Ability { id: "2420", source: "Neo Exdeath" } duration 10 -1091.8 "Flood Of Naught (lasers)" Ability { id: "(240E|240F)", source: "Neo Exdeath" } +1091.8 "Flood Of Naught (lasers)" Ability { id: ["240E", "240F"], source: "Neo Exdeath" } 1101.9 "Aero III" Ability { id: "2419", source: "Neo Exdeath" } 1116.0 "Grand Cross Delta" Ability { id: "242C", source: "Neo Exdeath" } window 116,10 -1129.0 "Flood Of Naught (colors/lasers)" Ability { id: "(2411|2412|240E|240F)", source: "Neo Exdeath" } +1129.0 "Flood Of Naught (colors/lasers)" Ability { id: ["2411", "2412", "240E", "240F"], source: "Neo Exdeath" } 1138.0 "Almagest" Ability { id: "2417", source: "Neo Exdeath" } 1149.1 "Aero III" Ability { id: "2419", source: "Neo Exdeath" } 1158.9 "Earth Shaker" Ability { id: "241A", source: "Neo Exdeath" } @@ -113,10 +113,10 @@ hideall "--sync--" 1192.4 "Flare" Ability { id: "2401", source: "Neo Exdeath" } 1192.4 "Holy" Ability { id: "2403", source: "Neo Exdeath" } 1192.8 "--targetable--" -1197.6 "Flood Of Naught (lasers)" Ability { id: "(240E|240F)", source: "Neo Exdeath" } +1197.6 "Flood Of Naught (lasers)" Ability { id: ["240E", "240F"], source: "Neo Exdeath" } 1211.6 "Meteor" Ability { id: "2424", source: "Neo Exdeath" } 1212.3 "--adds targetable--" -1224.7 "Flood Of Naught (colors)" Ability { id: "(2411|2412)", source: "Neo Exdeath" } +1224.7 "Flood Of Naught (colors)" Ability { id: ["2411", "2412"], source: "Neo Exdeath" } 1237.4 "Charybdis" Ability { id: "2423", source: "Neo Exdeath" } 1244.9 "Double Attack" Ability { id: "241C", source: "Neo Exdeath" } 1260.4 "Almagest" Ability { id: "2417", source: "Neo Exdeath" } @@ -128,7 +128,7 @@ hideall "--sync--" 1289.6 "--untargetable--" 1292.7 "--targetable--" 1297.5 "Flood Of Naught (charge)" Ability { id: "2416", source: "Neo Exdeath" } -1305.5 "Flood Of Naught (colors)" Ability { id: "(2411|2412)", source: "Neo Exdeath" } +1305.5 "Flood Of Naught (colors)" Ability { id: ["2411", "2412"], source: "Neo Exdeath" } 1322.5 "Delta Attack" Ability { id: "241E", source: "Neo Exdeath" } 1323.0 "Blizzard III" # Ability { id: "23F8", source: "Neo Exdeath" } 1323.2 "Thunder III" # Ability { id: "23FA", source: "Neo Exdeath" } @@ -136,24 +136,24 @@ hideall "--sync--" 1324.2 "Thunder III" # Ability { id: "23FA", source: "Neo Exdeath" } 1326.0 "Blizzard III" # Ability { id: "23F8", source: "Neo Exdeath" } 1326.5 "Fire III" # Ability { id: "23F6", source: "Neo Exdeath" } -1330.5 "Flood Of Naught (lasers)" Ability { id: "(240E|240F)", source: "Neo Exdeath" } +1330.5 "Flood Of Naught (lasers)" Ability { id: ["240E", "240F"], source: "Neo Exdeath" } 1339.5 "Grand Cross Omega" Ability { id: "242D", source: "Neo Exdeath" } window 340,10 1345.5 "--untargetable--" 1346.5 "The Final Battle" Ability { id: "242A", source: "Neo Exdeath" } -1354.6 "Flood Of Naught (colors/lasers)" Ability { id: "(2411|2412|240E|240F)", source: "Neo Exdeath" } -1359.6 "Flood Of Naught (colors/lasers)" Ability { id: "(2411|2412|240E|240F)", source: "Neo Exdeath" } -1365.6 "Flood Of Naught (lasers)" Ability { id: "(240E|240F)", source: "Neo Exdeath" } +1354.6 "Flood Of Naught (colors/lasers)" Ability { id: ["2411", "2412", "240E", "240F"], source: "Neo Exdeath" } +1359.6 "Flood Of Naught (colors/lasers)" Ability { id: ["2411", "2412", "240E", "240F"], source: "Neo Exdeath" } +1365.6 "Flood Of Naught (lasers)" Ability { id: ["240E", "240F"], source: "Neo Exdeath" } 1371.7 "--targetable--" 1378.1 "Flood Of Naught (charge)" Ability { id: "2416", source: "Neo Exdeath" } 1389.1 "Almagest" Ability { id: "2417", source: "Neo Exdeath" } 1396.3 "Emptiness x8" Ability { id: "2420", source: "Neo Exdeath" } duration 10 -1404.4 "Flood Of Naught" Ability { id: "(2411|2412|240E|240F)", source: "Neo Exdeath" } +1404.4 "Flood Of Naught" Ability { id: ["2411", "2412", "240E", "240F"], source: "Neo Exdeath" } 1414.6 "Aero III" Ability { id: "2419", source: "Neo Exdeath" } 1428.6 "Grand Cross Delta" Ability { id: "242C", source: "Neo Exdeath" } window 90,10 -1441.6 "Flood Of Naught (colors/lasers)" Ability { id: "(2411|2412|240E|240F)", source: "Neo Exdeath" } +1441.6 "Flood Of Naught (colors/lasers)" Ability { id: ["2411", "2412", "240E", "240F"], source: "Neo Exdeath" } 1450.6 "Almagest" Ability { id: "2417", source: "Neo Exdeath" } 1461.6 "Aero III" Ability { id: "2419", source: "Neo Exdeath" } 1471.3 "Earth Shaker" Ability { id: "241A", source: "Neo Exdeath" } @@ -164,10 +164,10 @@ hideall "--sync--" 1504.8 "Flare" Ability { id: "2401", source: "Neo Exdeath" } 1504.8 "Holy" Ability { id: "2403", source: "Neo Exdeath" } 1505.2 "--targetable--" -1509.8 "Flood Of Naught (lasers)" Ability { id: "(240E|240F)", source: "Neo Exdeath" } +1509.8 "Flood Of Naught (lasers)" Ability { id: ["240E", "240F"], source: "Neo Exdeath" } 1523.8 "Meteor" Ability { id: "2424", source: "Neo Exdeath" } 1524.5 "--adds targetable--" -1536.8 "Flood Of Naught (colors)" Ability { id: "(2411|2412)", source: "Neo Exdeath" } +1536.8 "Flood Of Naught (colors)" Ability { id: ["2411", "2412"], source: "Neo Exdeath" } 1549.8 "Charybdis" Ability { id: "2423", source: "Neo Exdeath" } 1557.3 "Double Attack" Ability { id: "241C", source: "Neo Exdeath" } 1572.8 "Almagest" Ability { id: "2417", source: "Neo Exdeath" } @@ -179,7 +179,7 @@ hideall "--sync--" 1602.0 "--untargetable--" 1605.3 "--targetable--" 1609.9 "Flood Of Naught (charge)" Ability { id: "2416", source: "Neo Exdeath" } -1617.9 "Flood Of Naught (colors)" Ability { id: "(2411|2412)", source: "Neo Exdeath" } +1617.9 "Flood Of Naught (colors)" Ability { id: ["2411", "2412"], source: "Neo Exdeath" } 1634.9 "Delta Attack" Ability { id: "241E", source: "Neo Exdeath" } 1635.4 "Blizzard III" # Ability { id: "23F8", source: "Neo Exdeath" } 1635.6 "Thunder III" # Ability { id: "23FA", source: "Neo Exdeath" } @@ -187,7 +187,7 @@ hideall "--sync--" 1636.6 "Thunder III" # Ability { id: "23FA", source: "Neo Exdeath" } 1638.4 "Blizzard III" # Ability { id: "23F8", source: "Neo Exdeath" } 1638.9 "Fire III" # Ability { id: "23F6", source: "Neo Exdeath" } -1642.9 "Flood Of Naught (lasers)" Ability { id: "(240E|240F)", source: "Neo Exdeath" } +1642.9 "Flood Of Naught (lasers)" Ability { id: ["240E", "240F"], source: "Neo Exdeath" } 1652.1 "Neverwhere" Ability { id: "2426", source: "Neo Exdeath" } window 652.1,10 1660.2 "Charybdis" Ability { id: "2423", source: "Neo Exdeath" } diff --git a/ui/raidboss/data/04-sb/raid/o7s.txt b/ui/raidboss/data/04-sb/raid/o7s.txt index 2860aed4ea..ed3e282e9d 100644 --- a/ui/raidboss/data/04-sb/raid/o7s.txt +++ b/ui/raidboss/data/04-sb/raid/o7s.txt @@ -91,7 +91,7 @@ hideall "--sync--" 499 "Diffractive Plasma" Ability { id: "278B", source: "Guardian" } # Divergence point -509 "Load/Skip?" Ability { id: "(275C|2773)", source: "Guardian" } +509 "Load/Skip?" Ability { id: ["275C", "2773"], source: "Guardian" } 510 "--sync--" GainsEffect { effectId: "5D4", effect: "Bibliotaph Simulation", target: "Guardian" } jump 2510 # Bibliotaph buff, jump to A1 510 "--sync--" GainsEffect { effectId: "5D3", effect: "Dadaluma Simulation", target: "Guardian" } jump 3510 # Dadaluma buff, jump to A2 512 "Shockwave?" @@ -102,7 +102,7 @@ hideall "--sync--" ######################################################## # Bibliotaph -2509 "Load Biblio" Ability { id: "(275C|2773)", source: "Guardian" } +2509 "Load Biblio" Ability { id: ["275C", "2773"], source: "Guardian" } 2518 "Radar" duration 2 2519 "Demon Simulation" Ability { id: "2B36", source: "Guardian" } 2532 "Run Biblio" Ability { id: "276F", source: "Guardian" } @@ -114,7 +114,7 @@ hideall "--sync--" 2579 "Diffractive Plasma" Ability { id: "278B", source: "Guardian" } # Dadaluma -2590 "Load Dada" Ability { id: "(275C|2774)", source: "Guardian" } +2590 "Load Dada" Ability { id: ["275C", "2774"], source: "Guardian" } 2593 "Shockwave" Ability { id: "2783", source: "Guardian" } 2597 "Radar" duration 2 2603 "Missile Simulation" Ability { id: "2764", source: "Guardian" } @@ -123,7 +123,7 @@ hideall "--sync--" 2629 "Prey" Ability { id: "278A", source: "Guardian" } 2635 "Magitek Ray" Ability { id: "2788", source: "Guardian" } 2643 "Diffractive Plasma" Ability { id: "278B", source: "Guardian" } -2648 "--sync--" StartsUsing { id: "(275C|2773)", source: "Guardian" } jump 648 # Load/Skip starts casting, return to A +2648 "--sync--" StartsUsing { id: ["275C", "2773"], source: "Guardian" } jump 648 # Load/Skip starts casting, return to A # Should be unreachable, only here for visual continuity before/after jump 2653 "Load Air Force" @@ -135,7 +135,7 @@ hideall "--sync--" #### Divergent path, Version A2: Dadaluma->Biblio # Dadaluma -3509 "Load Dada" Ability { id: "(275C|2773)", source: "Guardian" } +3509 "Load Dada" Ability { id: ["275C", "2773"], source: "Guardian" } 3512 "Shockwave" Ability { id: "2783", source: "Guardian" } 3516 "Radar" duration 2 3522 "Missile Simulation" Ability { id: "2764", source: "Guardian" } @@ -146,7 +146,7 @@ hideall "--sync--" 3562 "Diffractive Plasma" Ability { id: "278B", source: "Guardian" } # Bibliotaph -3572 "Load Biblio" Ability { id: "(275C|2774)", source: "Guardian" } +3572 "Load Biblio" Ability { id: ["275C", "2774"], source: "Guardian" } 3581 "Radar" duration 2 3582 "Demon Simulation" Ability { id: "2B36", source: "Guardian" } 3595 "Run Biblio" Ability { id: "276F", source: "Guardian" } @@ -156,7 +156,7 @@ hideall "--sync--" 3624 "Prey" Ability { id: "278A", source: "Guardian" } 3633 "Magitek Ray" Ability { id: "2788", source: "Guardian" } 3642 "Diffractive Plasma" Ability { id: "278B", source: "Guardian" } -3648 "--sync--" StartsUsing { id: "(275C|2773)", source: "Guardian" } jump 648 # Load/Skip starts casting, return to A +3648 "--sync--" StartsUsing { id: ["275C", "2773"], source: "Guardian" } jump 648 # Load/Skip starts casting, return to A # Should be unreachable, only here for visual continuity before/after jump 3653 "Load Air Force" @@ -171,7 +171,7 @@ hideall "--sync--" ########################################################## # Air Force -653 "Load Air Force" Ability { id: "(275C|2773)", source: "Guardian" } +653 "Load Air Force" Ability { id: ["275C", "2773"], source: "Guardian" } 656 "Diffractive Laser" Ability { id: "2780", source: "Guardian" } 659 "Radar" duration 2 666 "Diffractive Plasma" Ability { id: "278B", source: "Guardian" } @@ -273,7 +273,7 @@ hideall "--sync--" 1470 "Diffractive Plasma" Ability { id: "278B", source: "Guardian" } # Divergence point -1481 "Load/Skip?" Ability { id: "(275C|2773)", source: "Guardian" } +1481 "Load/Skip?" Ability { id: ["275C", "2773"], source: "Guardian" } 1482 "--sync--" GainsEffect { effectId: "5D4", effect: "Bibliotaph Simulation", target: "Guardian" } jump 4482 # Bibliotaph buff, jump to B1 1482 "--sync--" GainsEffect { effectId: "5D3", effect: "Dadaluma Simulation", target: "Guardian" } jump 5482 # Dadaluma buff, jump to B2 1484 "Shockwave?" @@ -284,7 +284,7 @@ hideall "--sync--" ########################################################## # Bibliotaph -4481 "Load Biblio" Ability { id: "(275C|2773)", source: "Guardian" } +4481 "Load Biblio" Ability { id: ["275C", "2773"], source: "Guardian" } 4490 "Radar" duration 2 4491 "Demon Simulation" Ability { id: "2B36", source: "Guardian" } 4504 "Run Biblio" Ability { id: "276F", source: "Guardian" } @@ -296,7 +296,7 @@ hideall "--sync--" 4551 "Diffractive Plasma" Ability { id: "278B", source: "Guardian" } # Dadaluma -4562 "Load Dada" Ability { id: "(275C|2774)", source: "Guardian" } +4562 "Load Dada" Ability { id: ["275C", "2774"], source: "Guardian" } 4565 "Shockwave" Ability { id: "2783", source: "Guardian" } 4569 "Radar" duration 2 4575 "Missile Simulation" Ability { id: "2764", source: "Guardian" } @@ -305,7 +305,7 @@ hideall "--sync--" 4601 "Prey" Ability { id: "278A", source: "Guardian" } 4607 "Magitek Ray" Ability { id: "2788", source: "Guardian" } 4615 "Diffractive Plasma" Ability { id: "278B", source: "Guardian" } -4620 "--sync--" StartsUsing { id: "(275C|2773)", source: "Guardian" } jump 1620 # Load/Skip casting, return to B +4620 "--sync--" StartsUsing { id: ["275C", "2773"], source: "Guardian" } jump 1620 # Load/Skip casting, return to B # Should be unreachable, only here for visual continuity before/after jump 4625 "Load Ultros" @@ -319,7 +319,7 @@ hideall "--sync--" #### Divergent path, Version B2: Dadaluma -> Bibliotaph # Dadaluma -5481 "Load Dada" Ability { id: "(275C|2773)", source: "Guardian" } +5481 "Load Dada" Ability { id: ["275C", "2773"], source: "Guardian" } 5484 "Shockwave" Ability { id: "2783", source: "Guardian" } 5488 "Radar" duration 2 5494 "Missile Simulation" Ability { id: "2764", source: "Guardian" } @@ -330,7 +330,7 @@ hideall "--sync--" 5534 "Diffractive Plasma" Ability { id: "278B", source: "Guardian" } # Bibliotaph -5544 "Load Biblio" Ability { id: "(275C|2774)", source: "Guardian" } +5544 "Load Biblio" Ability { id: ["275C", "2774"], source: "Guardian" } 5553 "Radar" duration 2 5554 "Demon Simulation" Ability { id: "2B36", source: "Guardian" } 5567 "Run Biblio" Ability { id: "276F", source: "Guardian" } @@ -340,7 +340,7 @@ hideall "--sync--" 5596 "Prey" Ability { id: "278A", source: "Guardian" } 5605 "Magitek Ray" Ability { id: "2788", source: "Guardian" } 5614 "Diffractive Plasma" Ability { id: "278B", source: "Guardian" } -5620 "--sync--" StartsUsing { id: "(275C|2773)", source: "Guardian" } jump 1620 # Load/Skip casting, return to B +5620 "--sync--" StartsUsing { id: ["275C", "2773"], source: "Guardian" } jump 1620 # Load/Skip casting, return to B # Should be unreachable, only here for visual continuity before/after jump 5625 "Load Ultros" @@ -356,7 +356,7 @@ hideall "--sync--" ########################################################## # Ultros -1625 "Load Ultros" Ability { id: "(275C|2773)", source: "Guardian" } +1625 "Load Ultros" Ability { id: ["275C", "2773"], source: "Guardian" } 1626 "Ink" Ability { id: "277D", source: "Guardian" } 1633 "Tentacle Simulation" Ability { id: "275E", source: "Guardian" } 1637 "Tentacle" diff --git a/ui/raidboss/data/04-sb/raid/o8n.txt b/ui/raidboss/data/04-sb/raid/o8n.txt index 4f588dde41..958659f202 100644 --- a/ui/raidboss/data/04-sb/raid/o8n.txt +++ b/ui/raidboss/data/04-sb/raid/o8n.txt @@ -32,11 +32,11 @@ hideall "--sync--" 190 "Hyperdrive" Ability { id: "292E", source: "Kefka" } 204 "Graven Image" Ability { id: "2925", source: "Kefka" } -210 "Half Arena" Ability { id: "(292A|2929)", source: "Graven Image" } +210 "Half Arena" Ability { id: ["292A", "2929"], source: "Graven Image" } 218 "Ultima Upsurge" Ability { id: "292D", source: "Kefka" } 228 "Graven Image" Ability { id: "2925", source: "Kefka" } -234 "Half Arena" Ability { id: "(292A|2929)", source: "Graven Image" } +234 "Half Arena" Ability { id: ["292A", "2929"], source: "Graven Image" } 240 "Flagrant Fire" Ability { id: "291F", source: "Kefka" } 242 "Thrumming Thunder" Ability { id: "291(B|D)", source: "Kefka" } 248 "Timely Teleport" Ability { id: "2922", source: "Kefka" } diff --git a/ui/raidboss/data/04-sb/trial/lakshmi.txt b/ui/raidboss/data/04-sb/trial/lakshmi.txt index f20fa47718..3b935eea63 100644 --- a/ui/raidboss/data/04-sb/trial/lakshmi.txt +++ b/ui/raidboss/data/04-sb/trial/lakshmi.txt @@ -58,7 +58,7 @@ hideall "Alluring Arm" 1220.2 "--vril despawn--" 1221.6 "--chanchala end--" 1234.5 "Alluring Arm" Ability { id: "2488", source: "Lakshmi" } -1248.8 "Blissful Arrow/Spear" Ability { id: "(2489|2494)", source: "Lakshmi" } +1248.8 "Blissful Arrow/Spear" Ability { id: ["2489", "2494"], source: "Lakshmi" } 1256.8 "The Pull Of Light" Ability { id: "2492", source: "Lakshmi" } 1265.0 "Chanchala" Ability { id: "2484", source: "Lakshmi" } window 30,30 @@ -72,7 +72,7 @@ hideall "Alluring Arm" 1317.9 "Divine Denial" Ability { id: "2485", source: "Lakshmi" } window 30,30 1317.9 "--vril despawn--" 1332.1 "Alluring Arm" Ability { id: "2488", source: "Lakshmi" } -1346.4 "Blissful Arrow/Spear" Ability { id: "(248A|2495)", source: "Lakshmi" } +1346.4 "Blissful Arrow/Spear" Ability { id: ["248A", "2495"], source: "Lakshmi" } 1348.4 "The Pall Of Light" Ability { id: "2491", source: "Lakshmi" } window 30,30 1360.5 "The Pull Of Light" Ability { id: "2493", source: "Lakshmi" } 1360.9 "--chanchala end--" diff --git a/ui/raidboss/data/04-sb/trial/seiryu-ex.txt b/ui/raidboss/data/04-sb/trial/seiryu-ex.txt index f70e45e69f..b3ea0f51d1 100644 --- a/ui/raidboss/data/04-sb/trial/seiryu-ex.txt +++ b/ui/raidboss/data/04-sb/trial/seiryu-ex.txt @@ -43,17 +43,17 @@ hideall "--sync--" 504.3 "--rotate--" Ability { id: "37C4", source: "Seiryu" } 511.9 "Blazing Aramitama" Ability { id: "37E4", source: "Seiryu" } 515.9 "--jump--" Ability { id: "37D5", source: "Seiryu" } -#519.4 "In/Out" Ability { id: "(37DA|37D8)", source: "Seiryu" } -522.4 "In/Out" Ability { id: "(3A05|3A03)", source: "Seiryu" } -#524.9 "Out/In" Ability { id: "(37DB|37D9)", source: "Seiryu" } -525.4 "Out/In" Ability { id: "(3A06|3A04)", source: "Seiryu" } +#519.4 "In/Out" Ability { id: ["37DA", "37D8"], source: "Seiryu" } +522.4 "In/Out" Ability { id: ["3A05", "3A03"], source: "Seiryu" } +#524.9 "Out/In" Ability { id: ["37DB", "37D9"], source: "Seiryu" } +525.4 "Out/In" Ability { id: ["3A06", "3A04"], source: "Seiryu" } 531.9 "--rotate--" Ability { id: "37C4", source: "Seiryu" } 538.6 "Kuji-kiri" Ability { id: "37E1", source: "Seiryu" } 541.6 "--jump--" Ability { id: "37D5", source: "Seiryu" } -#545.1 "In/Out" Ability { id: "(37DA|37D8)", source: "Seiryu" } -548.1 "In/Out" Ability { id: "(3A05|3A03)", source: "Seiryu" } -#550.6 "Out/In" Ability { id: "(37DB|37D9)", source: "Seiryu" } -551.1 "Out/In" Ability { id: "(3A06|3A04)", source: "Seiryu" } +#545.1 "In/Out" Ability { id: ["37DA", "37D8"], source: "Seiryu" } +548.1 "In/Out" Ability { id: ["3A05", "3A03"], source: "Seiryu" } +#550.6 "Out/In" Ability { id: ["37DB", "37D9"], source: "Seiryu" } +551.1 "Out/In" Ability { id: ["3A06", "3A04"], source: "Seiryu" } 558.6 "Fifth Element" Ability { id: "37C3", source: "Seiryu" } 572.6 "Serpent Ascending" Ability { id: "3C25", source: "Seiryu" } 578.6 "Serpent Descending" Ability { id: "37DE", source: "Seiryu" } @@ -66,11 +66,11 @@ hideall "--sync--" 633.3 "Fifth Element" Ability { id: "37C3", source: "Seiryu" } 646.3 "Summon Shiki" Ability { id: "37CD", source: "Seiryu" } 652.3 "--jump--" Ability { id: "37D5", source: "Seiryu" } -#655.8 "In/Out" Ability { id: "(37DA|37D8)", source: "Seiryu" } +#655.8 "In/Out" Ability { id: ["37DA", "37D8"], source: "Seiryu" } 658.4 "100-tonze Swing" Ability { id: "37ED", source: "Iwa-no-shiki" } -658.8 "In/Out" Ability { id: "(3A05|3A03)", source: "Seiryu" } -#661.3 "Out/In" Ability { id: "(37DB|37D9)", source: "Seiryu" } -661.8 "Out/In" Ability { id: "(3A06|3A04)", source: "Seiryu" } +658.8 "In/Out" Ability { id: ["3A05", "3A03"], source: "Seiryu" } +#661.3 "Out/In" Ability { id: ["37DB", "37D9"], source: "Seiryu" } +661.8 "Out/In" Ability { id: ["3A06", "3A04"], source: "Seiryu" } 667.5 "Kanabo" Ability { id: "37EE", source: "Iwa-no-shiki" } 671.3 "--sync--" Ability { id: "37EF", source: "Seiryu" } 676.3 "Serpent Ascending" Ability { id: "37DC", source: "Seiryu" } @@ -86,10 +86,10 @@ hideall "--sync--" 716.5 "Force of Nature" Ability { id: "37EB", source: "Seiryu" } 719.1 "Coursing River" Ability { id: "37F6", source: "Seiryu" } 721.6 "--jump--" Ability { id: "37D5", source: "Seiryu" } -#725.1 "In/Out" Ability { id: "(37DA|37D8)", source: "Seiryu" } -728.1 "In/Out" Ability { id: "(3A05|3A03)", source: "Seiryu" } -#730.6 "Out/In" Ability { id: "(37DB|37D9)", source: "Seiryu" } -731.1 "Out/In" Ability { id: "(3A06|3A04)", source: "Seiryu" } +#725.1 "In/Out" Ability { id: ["37DA", "37D8"], source: "Seiryu" } +728.1 "In/Out" Ability { id: ["3A05", "3A03"], source: "Seiryu" } +#730.6 "Out/In" Ability { id: ["37DB", "37D9"], source: "Seiryu" } +731.1 "Out/In" Ability { id: ["3A06", "3A04"], source: "Seiryu" } 733.9 "Handprint" Ability { id: "37E8", source: "Seiryu" } 741.9 "Handprint" Ability { id: "37E8", source: "Seiryu" } 749.9 "Handprint" Ability { id: "37E8", source: "Seiryu" } @@ -103,10 +103,10 @@ hideall "--sync--" 807.8 "Cursekeeper" Ability { id: "37D2", source: "Seiryu" } 817.0 "Fifth Element" Ability { id: "37C3", source: "Seiryu" } 823.0 "--jump--" Ability { id: "37D5", source: "Seiryu" } -#826.5 "In/Out" Ability { id: "(37DA|37D8)", source: "Seiryu" } -829.5 "In/Out" Ability { id: "(3A05|3A03)", source: "Seiryu" } -#832.0 "Out/In" Ability { id: "(37DB|37D9)", source: "Seiryu" } -832.5 "Out/In" Ability { id: "(3A06|3A04)", source: "Seiryu" } +#826.5 "In/Out" Ability { id: ["37DA", "37D8"], source: "Seiryu" } +829.5 "In/Out" Ability { id: ["3A05", "3A03"], source: "Seiryu" } +#832.0 "Out/In" Ability { id: ["37DB", "37D9"], source: "Seiryu" } +832.5 "Out/In" Ability { id: ["3A06", "3A04"], source: "Seiryu" } 839.0 "Serpent Ascending" Ability { id: "3C25", source: "Seiryu" } 842.5 "--rotate--" Ability { id: "37C4", source: "Seiryu" } 845.0 "Serpent Descending" Ability { id: "37DE", source: "Seiryu" } diff --git a/ui/raidboss/data/04-sb/trial/shinryu-ex.txt b/ui/raidboss/data/04-sb/trial/shinryu-ex.txt index abebbec704..b389b61743 100644 --- a/ui/raidboss/data/04-sb/trial/shinryu-ex.txt +++ b/ui/raidboss/data/04-sb/trial/shinryu-ex.txt @@ -22,7 +22,7 @@ hideall "--sync--" 62.4 "Icicle Impact" Ability { id: "25EF", source: "Icicle" } 67.0 "Spikesicle" Ability { id: "25F0", source: "Icicle" } 67.9 "Tail Slap" Ability { id: "25E2", source: "Tail" } -79.8 "Hypernova / Levinbolt" Ability { id: "(25E8|25EA)", source: "Right Wing" } +79.8 "Hypernova / Levinbolt" Ability { id: ["25E8", "25EA"], source: "Right Wing" } 90.9 "Dragonfist" Ability { id: "2610", source: "Shinryu" } 97.8 "Ice Storm" Ability { id: "25F1", source: "Left Wing" } # sometimes 3 seconds earlier? 108.0 "Akh Morn 1" Ability { id: "25F3", source: "Shinryu" } duration 3.2 @@ -30,7 +30,7 @@ hideall "--sync--" 116.3 "Summon Icicle" Ability { id: "25EE", source: "Left Wing" } 116.9 "Icicle Impact" Ability { id: "25EF", source: "Icicle" } 121.4 "Spikesicle" Ability { id: "25F0", source: "Icicle" } -123.3 "Judgment Bolt / Hellfire" Ability { id: "(25FA|25DC)", source: "Shinryu" } +123.3 "Judgment Bolt / Hellfire" Ability { id: ["25FA", "25DC"], source: "Shinryu" } 138.4 "--Tail Marker (dps)--" 149.5 "Levinbolt" Ability { id: "25EA", source: "Right Wing" } @@ -68,7 +68,7 @@ hideall "--sync--" 350.9 "Hypernova" Ability { id: "25E8", source: "Right Wing" } 363.0 "Akh Morn 4" Ability { id: "25F3", source: "Shinryu" } duration 4.3 365.1 "Akh Rhai" Ability { id: "25F5", source: "Shinryu" } duration 5.3 -378.3 "Hypernova / Levinbolt" Ability { id: "(25E8|25EA)", source: "Right Wing" } +378.3 "Hypernova / Levinbolt" Ability { id: ["25E8", "25EA"], source: "Right Wing" } 384.3 "Tidal Wave" Ability { id: "25F9", source: "Shinryu" } 387.4 "--untargetable--" 394.8 "Dark Matter" #Ability { id: "25E7", source: "Shinryu" } @@ -102,8 +102,8 @@ hideall "--sync--" 859.5 "Tera Slash" Ability { id: "264B", source: "Shinryu" } 868.2 "Atomic Ray" Ability { id: "264C", source: "Shinryu" } 885.9 "Ice Storm" Ability { id: "2722", source: "Left Wing" } -889.9 "Levinbolt / Hypernova" Ability { id: "(2720|271F)", source: "Right Wing" } -897.9 "Wormwail / Benighting Breath" Ability { id: "(2648|2649)", source: "Shinryu" } +889.9 "Levinbolt / Hypernova" Ability { id: ["2720", "271F"], source: "Right Wing" } +897.9 "Wormwail / Benighting Breath" Ability { id: ["2648", "2649"], source: "Shinryu" } 907.1 "Tera Slash" Ability { id: "264B", source: "Shinryu" } 910.8 "--Reiryu Adds--" @@ -111,8 +111,8 @@ hideall "--sync--" 957.4 "Tera Slash" Ability { id: "264B", source: "Shinryu" } window 20,20 966.1 "Atomic Ray" Ability { id: "264C", source: "Shinryu" } 983.8 "Ice Storm" Ability { id: "2722", source: "Left Wing" } -987.8 "Levinbolt / Hypernova" Ability { id: "(2720|271F)", source: "Right Wing" } -995.9 "Wormwail / Benighting Breath" Ability { id: "(2648|2649)", source: "Shinryu" } +987.8 "Levinbolt / Hypernova" Ability { id: ["2720", "271F"], source: "Right Wing" } +995.9 "Wormwail / Benighting Breath" Ability { id: ["2648", "2649"], source: "Shinryu" } 1005.1 "Tera Slash" Ability { id: "264B", source: "Shinryu" } 1009.1 "--Reiryu Adds--" diff --git a/ui/raidboss/data/04-sb/trial/tsukuyomi-ex.txt b/ui/raidboss/data/04-sb/trial/tsukuyomi-ex.txt index 5a9fac1d4a..ed1780348a 100644 --- a/ui/raidboss/data/04-sb/trial/tsukuyomi-ex.txt +++ b/ui/raidboss/data/04-sb/trial/tsukuyomi-ex.txt @@ -81,7 +81,7 @@ hideall "--Reset--" 1196.8 "Lunar Halo" Ability { id: "2BD6", source: "Moonlight" } 1197.2 "Crater" Ability { id: "2CD7", source: "Moondust" } 1197.2 "Moonbeam" Ability { id: "2BD4", source: "Moondust" } -1208.3 "Antitwilight/Perilune" Ability { id: "(2BD7|2BD8)", source: "Tsukuyomi" } +1208.3 "Antitwilight/Perilune" Ability { id: ["2BD7", "2BD8"], source: "Tsukuyomi" } 1223.4 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" } 1230.6 "Zashiki-Asobi" Ability { id: "2BC5", source: "Tsukuyomi" } @@ -108,7 +108,7 @@ hideall "--Reset--" 1334.9 "Moonbeam" Ability { id: "2BD4", source: "Moondust" } 1334.9 "Crater" Ability { id: "2CD7", source: "Moondust" } 1335.9 "Lunar Halo" Ability { id: "2BD6", source: "Moonlight" } -1346.0 "Antitwilight/Perilune" Ability { id: "(2BD7|2BD8)", source: "Tsukuyomi" } +1346.0 "Antitwilight/Perilune" Ability { id: ["2BD7", "2BD8"], source: "Tsukuyomi" } # 35% push 1361.3 "Dance Of The Dead" Ability { id: "2CD0", source: "Tsukuyomi" } window 1400,20 diff --git a/ui/raidboss/data/04-sb/trial/tsukuyomi.txt b/ui/raidboss/data/04-sb/trial/tsukuyomi.txt index 54d7075abd..8e755d3a64 100644 --- a/ui/raidboss/data/04-sb/trial/tsukuyomi.txt +++ b/ui/raidboss/data/04-sb/trial/tsukuyomi.txt @@ -77,18 +77,18 @@ hideall "--Reset--" 678.3 "--sync--" Ability { id: "2D1F", source: "Tsukuyomi" } 683.2 "Dance Of The Dead" Ability { id: "2E79", source: "Tsukuyomi" } 693.5 "Lunacy x3" Ability { id: "2BFB", source: "Tsukuyomi" } -701.8 "Bright Blade/Dark Blade" Ability { id: "(2BF9|2BFA)", source: "Tsukuyomi" } +701.8 "Bright Blade/Dark Blade" Ability { id: ["2BF9", "2BFA"], source: "Tsukuyomi" } 709.0 "Reprimand" Ability { id: "2BE2", source: "Tsukuyomi" } -719.2 "Bright Blade/Dark Blade" Ability { id: "(2BF9|2BFA)", source: "Tsukuyomi" } +719.2 "Bright Blade/Dark Blade" Ability { id: ["2BF9", "2BFA"], source: "Tsukuyomi" } 725.2 "Tsuki-No-Maiogi" Ability { id: "2BED", source: "Dancing Fan" } duration 4 726.5 "Lunacy x4" Ability { id: "2BFB", source: "Tsukuyomi" } 738.8 "Reprimand" Ability { id: "2BE2", source: "Tsukuyomi" } 749.1 "Torment Unto Death" Ability { id: "2EB3", source: "Tsukuyomi" } 758.2 "Reprimand" Ability { id: "2BE2", source: "Tsukuyomi" } 759.0 "Tsuki-No-Maiogi" Ability { id: "2BED", source: "Dancing Fan" } duration 4 -763.4 "Bright Blade/Dark Blade" Ability { id: "(2BF9|2BFA)", source: "Tsukuyomi" } +763.4 "Bright Blade/Dark Blade" Ability { id: ["2BF9", "2BFA"], source: "Tsukuyomi" } 770.6 "Reprimand" Ability { id: "2BE2", source: "Tsukuyomi" } -780.7 "Bright Blade/Dark Blade" Ability { id: "(2BF9|2BFA)", source: "Tsukuyomi" } +780.7 "Bright Blade/Dark Blade" Ability { id: ["2BF9", "2BFA"], source: "Tsukuyomi" } 786.7 "Tsuki-No-Maiogi" Ability { id: "2BED", source: "Dancing Fan" } duration 4 788.1 "Lunacy x5" Ability { id: "2BFB", source: "Tsukuyomi" } 801.5 "Reprimand" Ability { id: "2BE2", source: "Tsukuyomi" } @@ -97,9 +97,9 @@ hideall "--Reset--" 811.7 "Torment Unto Death" Ability { id: "2EB3", source: "Tsukuyomi" } 820.8 "Reprimand" Ability { id: "2BE2", source: "Tsukuyomi" } 821.7 "Tsuki-No-Maiogi" Ability { id: "2BED", source: "Dancing Fan" } duration 4 -826.1 "Bright Blade/Dark Blade" Ability { id: "(2BF9|2BFA)", source: "Tsukuyomi" } +826.1 "Bright Blade/Dark Blade" Ability { id: ["2BF9", "2BFA"], source: "Tsukuyomi" } 833.2 "Reprimand" Ability { id: "2BE2", source: "Tsukuyomi" } -843.4 "Bright Blade/Dark Blade" Ability { id: "(2BF9|2BFA)", source: "Tsukuyomi" } +843.4 "Bright Blade/Dark Blade" Ability { id: ["2BF9", "2BFA"], source: "Tsukuyomi" } 849.4 "Tsuki-No-Maiogi" Ability { id: "2BED", source: "Dancing Fan" } duration 4 850.7 "Lunacy x5" Ability { id: "2BFB", source: "Tsukuyomi" } 864.1 "Reprimand" Ability { id: "2BE2", source: "Tsukuyomi" } @@ -108,9 +108,9 @@ hideall "--Reset--" 874.3 "Torment Unto Death" Ability { id: "2EB3", source: "Tsukuyomi" } window 50,50 jump 811.7 883.4 "Reprimand" #Ability { id: "2BE2", source: "Tsukuyomi" } 884.3 "Tsuki-No-Maiogi" #Ability { id: "2BED", source: "Dancing Fan" } duration 4 -888.7 "Bright Blade/Dark Blade" #Ability { id: "(2BF9|2BFA)", source: "Tsukuyomi" } +888.7 "Bright Blade/Dark Blade" #Ability { id: ["2BF9", "2BFA"], source: "Tsukuyomi" } 895.8 "Reprimand" #Ability { id: "2BE2", source: "Tsukuyomi" } -906.0 "Bright Blade/Dark Blade" #Ability { id: "(2BF9|2BFA)", source: "Tsukuyomi" } +906.0 "Bright Blade/Dark Blade" #Ability { id: ["2BF9", "2BFA"], source: "Tsukuyomi" } 912.0 "Tsuki-No-Maiogi" #Ability { id: "2BED", source: "Dancing Fan" } duration 4 913.3 "Lunacy x5" #Ability { id: "2BFB", source: "Tsukuyomi" } 926.7 "Reprimand" #Ability { id: "2BE2", source: "Tsukuyomi" } diff --git a/ui/raidboss/data/05-shb/alliance/the_puppets_bunker.txt b/ui/raidboss/data/05-shb/alliance/the_puppets_bunker.txt index 3ffbd4b18e..2fa01e9eb4 100644 --- a/ui/raidboss/data/05-shb/alliance/the_puppets_bunker.txt +++ b/ui/raidboss/data/05-shb/alliance/the_puppets_bunker.txt @@ -15,7 +15,7 @@ hideall "--sync--" 170.6 "Firing Order: Surface Laser" Ability { id: "508E", source: "813P-Operated Aegis Unit" } 177.7 "Aerial Support: Swoop" Ability { id: "50D2", source: "813P-Operated Aegis Unit" } 187.8 "Flight Path" Ability { id: "508C", source: "Flight Unit" } -197.9 "Maneuver: Refraction Cannons" Ability { id: "(507F|5080)", source: "813P-Operated Aegis Unit" } +197.9 "Maneuver: Refraction Cannons" Ability { id: ["507F", "5080"], source: "813P-Operated Aegis Unit" } 206.2 "--sync--" Ability { id: "507[789A]", source: "813P-Operated Aegis Unit" } 220.2 "Maneuver: Beam Cannons" Ability { id: "5073", source: "813P-Operated Aegis Unit" } 239.6 "Aerial Support: Bombardment" Ability { id: "50D3", source: "813P-Operated Aegis Unit" } @@ -33,7 +33,7 @@ hideall "--sync--" 296.3 "--sync--" Ability { id: "53B2", source: "813P-Operated Aegis Unit" } 303.8 "Life's Last Song" Ability { id: "53B3", source: "813P-Operated Aegis Unit" } 309.3 "Aerial Support: Swoop" Ability { id: "50D2", source: "813P-Operated Aegis Unit" } -317.4 "Maneuver: Refraction Cannons" Ability { id: "(507F|5080)", source: "813P-Operated Aegis Unit" } +317.4 "Maneuver: Refraction Cannons" Ability { id: ["507F", "5080"], source: "813P-Operated Aegis Unit" } 319.4 "Flight Path" Ability { id: "508C", source: "Flight Unit" } 328.5 "Firing Order: Surface Laser" Ability { id: "508E", source: "813P-Operated Aegis Unit" } 330.7 "--sync--" Ability { id: "507[789A]", source: "813P-Operated Aegis Unit" } @@ -71,7 +71,7 @@ hideall "--sync--" 485.2 "Life's Last Song" Ability { id: "53B3", source: "813P-Operated Aegis Unit" } 490.2 "Life's Last Song" Ability { id: "53B3", source: "813P-Operated Aegis Unit" } 495.7 "Aerial Support: Swoop" Ability { id: "50D2", source: "813P-Operated Aegis Unit" } -503.8 "Maneuver: Refraction Cannons" Ability { id: "(507F|5080)", source: "813P-Operated Aegis Unit" } +503.8 "Maneuver: Refraction Cannons" Ability { id: ["507F", "5080"], source: "813P-Operated Aegis Unit" } 505.8 "Flight Path" Ability { id: "508C", source: "Flight Unit" } 521.1 "Firing Order: Anti-Personnel Laser" Ability { id: "508D", source: "813P-Operated Aegis Unit" } 531.1 "Maneuver: Collider Cannons" Ability { id: "507[BCD]", source: "813P-Operated Aegis Unit" } @@ -91,7 +91,7 @@ hideall "--sync--" 593.1 "Life's Last Song" Ability { id: "53B3", source: "813P-Operated Aegis Unit" } 598.1 "Life's Last Song" Ability { id: "53B3", source: "813P-Operated Aegis Unit" } 603.6 "Aerial Support: Swoop" Ability { id: "50D2", source: "813P-Operated Aegis Unit" } window 100,100 jump 495.7 -611.7 "Maneuver: Refraction Cannons" #Ability { id: "(507F|5080)", source: "813P-Operated Aegis Unit" } +611.7 "Maneuver: Refraction Cannons" #Ability { id: ["507F", "5080"], source: "813P-Operated Aegis Unit" } 613.7 "Flight Path" #Ability { id: "508C", source: "Flight Unit" } 629.0 "Firing Order: Anti-Personnel Laser" #Ability { id: "508D", source: "813P-Operated Aegis Unit" } 639.0 "Maneuver: Collider Cannons" #Ability { id: "507[BCD]", source: "813P-Operated Aegis Unit" } @@ -158,7 +158,7 @@ hideall "--sync--" 2153.5 "Incendiary Barrage" Ability { id: "4FAF", source: "724P-Operated Superior Flight Unit \\(A-Lpha\\)" } 2155.0 "Sliding Swipe 1" Ability { id: "4FA[CD]", source: "724P-Operated Superior Flight Unit \\(A-Lpha\\)" } 2157.0 "Sliding Swipe 2" Ability { id: "550[DE]", source: "767P-Operated Superior Flight Unit \\(B-Eta\\)" } -2159.0 "Sliding Swipe 3" Ability { id: "(550F|5510)", source: "772P-Operated Superior Flight Unit \\(C-Hi\\)" } +2159.0 "Sliding Swipe 3" Ability { id: ["550F", "5510"], source: "772P-Operated Superior Flight Unit \\(C-Hi\\)" } 2161.3 "--targetable--" 2172.7 "--sync--" StartsUsing { id: "4FC4", source: "724P-Operated Superior Flight Unit \\(A-Lpha\\)" } window 70,20 @@ -190,7 +190,7 @@ hideall "--sync--" 2403.1 "Incendiary Barrage" Ability { id: "4FAF", source: "724P-Operated Superior Flight Unit \\(A-Lpha\\)" } 2404.6 "Sliding Swipe 1" Ability { id: "4FA[CD]", source: "724P-Operated Superior Flight Unit \\(A-Lpha\\)" } 2406.6 "Sliding Swipe 2" Ability { id: "550[DE]", source: "767P-Operated Superior Flight Unit \\(B-Eta\\)" } -2408.6 "Sliding Swipe 3" Ability { id: "(550F|5510)", source: "772P-Operated Superior Flight Unit \\(C-Hi\\)" } +2408.6 "Sliding Swipe 3" Ability { id: ["550F", "5510"], source: "772P-Operated Superior Flight Unit \\(C-Hi\\)" } 2410.9 "--targetable--" 2427.2 "--sync--" StartsUsing { id: "4FBD", source: "724P-Operated Superior Flight Unit \\(A-Lpha\\)" } window 70,20 @@ -392,9 +392,9 @@ hideall "--sync--" # beginning of loop 6350.2 "--sync--" Ability { id: "51A3", source: "Compound 2P" } 6356.3 "Reproduce" Ability { id: "51A1", source: "Compound 2P" } -6366.0 "Prime Blade (In/Out)" Ability { id: "(541F|5421)", source: "Compound 2P" } +6366.0 "Prime Blade (In/Out)" Ability { id: ["541F", "5421"], source: "Compound 2P" } 6375.9 "Forced Transfer" Ability { id: "51A2", source: "Compound 2P" } -6379.4 "Prime Blade (In/Out)" Ability { id: "(5198|519A)", source: "Puppet 2P" } +6379.4 "Prime Blade (In/Out)" Ability { id: ["5198", "519A"], source: "Puppet 2P" } # Random Three Parts/ Four Parts @@ -423,10 +423,10 @@ hideall "--sync--" 6523.7 "--sync--" Ability { id: "51A3", source: "Compound 2P" } 6532.5 "Forced Transfer" Ability { id: "53D[01]", source: "Compound 2P" } -6535.8 "Prime Blade (In/Out)" Ability { id: "(5198|519A)", source: "Compound 2P" } +6535.8 "Prime Blade (In/Out)" Ability { id: ["5198", "519A"], source: "Compound 2P" } 6541.3 "--sync--" Ability { id: "51A3", source: "Compound 2P" } 6547.4 "Reproduce" Ability { id: "51A1", source: "Compound 2P" } window 100,100 jump 6356.3 -6557.2 "Prime Blade (In/Out)" Ability { id: "(541F|5421)", source: "Compound 2P" } +6557.2 "Prime Blade (In/Out)" Ability { id: ["541F", "5421"], source: "Compound 2P" } 6567.1 "Forced Transfer" Ability { id: "51A2", source: "Compound 2P" } -6570.6 "Prime Blade (In/Out)" Ability { id: "(5198|519A)", source: "Puppet 2P" } +6570.6 "Prime Blade (In/Out)" Ability { id: ["5198", "519A"], source: "Puppet 2P" } diff --git a/ui/raidboss/data/05-shb/alliance/the_tower_at_paradigms_breach.txt b/ui/raidboss/data/05-shb/alliance/the_tower_at_paradigms_breach.txt index 4870e460cb..5e14eb803f 100644 --- a/ui/raidboss/data/05-shb/alliance/the_tower_at_paradigms_breach.txt +++ b/ui/raidboss/data/05-shb/alliance/the_tower_at_paradigms_breach.txt @@ -64,7 +64,7 @@ hideall "--sync--" 1268.1 "Lunge 1" Ability { id: "5EB1", source: "Knave Of Hearts" } 1269.2 "--sync--" Ability { id: "5EB0", source: "Knave Of Hearts" } 1278.1 "Lunge 2" Ability { id: "5EB1", source: "Copied Knave" } -1280.1 "Colossal Impact" Ability { id: "(60C8|5CFD)", source: "Knave Of Hearts" } +1280.1 "Colossal Impact" Ability { id: ["60C8", "5CFD"], source: "Knave Of Hearts" } 1287.2 "--sync--" Ability { id: "5EB2", source: "Knave Of Hearts" } # Magic Artillery Beta cast 1294.3 "Magic Artillery Beta" Ability { id: "5EB3", source: "Knave Of Hearts" } # damage @@ -215,13 +215,13 @@ hideall "--sync--" 2700.0 "--sync--" StartsUsing { id: "5C73", source: "Gretel" } window 700,0 2700.0 "--sync--" StartsUsing { id: "5C74", source: "Hansel" } window 700,0 # Gretel does 57C3 and Hansel does 57C4, and they both do 5C75 -2708.0 "Lamentation" Ability { id: "(5C73|5C74)", source: ["Gretel", "Hansel"] } window 100,100 +2708.0 "Lamentation" Ability { id: ["5C73", "5C74"], source: ["Gretel", "Hansel"] } window 100,100 2713.8 "Seed Of Magic Beta" Ability { id: "5C75", source: ["Gretel", "Hansel"] } -2718.1 "Lamentation" #Ability { id: "(5C73|5C74)", source: ["Gretel", "Hansel"] } +2718.1 "Lamentation" #Ability { id: ["5C73", "5C74"], source: ["Gretel", "Hansel"] } 2723.9 "Seed Of Magic Beta" #Ability { id: "5C75", source: ["Gretel", "Hansel"] } -2728.2 "Lamentation" #Ability { id: "(5C73|5C74)", source: ["Gretel", "Hansel"] } +2728.2 "Lamentation" #Ability { id: ["5C73", "5C74"], source: ["Gretel", "Hansel"] } 2734.0 "Seed Of Magic Beta" #Ability { id: "5C75", source: ["Gretel", "Hansel"] } -2738.3 "Lamentation" #Ability { id: "(5C73|5C74)", source: ["Gretel", "Hansel"] } +2738.3 "Lamentation" #Ability { id: ["5C73", "5C74"], source: ["Gretel", "Hansel"] } ### Assorted Trash diff --git a/ui/raidboss/data/05-shb/dungeon/anamnesis_anyder.txt b/ui/raidboss/data/05-shb/dungeon/anamnesis_anyder.txt index 8f1a49ccbb..22b57ae5ce 100644 --- a/ui/raidboss/data/05-shb/dungeon/anamnesis_anyder.txt +++ b/ui/raidboss/data/05-shb/dungeon/anamnesis_anyder.txt @@ -79,7 +79,7 @@ hideall "--sync--" 2073.2 "The Final Verse" Ability { id: "4B58", source: "Kyklops" } 2083.1 "Hammer/Blade Mark" Ability { id: "4B5[9A]", source: "Kyklops" } 2087.7 "Blade/Hammer Mark" Ability { id: "4B5[9A]", source: "Kyklops" } -2095.4 "Pyre/Hearth" Ability { id: "(4B5F|4B60)", source: "Kyklops" } +2095.4 "Pyre/Hearth" Ability { id: ["4B5F", "4B60"], source: "Kyklops" } 2100.1 "Terrible Hammer/Blade" #Ability { id: "4B5[DE]", source: "Kyklops" } 2102.2 "Terrible Blade/Hammer" #Ability { id: "4B5[DE]", source: "Kyklops" } 2107.0 "Swing/Swipe/Cyclone" Ability { id: "4B5[457]", source: "Kyklops" } diff --git a/ui/raidboss/data/05-shb/dungeon/paglthan.txt b/ui/raidboss/data/05-shb/dungeon/paglthan.txt index 286fcee400..055689ea43 100644 --- a/ui/raidboss/data/05-shb/dungeon/paglthan.txt +++ b/ui/raidboss/data/05-shb/dungeon/paglthan.txt @@ -75,7 +75,7 @@ hideall "--sync--" 2173.1 "Upburst x4" # Ability { id: "605B", source: "Lunar Nail" } 2179.7 "Big Burst x4" # Ability { id: "5B48", source: "Lunar Nail" } 2191.3 "Lunar Flare (circles)" Ability { id: "5B49", source: "Lunar Bahamut" } window 30,30 -2203.4 "Lunar Flare (explosions)" Ability { id: "(5B4A|5B4B)", source: "Lunar Bahamut" } +2203.4 "Lunar Flare (explosions)" Ability { id: ["5B4A", "5B4B"], source: "Lunar Bahamut" } 2215.5 "Kan Rhai" Ability { id: "5B4F", source: "Lunar Bahamut" } 2217.1 "--sync--" Ability { id: "5B51", source: "Lunar Bahamut" } 2223.5 "Flatten" Ability { id: "5B58", source: "Lunar Bahamut" } diff --git a/ui/raidboss/data/05-shb/dungeon/qitana_ravel.txt b/ui/raidboss/data/05-shb/dungeon/qitana_ravel.txt index 1bad1b0fed..8e662a8464 100644 --- a/ui/raidboss/data/05-shb/dungeon/qitana_ravel.txt +++ b/ui/raidboss/data/05-shb/dungeon/qitana_ravel.txt @@ -12,23 +12,23 @@ hideall "--sync--" 121.0 "Sun Toss" Ability { id: "3C8A", source: "Lozatl" } 127.2 "Lozatl's Scorn" Ability { id: "3C8B", source: "Lozatl" } 137.5 "Sun Toss" Ability { id: "3C8A", source: "Lozatl" } -137.5 "Ronkan Light" Ability { id: "(3D6D|3C8C)", source: "Lozatl" } +137.5 "Ronkan Light" Ability { id: ["3D6D", "3C8C"], source: "Lozatl" } 145.1 "Heat Up" Ability { id: "3C8[DE]", source: "Lozatl" } -151.5 "Lozatl's Fury" Ability { id: "(3C8F|3C90)", source: "Lozatl" } +151.5 "Lozatl's Fury" Ability { id: ["3C8F", "3C90"], source: "Lozatl" } 161.2 "Stonefist" Ability { id: "3C89", source: "Lozatl" } 168.1 "Heat Up" Ability { id: "3C8[DE]", source: "Lozatl" } 173.2 "Lozatl's Scorn" Ability { id: "3C8B", source: "Lozatl" } -182.7 "Lozatl's Fury" Ability { id: "(3C8F|3C90)", source: "Lozatl" } -183.4 "Ronkan Light" Ability { id: "(3D6D|3C8C)", source: "Lozatl" } +182.7 "Lozatl's Fury" Ability { id: ["3C8F", "3C90"], source: "Lozatl" } +183.4 "Ronkan Light" Ability { id: ["3D6D", "3C8C"], source: "Lozatl" } 191.4 "Sun Toss" #Ability { id: "3C8A", source: "Lozatl" } 196.7 "Sun Toss" #Ability { id: "3C8A", source: "Lozatl" } 207.9 "Stonefist" Ability { id: "3C89", source: "Lozatl" } 222.9 "Heat Up" Ability { id: "3C8[DE]", source: "Lozatl" } 228.1 "Lozatl's Scorn" Ability { id: "3C8B", source: "Lozatl" } -237.4 "Lozatl's Fury" Ability { id: "(3C8F|3C90)", source: "Lozatl" } -238.5 "Ronkan Light" Ability { id: "(3D6D|3C8C)", source: "Lozatl" } +237.4 "Lozatl's Fury" Ability { id: ["3C8F", "3C90"], source: "Lozatl" } +238.5 "Ronkan Light" Ability { id: ["3D6D", "3C8C"], source: "Lozatl" } 246.2 "Sun Toss" #Ability { id: "3C8A", source: "Lozatl" } 251.5 "Sun Toss" #Ability { id: "3C8A", source: "Lozatl" } diff --git a/ui/raidboss/data/05-shb/eureka/bozjan_southern_front.txt b/ui/raidboss/data/05-shb/eureka/bozjan_southern_front.txt index ff2f897aea..b7cb7ee122 100644 --- a/ui/raidboss/data/05-shb/eureka/bozjan_southern_front.txt +++ b/ui/raidboss/data/05-shb/eureka/bozjan_southern_front.txt @@ -228,8 +228,8 @@ hideall "--sync--" 50116.0 "Curse Of The Fiend" Ability { id: "4F7A", source: "Adrammelech" } 50123.1 "Accursed Becoming" Ability { id: "4F7B", source: "Adrammelech" } -50130.3 "Orb 1" #Ability { id: "(504D|504A|4F7D|4F8[5-7])", source: "Adrammelech" } -50132.1 "Orb 2" #Ability { id: "(504D|504A|4F7D|4F8[5-7])", source: "Adrammelech" } +50130.3 "Orb 1" #Ability { id: ["504D", "504A", "4F7D", "4F8[5-7]"], source: "Adrammelech" } +50132.1 "Orb 2" #Ability { id: ["504D", "504A", "4F7D", "4F8[5-7]"], source: "Adrammelech" } 50144.3 "Tornado" Ability { id: "4F8F", source: "Adrammelech" } 50151.4 "Flare" Ability { id: "4F95", source: "Adrammelech" } @@ -240,11 +240,11 @@ hideall "--sync--" 50194.3 "--sync--" StartsUsing { id: "4F7A", source: "Adrammelech" } window 70,20 50197.3 "Curse Of The Fiend" Ability { id: "4F7A", source: "Adrammelech" } 50204.4 "Accursed Becoming" Ability { id: "4F7B", source: "Adrammelech" } -50211.6 "Orb 1" #Ability { id: "(504D|504A|4F7D|4F8[5-7])", source: "Adrammelech" } -50213.4 "Orb 2" #Ability { id: "(504D|504A|4F7D|4F8[5-7])", source: "Adrammelech" } +50211.6 "Orb 1" #Ability { id: ["504D", "504A", "4F7D", "4F8[5-7]"], source: "Adrammelech" } +50213.4 "Orb 2" #Ability { id: ["504D", "504A", "4F7D", "4F8[5-7]"], source: "Adrammelech" } 50213.5 "Accursed Becoming" Ability { id: "4F7B", source: "Adrammelech" } -50220.7 "Orb 3" #Ability { id: "(504D|504A|4F7D|4F8[5-7])", source: "Adrammelech" } -50222.5 "Orb 4" #Ability { id: "(504D|504A|4F7D|4F8[5-7])", source: "Adrammelech" } +50220.7 "Orb 3" #Ability { id: ["504D", "504A", "4F7D", "4F8[5-7]"], source: "Adrammelech" } +50222.5 "Orb 4" #Ability { id: ["504D", "504A", "4F7D", "4F8[5-7]"], source: "Adrammelech" } 50230.7 "Flare" Ability { id: "4F95", source: "Adrammelech" } 50237.8 "Tornado" Ability { id: "4F8F", source: "Adrammelech" } @@ -258,11 +258,11 @@ hideall "--sync--" 50316.7 "Curse Of The Fiend" Ability { id: "4F7A", source: "Adrammelech" } 50323.8 "Accursed Becoming" Ability { id: "4F7B", source: "Adrammelech" } -50331.0 "Orb 1" #Ability { id: "(504D|504A|4F7D|4F8[5-7])", source: "Adrammelech" } -50332.8 "Orb 2" #Ability { id: "(504D|504A|4F7D|4F8[5-7])", source: "Adrammelech" } +50331.0 "Orb 1" #Ability { id: ["504D", "504A", "4F7D", "4F8[5-7]"], source: "Adrammelech" } +50332.8 "Orb 2" #Ability { id: ["504D", "504A", "4F7D", "4F8[5-7]"], source: "Adrammelech" } 50332.9 "Accursed Becoming" Ability { id: "4F7B", source: "Adrammelech" } -50340.1 "Orb 3" #Ability { id: "(504D|504A|4F7D|4F8[5-7])", source: "Adrammelech" } -50341.9 "Orb 4" #Ability { id: "(504D|504A|4F7D|4F8[5-7])", source: "Adrammelech" } +50340.1 "Orb 3" #Ability { id: ["504D", "504A", "4F7D", "4F8[5-7]"], source: "Adrammelech" } +50341.9 "Orb 4" #Ability { id: ["504D", "504A", "4F7D", "4F8[5-7]"], source: "Adrammelech" } # Loop # TODO: if anybody ever finds the enrage, we can unroll this. diff --git a/ui/raidboss/data/05-shb/eureka/delubrum_reginae.txt b/ui/raidboss/data/05-shb/eureka/delubrum_reginae.txt index 86606c93d6..80a364fba4 100644 --- a/ui/raidboss/data/05-shb/eureka/delubrum_reginae.txt +++ b/ui/raidboss/data/05-shb/eureka/delubrum_reginae.txt @@ -477,10 +477,10 @@ hideall "--sync--" # cleaves, 2 levels of temperature 7182.5 "Hot And Cold" Ability { id: "5BAF", source: "Trinity Avowed" } -7193.7 "Blade Of Entropy" Ability { id: "(5B6[5-8]|596[D-F]|5970)", source: "Trinity Avowed" } -7201.9 "Blade Of Entropy" Ability { id: "(5B6[5-8]|596[D-F]|5970)", source: "Trinity Avowed" } -7210.0 "Blade Of Entropy" Ability { id: "(5B6[5-8]|596[D-F]|5970)", source: "Trinity Avowed" } -7218.2 "Blade Of Entropy" Ability { id: "(5B6[5-8]|596[D-F]|5970)", source: "Trinity Avowed" } +7193.7 "Blade Of Entropy" Ability { id: ["5B6[5-8]", "596[D-F]", "5970"], source: "Trinity Avowed" } +7201.9 "Blade Of Entropy" Ability { id: ["5B6[5-8]", "596[D-F]", "5970"], source: "Trinity Avowed" } +7210.0 "Blade Of Entropy" Ability { id: ["5B6[5-8]", "596[D-F]", "5970"], source: "Trinity Avowed" } +7218.2 "Blade Of Entropy" Ability { id: ["5B6[5-8]", "596[D-F]", "5970"], source: "Trinity Avowed" } 7221.3 "--sync--" Ability { id: "5982", source: "Trinity Avowed" } 7227.4 "Unseen Eye" Ability { id: "5980", source: "Trinity Avowed" } @@ -523,10 +523,10 @@ hideall "--sync--" # (probably a loop, back to cleaves, 2 levels of temperature) 7463.9 "Hot And Cold" Ability { id: "5BAF", source: "Trinity Avowed" } window 100,100 jump 7182.5 -7475.1 "Blade Of Entropy" #Ability { id: "(5B6[5-8]|596[D-F]|5970)", source: "Trinity Avowed" } -7483.3 "Blade Of Entropy" #Ability { id: "(5B6[5-8]|596[D-F]|5970)", source: "Trinity Avowed" } -7491.4 "Blade Of Entropy" #Ability { id: "(5B6[5-8]|596[D-F]|5970)", source: "Trinity Avowed" } -7499.6 "Blade Of Entropy" #Ability { id: "(5B6[5-8]|596[D-F]|5970)", source: "Trinity Avowed" } +7475.1 "Blade Of Entropy" #Ability { id: ["5B6[5-8]", "596[D-F]", "5970"], source: "Trinity Avowed" } +7483.3 "Blade Of Entropy" #Ability { id: ["5B6[5-8]", "596[D-F]", "5970"], source: "Trinity Avowed" } +7491.4 "Blade Of Entropy" #Ability { id: ["5B6[5-8]", "596[D-F]", "5970"], source: "Trinity Avowed" } +7499.6 "Blade Of Entropy" #Ability { id: ["5B6[5-8]", "596[D-F]", "5970"], source: "Trinity Avowed" } ### The Queen @@ -584,8 +584,8 @@ hideall "--sync--" 9283.5 "Above Board" Ability { id: "59D1", source: "Queen's Warrior" } 9284.5 "--stunned--" # Note: these can be in either order, so can't sync. -9286.5 "Lots Cast" #Ability { id: "(59D3|5B86)", source: "Aetherial Bolt" } -9289.5 "Lots Cast" #Ability { id: "(59D2|5B87)", source: "Aetherial Burst" } +9286.5 "Lots Cast" #Ability { id: ["59D3", "5B86"], source: "Aetherial Bolt" } +9289.5 "Lots Cast" #Ability { id: ["59D2", "5B87"], source: "Aetherial Burst" } 9291.2 "--unstunned--" 9300.4 "Empyrean Iniquity" Ability { id: "59C8", source: "The Queen" } @@ -630,6 +630,6 @@ hideall "--sync--" 9499.0 "--knockback--" #Ability { id: "59C7", source: "The Queen" } 9503.5 "Above Board" #Ability { id: "59D1", source: "Queen's Warrior" } 9504.5 "--stunned--" -9506.5 "Lots Cast" #Ability { id: "(59D3|5B86)", source: "Aetherial Bolt" } -9509.5 "Lots Cast" #Ability { id: "(59D2|5B87)", source: "Aetherial Burst" } +9506.5 "Lots Cast" #Ability { id: ["59D3", "5B86"], source: "Aetherial Bolt" } +9509.5 "Lots Cast" #Ability { id: ["59D2", "5B87"], source: "Aetherial Burst" } 9511.2 "--unstunned--" diff --git a/ui/raidboss/data/05-shb/eureka/delubrum_reginae_savage.txt b/ui/raidboss/data/05-shb/eureka/delubrum_reginae_savage.txt index 5111214edb..7b478dcfda 100644 --- a/ui/raidboss/data/05-shb/eureka/delubrum_reginae_savage.txt +++ b/ui/raidboss/data/05-shb/eureka/delubrum_reginae_savage.txt @@ -616,7 +616,7 @@ hideall "--sync--" 10710.1 "Sniper Shot" Ability { id: "5850", source: "Gun Turret" } 10715.0 "Blood And Bone" Ability { id: "5841", source: "Queen's Soldier" } 10728.4 "--gun turret enrage--" -10732.2 "Icy Portent/Fiery Portent" Ability { id: "(583F|5840)", source: "Queen's Soldier" } +10732.2 "Icy Portent/Fiery Portent" Ability { id: ["583F", "5840"], source: "Queen's Soldier" } 10747.4 "Relentless Battery" Ability { id: "5844", source: "Queen's Gunner" } 10753.5 "Double Gambit" Ability { id: "5837", source: "Queen's Soldier" } 10761.5 "Automatic Turret" Ability { id: "584A", source: "Queen's Gunner" } @@ -632,7 +632,7 @@ hideall "--sync--" 10822.6 "Automatic Turret" Ability { id: "5845", source: "Queen's Gunner" } 10830.8 "Turret's Tour 1" Ability { id: "5846", source: "Queen's Gunner" } 10831.4 "Turret's Tour 2" Ability { id: "5848", source: "Automatic Turret" } -10837.6 "Fiery Portent/Icy Portent" Ability { id: "(583F|5840)", source: "Queen's Soldier" } +10837.6 "Fiery Portent/Icy Portent" Ability { id: ["583F", "5840"], source: "Queen's Soldier" } 10847.8 "Blood And Bone" Ability { id: "5841", source: "Queen's Soldier" } 10856.9 "Rapid Sever" Ability { id: "5842", source: "Queen's Soldier" } 10856.9 "Shot In The Dark" Ability { id: "5855", source: "Queen's Gunner" } @@ -859,10 +859,10 @@ hideall "--sync--" # Initial Phase 14029.2 "Allegiant Arsenal" Ability { id: "598[567]", source: "Trinity Avowed" } -14034.4 "Flashvane/Fury Of Bozja/Infernal Slash" Ability { id: "(594B|594C|594A)", source: "Trinity Avowed" } +14034.4 "Flashvane/Fury Of Bozja/Infernal Slash" Ability { id: ["594B", "594C", "594A"], source: "Trinity Avowed" } 14037.5 "--sync--" Ability { id: "5983", source: "Trinity Avowed" } 14042.6 "Allegiant Arsenal" Ability { id: "598[567]", source: "Trinity Avowed" } -14047.8 "Flashvane/Fury Of Bozja/Infernal Slash" Ability { id: "(594B|594C|594A)", source: "Trinity Avowed" } +14047.8 "Flashvane/Fury Of Bozja/Infernal Slash" Ability { id: ["594B", "594C", "594A"], source: "Trinity Avowed" } 14050.9 "--sync--" Ability { id: "5984", source: "Trinity Avowed" } 14056.0 "Allegiant Arsenal" # -> random jump to initial weapon phase @@ -1474,7 +1474,7 @@ hideall "--sync--" 20422.5 "Relentless Play 3" Ability { id: "59FC", source: "The Queen" } window 20,20 20428.6 "Sword Omen/Shield Omen" Ability { id: "59F[DE]", source: "Queen's Knight" } 20437.9 "Automatic Turret" Ability { id: "5A26", source: "Queen's Gunner" } -20440.0 "Optimal Play" Ability { id: "(5A00|59FF)", source: "Queen's Knight" } +20440.0 "Optimal Play" Ability { id: ["5A00", "59FF"], source: "Queen's Knight" } 20446.0 "Turret's Tour" Ability { id: "5A27", source: "Queen's Gunner" } 20446.6 "--sync--" Ability { id: "5BCB", source: "The Queen" } 20446.6 "Turret's Tour" #Ability { id: "5A29", source: "Automatic Turret" } @@ -1496,7 +1496,7 @@ hideall "--sync--" 20515.5 "--sync--" Ability { id: "5B8E", source: "Queen's Warrior" } 20516.5 "--stunned--" # 3 or 7 second stun # Aetherial Burst does 5B89 and Aetherial Bolt does 5A0D -20518.5 "Lots Cast" Ability { id: "(5B89|5A0D)", source: ["Aetherial Burst", "Aetherial Bolt"] } +20518.5 "Lots Cast" Ability { id: ["5B89", "5A0D"], source: ["Aetherial Burst", "Aetherial Bolt"] } 20521.5 "Lots Cast" #Ability { id: "5B88", source: "Aetherial Bolt" } 20522.7 "Lots Cast" #Ability { id: "5BB6", source: "Aetherial Bolt" } 20523.5 "--unstunned--" diff --git a/ui/raidboss/data/05-shb/eureka/zadnor.txt b/ui/raidboss/data/05-shb/eureka/zadnor.txt index e2d61c7000..bfa8f41059 100644 --- a/ui/raidboss/data/05-shb/eureka/zadnor.txt +++ b/ui/raidboss/data/05-shb/eureka/zadnor.txt @@ -113,8 +113,8 @@ hideall "--sync--" 21398.3 "Phenex" Ability { id: "5E85", source: "Sartauvoir The Inferno" } 21408.6 "Time Eruption/Reverse Time Eruption" Ability { id: "5E8[34]", source: "Sartauvoir The Inferno" } 21411.6 "Flamedive" Ability { id: "5E73", source: "Huma" } -21415.9 "Time Eruption 1" Ability { id: "(5E6E|5E71)", source: "Sartauvoir The Inferno" } -21417.9 "Time Eruption 2" Ability { id: "(5E6F|5E70)", source: "Sartauvoir The Inferno" } +21415.9 "Time Eruption 1" Ability { id: ["5E6E", "5E71"], source: "Sartauvoir The Inferno" } +21417.9 "Time Eruption 2" Ability { id: ["5E6F", "5E70"], source: "Sartauvoir The Inferno" } 21425.9 "Pyrokinesis" Ability { id: "5E82", source: "Sartauvoir The Inferno" } 21437.3 "Hyperpyroplexy" Ability { id: "5E86", source: "Sartauvoir The Inferno" } # ??? @@ -241,13 +241,13 @@ hideall "--sync--" 24022.9 "High-Powered Magitek Ray" Ability { id: "5DC5", source: "Saunion" } 24034.1 "Magitek Crossray/Magitek Halo" Ability { id: "5DB[57]", source: "Saunion" } 24040.3 "--sync--" Ability { id: "5DD7", source: "Saunion" } -24050.5 "Mobile Halo/Mobile Crossray" Ability { id: "(5DB[9ABCDEF]|5DC0)", source: "Saunion" } +24050.5 "Mobile Halo/Mobile Crossray" Ability { id: ["5DB[9ABCDEF]", "5DC0"], source: "Saunion" } 24063.7 "Missile Command" Ability { id: "5DC1", source: "Saunion" } 24069.9 "Surface Missile" Ability { id: "5DC4", source: "Saunion" } 24069.9 "Anti-Personnel Missile" Ability { id: "5DC2", source: "Saunion" } 24074.9 "Missile Salvo" Ability { id: "5DC3", source: "Saunion" } 24078.9 "--sync--" Ability { id: "5DD7", source: "Saunion" } -24089.0 "Mobile Crossray/Mobile Halo" Ability { id: "(5DB[9ABCDEF]|5DC0)", source: "Saunion" } +24089.0 "Mobile Crossray/Mobile Halo" Ability { id: ["5DB[9ABCDEF]", "5DC0"], source: "Saunion" } 24099.8 "--sync--" Ability { id: "5DD7", source: "Saunion" } # ? @@ -256,7 +256,7 @@ hideall "--sync--" 24323.3 "--targetable--" 24342.5 "--sync--" Ability { id: "5DD7", source: "Saunion" } 24348.5 "Wildfire Winds" Ability { id: "5DCD", source: "Dawon The Younger" } -24352.5 "Mobile Halo/Mobile Crossray" Ability { id: "(5DB[9ABCDEF]|5DC0)", source: "Saunion" } +24352.5 "Mobile Halo/Mobile Crossray" Ability { id: ["5DB[9ABCDEF]", "5DC0"], source: "Saunion" } 24361.2 "Raw Heat" Ability { id: "5DCE", source: "Vermilion Flame" } 24362.7 "Missile Command" Ability { id: "5DC1", source: "Saunion" } 24368.9 "Surface Missile" Ability { id: "5DC4", source: "Saunion" } @@ -299,7 +299,7 @@ hideall "--sync--" 24530.1 "--targetable--" 24549.9 "--sync--" Ability { id: "5DD7", source: "Saunion" } 24555.8 "Wildfire Winds" Ability { id: "5DCD", source: "Dawon The Younger" } -24559.9 "Mobile Crossray/Mobile Halo" Ability { id: "(5DB[9ABCDEF]|5DC0)", source: "Saunion" } +24559.9 "Mobile Crossray/Mobile Halo" Ability { id: ["5DB[9ABCDEF]", "5DC0"], source: "Saunion" } 24568.6 "Raw Heat" Ability { id: "5DCE", source: "Vermilion Flame" } 24570.1 "Missile Command" Ability { id: "5DC1", source: "Saunion" } 24576.3 "Surface Missile" Ability { id: "5DC4", source: "Saunion" } diff --git a/ui/raidboss/data/05-shb/raid/e10s.txt b/ui/raidboss/data/05-shb/raid/e10s.txt index e278eadd6e..48a080ba3f 100644 --- a/ui/raidboss/data/05-shb/raid/e10s.txt +++ b/ui/raidboss/data/05-shb/raid/e10s.txt @@ -53,10 +53,10 @@ hideall "--sync--" 280.7 "Cloak Of Shadows" Ability { id: "5B13", source: "Shadowkeeper" } 285.7 "Cloak Of Shadows" Ability { id: "5B14", source: "Shadowkeeper" } 290.7 "Deepshadow Nova" Ability { id: "573E", source: "Shadowkeeper" } -306.0 "Implosion" Ability { id: "(5700|56FC)", source: "Shadowkeeper" } -309.1 "Implosion" Ability { id: "(5701|56FD)", source: "Shadowkeeper" } -312.2 "Implosion" Ability { id: "(5701|56FD)", source: "Shadowkeeper" } -315.3 "Implosion" Ability { id: "(5702|56FE)", source: "Shadowkeeper" } +306.0 "Implosion" Ability { id: ["5700", "56FC"], source: "Shadowkeeper" } +309.1 "Implosion" Ability { id: ["5701", "56FD"], source: "Shadowkeeper" } +312.2 "Implosion" Ability { id: ["5701", "56FD"], source: "Shadowkeeper" } +315.3 "Implosion" Ability { id: ["5702", "56FE"], source: "Shadowkeeper" } 323.4 "Deepshadow Nova" Ability { id: "573E", source: "Shadowkeeper" } 335.1 "Throne Of Shadow" Ability { id: "5717", source: "Shadowkeeper" } 341.6 "Umbra Smash" Ability { id: "5BAA", source: "Shadowkeeper" } @@ -74,8 +74,8 @@ hideall "--sync--" 431.0 "Umbral Orbs" Ability { id: "5731", source: "Shadowkeeper" } 438.9 "Distant Scream" Ability { id: "5716", source: "Shadowkeeper" } 440.9 "Flameshadow" Ability { id: "5733", source: "Shadefire" } -449.6 "Implosion" Ability { id: "(5700|56FC)", source: "Shadowkeeper" } -452.7 "Implosion" Ability { id: "(5702|5701|56FE)", source: "Shadowkeeper" } +449.6 "Implosion" Ability { id: ["5700", "56FC"], source: "Shadowkeeper" } +452.7 "Implosion" Ability { id: ["5702", "5701", "56FE"], source: "Shadowkeeper" } 464.8 "Deepshadow Nova" Ability { id: "573E", source: "Shadowkeeper" } 476.0 "Shackled Apart" Ability { id: "5BAC", source: "Shadowkeeper" } 478.5 "--sync--" Ability { id: "5B08", source: "Shadowkeeper" } @@ -87,10 +87,10 @@ hideall "--sync--" 516.0 "Deepshadow Nova" Ability { id: "573E", source: "Shadowkeeper" } 531.6 "Throne Of Shadow" Ability { id: "5717", source: "Shadowkeeper" } 538.2 "Pitch Bog" Ability { id: "5721", source: "Shadowkeeper" } -546.6 "Giga Slash" Ability { id: "(56F8|56F4)", source: "Shadowkeeper" } -549.7 "Giga Slash" Ability { id: "(56F9|56F5)", source: "Shadowkeeper" } -552.8 "Giga Slash" Ability { id: "(56F9|56F5)", source: "Shadowkeeper" } -555.9 "Giga Slash" Ability { id: "(56FA|56F6)", source: "Shadowkeeper" } +546.6 "Giga Slash" Ability { id: ["56F8", "56F4"], source: "Shadowkeeper" } +549.7 "Giga Slash" Ability { id: ["56F9", "56F5"], source: "Shadowkeeper" } +552.8 "Giga Slash" Ability { id: ["56F9", "56F5"], source: "Shadowkeeper" } +555.9 "Giga Slash" Ability { id: ["56FA", "56F6"], source: "Shadowkeeper" } 563.0 "Voidgate Amplifier" Ability { id: "5BCF", source: "Shadowkeeper" } 570.1 "Shadowkeeper" Ability { id: "5720", source: "Shadowkeeper" } 573.2 "Swath Of Silence" Ability { id: "5BBF", source: "Shadow Of A Hero" } diff --git a/ui/raidboss/data/05-shb/raid/e11n.txt b/ui/raidboss/data/05-shb/raid/e11n.txt index dfda081196..a4bcf5bc3d 100644 --- a/ui/raidboss/data/05-shb/raid/e11n.txt +++ b/ui/raidboss/data/05-shb/raid/e11n.txt @@ -68,9 +68,9 @@ hideall "--sync--" 341.4 "Brightfire" # Ability { id: "563[BC]", source: "Halo Of Flame" } 346.1 "--center--" Ability { id: "5908", source: "Fatebreaker" } 356.8 "Burnt Strike" Ability { id: "56(2C|2E|30)", source: "Fatebreaker" } -358.5 "Blastburn/Burnout" # Ability { id: "(2D|2F|31)", source: "Fatebreaker" } +358.5 "Blastburn/Burnout" # Ability { id: "56(2D|2F|31)", source: "Fatebreaker" } 369.2 "Burnt Strike" Ability { id: "56(2C|2E|30)", source: "Fatebreaker" } -370.9 "Blastburn/Burnout" # Ability { id: "(2D|2F|31)", source: "Fatebreaker" } +370.9 "Blastburn/Burnout" # Ability { id: "56(2D|2F|31)", source: "Fatebreaker" } 381.2 "Burnished Glory" Ability { id: "5650", source: "Fatebreaker" } # Fetters rotation block diff --git a/ui/raidboss/data/05-shb/raid/e12s.txt b/ui/raidboss/data/05-shb/raid/e12s.txt index 9bf3089cb8..976f5e2dd8 100644 --- a/ui/raidboss/data/05-shb/raid/e12s.txt +++ b/ui/raidboss/data/05-shb/raid/e12s.txt @@ -18,9 +18,9 @@ hideall "--sync--" 25.8 "Initialize Recall" Ability { id: "588C", source: "Eden's Promise" } 32.4 "Junction Shiva/Titan" Ability { id: "589[45]", source: "Eden's Promise" } 40.1 "Rapturous Reach" Ability { id: "58A[DE]", source: "Eden's Promise" } -43.6 "Frigid Stone/Under The Weight" Ability { id: "(589E|58A6)", source: "Eden's Promise" } +43.6 "Frigid Stone/Under The Weight" Ability { id: ["589E", "58A6"], source: "Eden's Promise" } 53.3 "Cast" Ability { id: "4E43", source: "Eden's Promise" } -56.8 "Frigid Stone/Under The Weight" Ability { id: "(589E|58A6)", source: "Eden's Promise" } +56.8 "Frigid Stone/Under The Weight" Ability { id: ["589E", "58A6"], source: "Eden's Promise" } 57.5 "--sync--" Ability { id: "58A7", source: "Eden's Promise" } 68.7 "Formless Judgment" Ability { id: "58A9", source: "Eden's Promise" } #69.0 "Formless Judgment" Ability { id: "58AC", source: "Eden's Promise" } @@ -94,13 +94,13 @@ hideall "--sync--" 418.2 "--middle--" Ability { id: "58AF", source: "Eden's Promise" } 424.3 "Junction Shiva/Titan" Ability { id: "589[45]", source: "Eden's Promise" } 434.0 "Cast" Ability { id: "4E43", source: "Eden's Promise" } -437.5 "Frigid Stone/Under The Weight" Ability { id: "(589E|58A6)", source: "Eden's Promise" } +437.5 "Frigid Stone/Under The Weight" Ability { id: ["589E", "58A6"], source: "Eden's Promise" } 438.2 "--sync--" Ability { id: "58A7", source: "Eden's Promise" } 445.8 "Maleficium" Ability { id: "58A8", source: "Eden's Promise" } 453.0 "Junction Shiva/Titan" Ability { id: "589[45]", source: "Eden's Promise" } 462.7 "Release" Ability { id: "5893", source: "Eden's Promise" } -466.2 "Frigid Stone/Under The Weight" Ability { id: "(589E|58A6)", source: "Eden's Promise" } +466.2 "Frigid Stone/Under The Weight" Ability { id: ["589E", "58A6"], source: "Eden's Promise" } 466.9 "--sync--" Ability { id: "58A7", source: "Eden's Promise" } 478.1 "Formless Judgment" Ability { id: "58A9", source: "Eden's Promise" } diff --git a/ui/raidboss/data/05-shb/raid/e2s.txt b/ui/raidboss/data/05-shb/raid/e2s.txt index 6685edbee2..7f4ec1149f 100644 --- a/ui/raidboss/data/05-shb/raid/e2s.txt +++ b/ui/raidboss/data/05-shb/raid/e2s.txt @@ -11,7 +11,7 @@ hideall "Spell-In-Waiting" 10.5 "--sync--" Ability { id: "3E63", source: "Voidwalker" } window 11,5 11.2 "Doomvoid Cleaver" Ability { id: "3E64", source: "Voidwalker" } 25.4 "Unholy Darkness" Ability { id: "3E54", source: "Voidwalker" } -31.8 "Slicer/Guillotine" Ability { id: "(3E4F|3E50)", source: "Voidwalker" } +31.8 "Slicer/Guillotine" Ability { id: ["3E4F", "3E50"], source: "Voidwalker" } 43.8 "Dark Fire III" Ability { id: "3E57", source: "Voidwalker" } 59.2 "Spell-In-Waiting" Ability { id: "3E52", source: "Voidwalker" } 69.3 "Punishing Ray" Ability { id: "3E5B", source: "Voidwalker" } @@ -41,11 +41,11 @@ hideall "Spell-In-Waiting" 282.9 "Light/Dark Circles" # ??? 286.4 "Doomvoid Cleaver" Ability { id: "3E64", source: "Voidwalker" } 295.7 "Unholy Darkness" Ability { id: "3E54", source: "Voidwalker" } -304.1 "Slicer/Guillotine" Ability { id: "(3E4F|3E50)", source: "Voidwalker" } +304.1 "Slicer/Guillotine" Ability { id: ["3E4F", "3E50"], source: "Voidwalker" } 330.3 "Shadowflame" Ability { id: "3E61", source: "Voidwalker" } 342.5 "Entropy" Ability { id: "3E70", source: "Voidwalker" } 348.1 "Spell-In-Waiting" Ability { id: "3E52", source: "Voidwalker" } -358.2 "Empty Hate/Rage" Ability { id: "(3E5A|3E6C)", source: "Voidwalker" } +358.2 "Empty Hate/Rage" Ability { id: ["3E5A", "3E6C"], source: "Voidwalker" } 361.4 "Spell-In-Waiting" Ability { id: "3E52", source: "Voidwalker" } 374.7 "Spell-In-Waiting" Ability { id: "3E52", source: "Voidwalker" } 381.6 "Flare" Ability { id: "4685", source: "Voidwalker" } @@ -64,21 +64,21 @@ hideall "Spell-In-Waiting" # FIXME: I've seen this push ~6s earlier once # but is pretty consistent otherwise? 499.2 "Quietus" Ability { id: "3E71", source: "Voidwalker" } window 500,20 -507.4 "Cycle Of ?" Ability { id: "(40B9|4659)", source: "Voidwalker" } +507.4 "Cycle Of ?" Ability { id: ["40B9", "4659"], source: "Voidwalker" } 510.5 "Slicer/Guillotine?" Ability { id: "465A", source: "Voidwalker" } 511.2 "Cleaver/Slicer?" Ability { id: "3E64", source: "Voidwalker" } 513.6 "Guillotine/Cleaver?" Ability { id: "465B", source: "Voidwalker" } -531.8 "Cycle Of ?" Ability { id: "(40B9|4659)", source: "Voidwalker" } +531.8 "Cycle Of ?" Ability { id: ["40B9", "4659"], source: "Voidwalker" } 534.9 "Slicer/Guillotine?" Ability { id: "40BA", source: "Voidwalker" } 538.0 "Cleaver/Slicer?" Ability { id: "40BB", source: "Voidwalker" } 538.7 "Guillotine/Cleaver?" Ability { id: "3E64", source: "Voidwalker" } 558.2 "Quietus" Ability { id: "3E71", source: "Voidwalker" } -568.2 "Cycle Of ?" Ability { id: "(40B9|4659)", source: "Voidwalker" } -571.3 "Slicer/Guillotine?" Ability { id: "(40BA|465A)", source: "Voidwalker" } -574.4 "Cleaver/Slicer?" #Ability { id: "(40BB|3E64)", source: "Voidwalker" } -575.1 "Guillotine/Cleaver?" #Ability { id: "(3E64|465B)", source: "Voidwalker" } +568.2 "Cycle Of ?" Ability { id: ["40B9", "4659"], source: "Voidwalker" } +571.3 "Slicer/Guillotine?" Ability { id: ["40BA", "465A"], source: "Voidwalker" } +574.4 "Cleaver/Slicer?" #Ability { id: ["40BB", "3E64"], source: "Voidwalker" } +575.1 "Guillotine/Cleaver?" #Ability { id: ["3E64", "465B"], source: "Voidwalker" } 593.2 "Quietus" Ability { id: "3E71", source: "Voidwalker" } 602.5 "Quietus" Ability { id: "3E71", source: "Voidwalker" } 611.8 "Quietus" Ability { id: "3E71", source: "Voidwalker" } diff --git a/ui/raidboss/data/05-shb/raid/e3s.txt b/ui/raidboss/data/05-shb/raid/e3s.txt index d340fb5ef7..f6415e8855 100644 --- a/ui/raidboss/data/05-shb/raid/e3s.txt +++ b/ui/raidboss/data/05-shb/raid/e3s.txt @@ -11,11 +11,11 @@ hideall "--sync--" 23.9 "Rip Current" Ability { id: "3FE0", source: "Leviathan" } 43.3 "Undersea Quake" Ability { id: "3FEF", source: "Leviathan" } 46.1 "Tidal Wave" Ability { id: "3FF2", source: "Leviathan" } -52.4 "Temporary Current" Ability { id: "(3FEB|3FEA)", source: "Leviathan" } +52.4 "Temporary Current" Ability { id: ["3FEB", "3FEA"], source: "Leviathan" } 61.6 "Drenching Pulse" Ability { id: "3FE2", source: "Leviathan" } 65.7 "Monster Wave" Ability { id: "3FE5", source: "Leviathan" } 69.7 "Freak Wave" Ability { id: "3FE6", source: "Leviathan" } -73.7 "Temporary Current" Ability { id: "(3FEB|3FEA)", source: "Leviathan" } +73.7 "Temporary Current" Ability { id: ["3FEB", "3FEA"], source: "Leviathan" } 87.9 "Maelstrom" Ability { id: "3FFA", source: "Leviathan" } 90.0 "--untargetable--" 99.3 "Spinning Dive 1" #Ability { id: "3FFD", source: "Leviathan" } @@ -26,24 +26,24 @@ hideall "--sync--" 132.8 "Tsunami" Ability { id: "441C", source: "Leviathan" } 141.4 "Sundering Tsunami" Ability { id: "3FF6", source: "Leviathan" } 146.1 "Undersea Quake" Ability { id: "3FEE", source: "Leviathan" } -158.4 "Temporary Current" Ability { id: "(3FEB|3FEA)", source: "Leviathan" } +158.4 "Temporary Current" Ability { id: ["3FEB", "3FEA"], source: "Leviathan" } 158.4 "Smothering Tsunami" Ability { id: "3FF7", source: "Leviathan" } 158.4 "Swirling Tsunami" Ability { id: "3FF4", source: "Leviathan" } 168.7 "Tidal Roar" Ability { id: "3FDC", source: "Leviathan" } 175.9 "Rip Current" Ability { id: "3FE0", source: "Leviathan" } -186.1 "Temporary Current" Ability { id: "(3FEB|3FEA)", source: "Leviathan" } +186.1 "Temporary Current" Ability { id: ["3FEB", "3FEA"], source: "Leviathan" } 197.3 "Tidal Roar" Ability { id: "3FDC", source: "Leviathan" } 210.4 "Refreshing Shower" Ability { id: "400F", source: "Leviathan" } 223.6 "Tidal Rage" Ability { id: "3FDE", source: "Leviathan" } 235.9 "Undersea Quake" Ability { id: "3FEF", source: "Leviathan" } 238.9 "Tidal Wave" Ability { id: "3FF2", source: "Leviathan" } -246.0 "Temporary Current" Ability { id: "(3FEB|3FEA)", source: "Leviathan" } -250.1 "Temporary Current" Ability { id: "(3FEC|3FED)", source: "Leviathan" } +246.0 "Temporary Current" Ability { id: ["3FEB", "3FEA"], source: "Leviathan" } +250.1 "Temporary Current" Ability { id: ["3FEC", "3FED"], source: "Leviathan" } 256.2 "Drenching Pulse" Ability { id: "3FE2", source: "Leviathan" } 260.3 "Monster Wave" Ability { id: "3FE9", source: "Leviathan" } 264.3 "Freak Wave" Ability { id: "3FE6", source: "Leviathan" } -269.4 "Temporary Current" Ability { id: "(3FEB|3FEA)", source: "Leviathan" } -273.5 "Temporary Current" Ability { id: "(3FEC|3FED)", source: "Leviathan" } +269.4 "Temporary Current" Ability { id: ["3FEB", "3FEA"], source: "Leviathan" } +273.5 "Temporary Current" Ability { id: ["3FEC", "3FED"], source: "Leviathan" } 287.8 "Maelstrom" Ability { id: "3FFA", source: "Leviathan" } 290.0 "--untargetable--" 301.2 "Spinning Dive 1" #Ability { id: "3FFD", source: "Leviathan" } @@ -55,8 +55,8 @@ hideall "--sync--" 339.7 "Stormy Horizon" Ability { id: "3FFE", source: "Leviathan" } 346.8 "Monster Wave x4" duration 6 #Ability { id: "3FE9", source: "Leviathan" } 352.8 "Backbreaking Wave" Ability { id: "4001", source: "Leviathan" } -353.9 "Temporary Current" Ability { id: "(3FEB|3FEA)", source: "Leviathan" } -358.1 "Temporary Current" Ability { id: "(3FEC|3FED)", source: "Leviathan" } +353.9 "Temporary Current" Ability { id: ["3FEB", "3FEA"], source: "Leviathan" } +358.1 "Temporary Current" Ability { id: ["3FEC", "3FED"], source: "Leviathan" } 363.0 "Plunging Wave x5" duration 4.4 #Ability { id: "4003", source: "Leviathan" } 373.2 "Tidal Rage" Ability { id: "3FDE", source: "Leviathan" } 383.5 "Tidal Rage" Ability { id: "3FDE", source: "Leviathan" } @@ -72,8 +72,8 @@ hideall "--sync--" 449.2 "Sundering Tsunami" #Ability { id: "3FF6", source: "Leviathan" } 453.2 "Sundering Tsunami" #Ability { id: "3FF6", source: "Leviathan" } 457.1 "Scouring Tsunami" Ability { id: "3CE0", source: "Leviathan" } -466.8 "Temporary Current" Ability { id: "(3FEB|3FEA)", source: "Leviathan" } -470.9 "Temporary Current" Ability { id: "(3FEC|3FED)", source: "Leviathan" } +466.8 "Temporary Current" Ability { id: ["3FEB", "3FEA"], source: "Leviathan" } +470.9 "Temporary Current" Ability { id: ["3FEC", "3FED"], source: "Leviathan" } 483.1 "Tidal Rage" Ability { id: "3FDE", source: "Leviathan" } 493.2 "Tidal Rage" Ability { id: "3FDE", source: "Leviathan" } 500.3 "Rip Current" Ability { id: "3FE0", source: "Leviathan" } @@ -86,8 +86,8 @@ hideall "--sync--" 536.9 "Spilling Wave x12" duration 15 #Ability { id: "4008", source: "Leviathan" } 540.9 "Hydrothermal Vent x4" duration 9 #Ability { id: "4004", source: "Leviathan" } 544.4 "Hot Water x5" duration 9 #Ability { id: "4005", source: "Leviathan" } -561.9 "Temporary Current" Ability { id: "(3FEB|3FEA)", source: "Leviathan" } -565.9 "Temporary Current" Ability { id: "(3FEC|3FED)", source: "Leviathan" } +561.9 "Temporary Current" Ability { id: ["3FEB", "3FEA"], source: "Leviathan" } +565.9 "Temporary Current" Ability { id: ["3FEC", "3FED"], source: "Leviathan" } 576.9 "Tidal Rage" Ability { id: "3FDE", source: "Leviathan" } 587.9 "Tidal Rage" Ability { id: "3FDE", source: "Leviathan" } 604.9 "The Calm" Ability { id: "4009", source: "Leviathan" } diff --git a/ui/raidboss/data/05-shb/raid/e4n.txt b/ui/raidboss/data/05-shb/raid/e4n.txt index a6a5d9f76d..d51b5bd03a 100644 --- a/ui/raidboss/data/05-shb/raid/e4n.txt +++ b/ui/raidboss/data/05-shb/raid/e4n.txt @@ -81,8 +81,8 @@ hideall "Earthen Wheels" 1274.3 "Geocrush" Ability { id: "40F6", source: "Titan" } 1278.1 "Earthen Gauntlets" Ability { id: "40E6", source: "Titan" } 1286.2 "Massive Landslide" Ability { id: "40FA", source: "Titan" } -1300.8 "Left/Right Landslide" Ability { id: "(40FF|4100)", source: "Titan" } -1315.4 "Left/Right Landslide" Ability { id: "(40FF|4100)", source: "Titan" } +1300.8 "Left/Right Landslide" Ability { id: ["40FF", "4100"], source: "Titan" } +1315.4 "Left/Right Landslide" Ability { id: ["40FF", "4100"], source: "Titan" } 1324.1 "Earthen Armor" Ability { id: "40E7", source: "Titan" } @@ -163,8 +163,8 @@ hideall "Earthen Wheels" 2400.4 "Geocrush" Ability { id: "40F6", source: "Titan" } 2404.2 "Earthen Gauntlets" Ability { id: "40E6", source: "Titan" } 2412.3 "Massive Landslide" Ability { id: "40FA", source: "Titan" } -2426.9 "Left/Right Landslide" Ability { id: "(40FF|4100)", source: "Titan" } -2441.5 "Left/Right Landslide" Ability { id: "(40FF|4100)", source: "Titan" } +2426.9 "Left/Right Landslide" Ability { id: ["40FF", "4100"], source: "Titan" } +2441.5 "Left/Right Landslide" Ability { id: ["40FF", "4100"], source: "Titan" } 2450.1 "Earthen Armor" Ability { id: "40E7", source: "Titan" } diff --git a/ui/raidboss/data/05-shb/raid/e4s.txt b/ui/raidboss/data/05-shb/raid/e4s.txt index 7f49315e64..347d42b7ce 100644 --- a/ui/raidboss/data/05-shb/raid/e4s.txt +++ b/ui/raidboss/data/05-shb/raid/e4s.txt @@ -81,7 +81,7 @@ hideall "Earthen Wheels" 1000.0 "Orogenesis" Ability { id: "4371", source: "Titan" } window 1000,0 1026.3 "--targetable--" 1033.1 "Earthen Fury" Ability { id: "4124", source: "Titan Maximum" } -1048.3 "Earthen Fist" Ability { id: "(4130|4131|4132|412F)", source: "Titan Maximum" } +1048.3 "Earthen Fist" Ability { id: ["4130", "4131", "4132", "412F"], source: "Titan Maximum" } 1053.2 "Weight of the Land" Ability { id: "4108", source: "Titan" } 1061.9 "Dual Earthen Fists" Ability { id: "4135", source: "Titan Maximum" } 1065.9 "Earthen Anguish" Ability { id: "4137", source: "Titan" } @@ -98,7 +98,7 @@ hideall "Earthen Wheels" 1180.7 "Tumult x5" Ability { id: "412A", source: "Titan Maximum" } duration 6 1197.4 "Dual Earthen Fists" Ability { id: "4135", source: "Titan Maximum" } 1201.4 "Earthen Anguish" Ability { id: "4137", source: "Titan" } -1208.3 "Earthen Fist" Ability { id: "(4130|4131|4132|412F)", source: "Titan Maximum" } +1208.3 "Earthen Fist" Ability { id: ["4130", "4131", "4132", "412F"], source: "Titan Maximum" } 1225.7 "Tectonic Uplift" Ability { id: "4122", source: "Titan Maximum" } 1249.0 "Pulse of the Land" Ability { id: "4106", source: "Titan" } 1226.6 "Force of the Land" Ability { id: "4107", source: "Titan" } @@ -127,7 +127,7 @@ hideall "Earthen Wheels" 1438.1 "Earthen Fury" Ability { id: "413A", source: "Titan Maximum" } 1457.3 "Pulse of the Land" Ability { id: "4106", source: "Titan" } 1457.3 "Force of the Land" Ability { id: "4107", source: "Titan" } -1468.4 "Earthen Fist" Ability { id: "(4130|4131|4132|412F)", source: "Titan Maximum" } +1468.4 "Earthen Fist" Ability { id: ["4130", "4131", "4132", "412F"], source: "Titan Maximum" } 1479.5 "Stonecrusher 1" Ability { id: "4116", source: "Titan" } 1482.6 "Stonecrusher 2" #Ability { id: "4143", source: "Titan" } 1485.7 "Stonecrusher 3" #Ability { id: "4143", source: "Titan" } @@ -135,7 +135,7 @@ hideall "Earthen Wheels" 1504.1 "Earthen Fury" Ability { id: "413A", source: "Titan Maximum" } 1523.4 "Pulse of the Land" Ability { id: "4106", source: "Titan" } 1523.4 "Force of the Land" Ability { id: "4107", source: "Titan" } -1534.3 "Earthen Fist" Ability { id: "(4130|4131|4132|412F)", source: "Titan Maximum" } +1534.3 "Earthen Fist" Ability { id: ["4130", "4131", "4132", "412F"], source: "Titan Maximum" } 1543.4 "Voice of the Land" Ability { id: "4114", source: "Titan" } 1546.2 "Tumult x5" Ability { id: "412A", source: "Titan Maximum" } duration 6 1555.6 "Voice of the Land" Ability { id: "4114", source: "Titan" } diff --git a/ui/raidboss/data/05-shb/raid/e7n.txt b/ui/raidboss/data/05-shb/raid/e7n.txt index 0eab7173ff..4baac59b79 100644 --- a/ui/raidboss/data/05-shb/raid/e7n.txt +++ b/ui/raidboss/data/05-shb/raid/e7n.txt @@ -14,13 +14,13 @@ hideall "--sync--" 49.6 "Light's Course" # Ability { id: "4C3C", source: "Unforgiven Idolatry" } 52.6 "Light's Course" # Ability { id: "4C3C", source: "Unforgiven Idolatry" } 55.5 "Betwixt Worlds" Ability { id: "4CF8", source: "The Idol Of Darkness" } window 20,20 -72.7 "Light's Course" # Ability { id: "(4E63|4C3C)", source: "Unforgiven Idolatry" } -75.7 "Light's Course" # Ability { id: "(4E63|4C3C)", source: "Unforgiven Idolatry" } +72.7 "Light's Course" # Ability { id: ["4E63", "4C3C"], source: "Unforgiven Idolatry" } +75.7 "Light's Course" # Ability { id: ["4E63", "4C3C"], source: "Unforgiven Idolatry" } 78.7 "Light's Course" # Ability { id: "4C40", source: "Unforgiven Idolatry" } 81.7 "Light's Course" # Ability { id: "4C40", source: "Unforgiven Idolatry" } 88.7 "Betwixt Worlds" Ability { id: "4CF8", source: "The Idol Of Darkness" } -104.9 "Light's Course" # Ability { id: "(4E63|4C3C)", source: "Unforgiven Idolatry" } -107.9 "Light's Course" # Ability { id: "(4E63|4C3C)", source: "Unforgiven Idolatry" } +104.9 "Light's Course" # Ability { id: ["4E63", "4C3C"], source: "Unforgiven Idolatry" } +107.9 "Light's Course" # Ability { id: ["4E63", "4C3C"], source: "Unforgiven Idolatry" } 110.8 "Light's Course" # Ability { id: "4C40", source: "Unforgiven Idolatry" } 113.8 "Light's Course" # Ability { id: "4C40", source: "Unforgiven Idolatry" } 124.6 "Away with Thee" Ability { id: "4C39", source: "The Idol Of Darkness" } window 30,30 @@ -39,7 +39,7 @@ hideall "--sync--" # Intermission block 226.3 "--targetable--" -236.8 "Away with Thee" Ability { id: "(4C39|4E7E)", source: "The Idol Of Darkness" } window 30,30 +236.8 "Away with Thee" Ability { id: ["4C39", "4E7E"], source: "The Idol Of Darkness" } window 30,30 251.7 "Strength in Numbers" Ability { id: "4C4[CD]", source: "Idolatry" } window 251.7,5 262.3 "Silver Shot" Ability { id: "4E7[CD]", source: "The Idol Of Darkness" } 270.3 "Silver Shot" Ability { id: "4E7[CD]", source: "The Idol Of Darkness" } @@ -48,8 +48,8 @@ hideall "--sync--" # Rotation block. 135.6 seconds -393.3 "--sync--" StartsUsing { id: "(4E5[46]|4C53)", source: "The Idol Of Darkness" } window 400,20 -400.0 "Empty Flood" Ability { id: "(4E5[46]|4C53)", source: "The Idol Of Darkness" } window 400,20 +393.3 "--sync--" StartsUsing { id: ["4E5[46]", "4C53"], source: "The Idol Of Darkness" } window 400,20 +400.0 "Empty Flood" Ability { id: ["4E5[46]", "4C53"], source: "The Idol Of Darkness" } window 400,20 410.3 "--targetable--" 414.4 "Unjoined Aspect" Ability { id: "4C3B", source: "The Idol Of Darkness" } 419.6 "Betwixt Worlds" Ability { id: "4CF8", source: "The Idol Of Darkness" } diff --git a/ui/raidboss/data/05-shb/raid/e8n.txt b/ui/raidboss/data/05-shb/raid/e8n.txt index a4ffb591a9..9a2ee3c5e3 100644 --- a/ui/raidboss/data/05-shb/raid/e8n.txt +++ b/ui/raidboss/data/05-shb/raid/e8n.txt @@ -62,7 +62,7 @@ hideall "--sync--" 348.6 "Bright Hunger" Ability { id: "4E0C", source: "Shiva" } 356.0 "Mirror, Mirror" Ability { id: "4DD4", source: "Shiva" } 368.1 "Kick/Frost" Ability { id: "4D(D[BC]|E[23])", source: "Shiva" } -373.2 "Reflected Kick/Frost" Ability { id: "(4DF[EF]|4E0[01])", source: "Frozen Mirror" } +373.2 "Reflected Kick/Frost" Ability { id: ["4DF[EF]", "4E0[01]"], source: "Frozen Mirror" } # Rotation block 385.3 "Redress" Ability { id: "4F4E", source: "Shiva" } @@ -71,7 +71,7 @@ hideall "--sync--" 413.7 "Double Slap" Ability { id: "4DDA", source: "Shiva" } 424.8 "Mirror, Mirror" Ability { id: "4DD4", source: "Shiva" } 437.0 "Kick/Frost" Ability { id: "4D(D[BC]|E[23])", source: "Shiva" } -442.1 "Reflected Kick/Frost" Ability { id: "(4DF[EF]|4E0[01])", source: "Frozen Mirror" } +442.1 "Reflected Kick/Frost" Ability { id: ["4DF[EF]", "4E0[01]"], source: "Frozen Mirror" } 455.2 "Absolute Zero" Ability { id: "4DD7", source: "Shiva" } 467.4 "Redress" Ability { id: "4F4F", source: "Shiva" } 472.6 "Shining Armor" Ability { id: "4DF1", source: "Shiva" } @@ -86,7 +86,7 @@ hideall "--sync--" 554.5 "Double Slap" Ability { id: "4DDA", source: "Shiva" } 565.6 "Mirror, Mirror" Ability { id: "4DD4", source: "Shiva" } 577.8 "Kick/Frost" Ability { id: "4D(D[BC]|E[23])", source: "Shiva" } -582.9 "Reflected Kick/Frost" Ability { id: "(4DF[EF]|4E0[01])", source: "Frozen Mirror" } +582.9 "Reflected Kick/Frost" Ability { id: ["4DF[EF]", "4E0[01]"], source: "Frozen Mirror" } 596.0 "Absolute Zero" Ability { id: "4DD7", source: "Shiva" } 608.2 "Redress" Ability { id: "4F4F", source: "Shiva" } 613.4 "Shining Armor" Ability { id: "4DF1", source: "Shiva" } diff --git a/ui/raidboss/data/05-shb/trial/diamond_weapon-ex.txt b/ui/raidboss/data/05-shb/trial/diamond_weapon-ex.txt index 42153c597f..67a70db8be 100644 --- a/ui/raidboss/data/05-shb/trial/diamond_weapon-ex.txt +++ b/ui/raidboss/data/05-shb/trial/diamond_weapon-ex.txt @@ -37,7 +37,7 @@ hideall "--sync--" 197.8 "--targetable--" 210.0 "Outrage" Ability { id: "5FBC", source: "The Diamond Weapon" } 218.2 "Outrage" Ability { id: "5FBC", source: "The Diamond Weapon" } -229.6 "Auri Arts (Z)" Ability { id: "(5FAF|5FF8)", source: "The Diamond Weapon" } +229.6 "Auri Arts (Z)" Ability { id: ["5FAF", "5FF8"], source: "The Diamond Weapon" } 229.6 "--untargetable--" 236.4 "Auri Arts (Jump)" Ability { id: "5FB2", source: "The Diamond Weapon" } 241.0 "--targetable--" @@ -51,7 +51,7 @@ hideall "--sync--" 291.1 "Outrage" Ability { id: "5FBC", source: "The Diamond Weapon" } 301.3 "Articulated Bits" Ability { id: "5FC1", source: "The Diamond Weapon" } 312.4 "Aetherial Bullet" Ability { id: "5FAB", source: "Articulated Bit" } -312.9 "Auri Arts (Z)" Ability { id: "(5FAF|5FF8)", source: "The Diamond Weapon" } +312.9 "Auri Arts (Z)" Ability { id: ["5FAF", "5FF8"], source: "The Diamond Weapon" } 312.9 "--untargetable--" 319.7 "Auri Arts (Jump)" Ability { id: "5FB2", source: "The Diamond Weapon" } 320.4 "Aetherial Bullet" Ability { id: "5FAB", source: "Articulated Bit" } diff --git a/ui/raidboss/data/05-shb/trial/emerald_weapon-ex.txt b/ui/raidboss/data/05-shb/trial/emerald_weapon-ex.txt index a15f9c52c5..956dd953ed 100644 --- a/ui/raidboss/data/05-shb/trial/emerald_weapon-ex.txt +++ b/ui/raidboss/data/05-shb/trial/emerald_weapon-ex.txt @@ -69,7 +69,7 @@ hideall "--sync--" 1162.4 "Tertius Terminus Est" Ability { id: "55CC", source: "The Emerald Weapon" } 1168.1 "Split" Ability { id: "55(CF|D3)", source: "The Emerald Weapon" } 1174.3 "Expire / Sidescathe" Ability { id: "55D[145]", source: "The Emerald Weapon" } -1183.3 "Aire Tam Storm / Emerald Crusher" Ability { id: "(55D0|5585)", source: "The Emerald Weapon" } +1183.3 "Aire Tam Storm / Emerald Crusher" Ability { id: ["55D0", "5585"], source: "The Emerald Weapon" } 1186.7 "Tertius Terminus Est 1" #Ability { id: "55CE", source: "The Emerald Weapon" } 1187.9 "Tertius Terminus Est 2" #Ability { id: "55CE", source: "The Emerald Weapon" } 1189.0 "Tertius Terminus Est 3" #Ability { id: "55CE", source: "The Emerald Weapon" } @@ -91,7 +91,7 @@ hideall "--sync--" 1286.5 "Tertius Terminus Est" Ability { id: "55CC", source: "The Emerald Weapon" } 1292.7 "Split" Ability { id: "55(CF|D3)", source: "The Emerald Weapon" } 1298.5 "Sidescathe / Expire" Ability { id: "55D[145]", source: "The Emerald Weapon" } -1307.5 "Emerald Crusher / Aire Tam Storm" Ability { id: "(55D0|5585)", source: "The Emerald Weapon" } +1307.5 "Emerald Crusher / Aire Tam Storm" Ability { id: ["55D0", "5585"], source: "The Emerald Weapon" } 1310.4 "Tertius Terminus Est 1" #Ability { id: "55CE", source: "The Emerald Weapon" } 1311.6 "Tertius Terminus Est 2" #Ability { id: "55CE", source: "The Emerald Weapon" } 1312.8 "Tertius Terminus Est 3" #Ability { id: "55CE", source: "The Emerald Weapon" } diff --git a/ui/raidboss/data/05-shb/trial/emerald_weapon.txt b/ui/raidboss/data/05-shb/trial/emerald_weapon.txt index e38cf4d310..a1f98fd453 100644 --- a/ui/raidboss/data/05-shb/trial/emerald_weapon.txt +++ b/ui/raidboss/data/05-shb/trial/emerald_weapon.txt @@ -31,7 +31,7 @@ hideall "--sync--" 73.9 "Optimized Ultima" Ability { id: "5555", source: "The Emerald Weapon" } 79.1 "Split" Ability { id: "553A", source: "The Emerald Weapon" } -85.2 "Sidescathe" Ability { id: "(553F|5541)", source: "The Emerald Weapon" } +85.2 "Sidescathe" Ability { id: ["553F", "5541"], source: "The Emerald Weapon" } 95.0 "Emerald Crusher" Ability { id: "553E", source: "The Emerald Weapon" } 99.2 "--sync--" Ability { id: "5543", source: "The Emerald Weapon" } @@ -63,7 +63,7 @@ hideall "--sync--" 200.6 "Split" Ability { id: "553B", source: "The Emerald Weapon" } 211.7 "Bit Plasma" Ability { id: "554F", source: "Claw Bit" } -211.7 "Sidescathe" Ability { id: "(5540|5542)", source: "The Emerald Weapon" } +211.7 "Sidescathe" Ability { id: ["5540", "5542"], source: "The Emerald Weapon" } 219.2 "Bit Plasma" Ability { id: "554F", source: "Claw Bit" } 226.7 "Bit Plasma" Ability { id: "554F", source: "Claw Bit" } @@ -82,7 +82,7 @@ hideall "--sync--" # TODO: there's sometimes a 5544/5B1E ability here? 321.0 "Split" Ability { id: "553B", source: "The Emerald Weapon" } window 100,100 jump 200.6 332.1 "Bit Plasma" #Ability { id: "554F", source: "Claw Bit" } -332.1 "Sidescathe" #Ability { id: "(5541|5542)", source: "The Emerald Weapon" } +332.1 "Sidescathe" #Ability { id: ["5541", "5542"], source: "The Emerald Weapon" } 339.6 "Bit Plasma" #Ability { id: "554F", source: "Claw Bit" } 347.1 "Bit Plasma" #Ability { id: "554F", source: "Claw Bit" } diff --git a/ui/raidboss/data/05-shb/trial/hades-ex.txt b/ui/raidboss/data/05-shb/trial/hades-ex.txt index 252925ff81..8280965e47 100644 --- a/ui/raidboss/data/05-shb/trial/hades-ex.txt +++ b/ui/raidboss/data/05-shb/trial/hades-ex.txt @@ -12,8 +12,8 @@ hideall "--sync--" 9.6 "Ancient Double" Ability { id: "47A5", source: "Hades" } 18.7 "Shadow Spread 1" Ability { id: "47A9", source: "Hades" } 21.7 "Shadow Spread 2" Ability { id: "47AA", source: "Hades" } -29.6 "Bad Faith 1" Ability { id: "(47AE|47AD)", source: "Hades" } -32.7 "Bad Faith 2" Ability { id: "(47AF|47B0)", source: "Hades" } +29.6 "Bad Faith 1" Ability { id: ["47AE", "47AD"], source: "Hades" } +32.7 "Bad Faith 2" Ability { id: ["47AF", "47B0"], source: "Hades" } 40.9 "Ravenous Assault 1" Ability { id: "47A6", source: "Hades" } 44.1 "Ravenous Assault 2" Ability { id: "47A7", source: "Hades" } 50.2 "Arcane Utterance" Ability { id: "47B3", source: "Hades" } @@ -25,8 +25,8 @@ hideall "--sync--" 115.7 "Magic Spear/Chakram" #Ability { id: "47B6", source: "Arcane Font" } 128.9 "Shadow Spread 1" Ability { id: "47A9", source: "Hades" } 131.9 "Shadow Spread 2" Ability { id: "47AA", source: "Hades" } -139.8 "Bad Faith 1" Ability { id: "(47AE|47AD)", source: "Hades" } -142.9 "Bad Faith 2" Ability { id: "(47AF|47B0)", source: "Hades" } +139.8 "Bad Faith 1" Ability { id: ["47AE", "47AD"], source: "Hades" } +142.9 "Bad Faith 2" Ability { id: ["47AF", "47B0"], source: "Hades" } 151.1 "Ravenous Assault 1" Ability { id: "47A6", source: "Hades" } 154.3 "Ravenous Assault 2" Ability { id: "47A7", source: "Hades" } 168.6 "Ancient Dark IV" Ability { id: "47B7", source: "Hades" } diff --git a/ui/raidboss/data/05-shb/trial/hades.txt b/ui/raidboss/data/05-shb/trial/hades.txt index 42b57ad9e7..c1505baa5e 100644 --- a/ui/raidboss/data/05-shb/trial/hades.txt +++ b/ui/raidboss/data/05-shb/trial/hades.txt @@ -102,7 +102,7 @@ hideall "Double" 962.3 "Doom" 985.0 "Wail Of The Lost" Ability { id: "416[56]", source: "Hades" } -993.0 "Stream/Purgation?" Ability { id: "(415C|4170)", source: "Hades" } +993.0 "Stream/Purgation?" Ability { id: ["415C", "4170"], source: "Hades" } 1002.0 "Titanomachy" Ability { id: "4180", source: "Hades" } 1011.0 "Hellborn Yawp" Ability { id: "416E", source: "Hades" } 1021.0 "Echo Of The Lost" Ability { id: "416[34]", source: "Hades" } diff --git a/ui/raidboss/data/05-shb/trial/ruby_weapon-ex.txt b/ui/raidboss/data/05-shb/trial/ruby_weapon-ex.txt index 83604d4704..f202e7397d 100644 --- a/ui/raidboss/data/05-shb/trial/ruby_weapon-ex.txt +++ b/ui/raidboss/data/05-shb/trial/ruby_weapon-ex.txt @@ -18,10 +18,10 @@ hideall "--sync--" 36.0 "Flexiclaw" Ability { id: "4A92", source: "The Ruby Weapon" } 38.9 "Magitek Ray" Ability { id: "4AD2", source: "Ruby Bit" } 44.6 "Helicoclaw" Ability { id: "4A99", source: "The Ruby Weapon" } -45.3 "Spike Of Flame" Ability { id: "(4D04|4AD3)", source: "The Ruby Weapon" } +45.3 "Spike Of Flame" Ability { id: ["4D04", "4AD3"], source: "The Ruby Weapon" } 46.7 "Magitek Ray" Ability { id: "4AD2", source: "Ruby Bit" } 52.7 "Helicoclaw" Ability { id: "4A99", source: "The Ruby Weapon" } -53.4 "Spike Of Flame" Ability { id: "(4D04|4AD3)", source: "The Ruby Weapon" } +53.4 "Spike Of Flame" Ability { id: ["4D04", "4AD3"], source: "The Ruby Weapon" } 54.5 "Magitek Ray" Ability { id: "4AD2", source: "Ruby Bit" } 62.4 "Magitek Ray" Ability { id: "4AD2", source: "Ruby Bit" } 72.6 "Stamp" Ability { id: "4B03", source: "The Ruby Weapon" } @@ -29,7 +29,7 @@ hideall "--sync--" 80.2 "Ruby Sphere" Ability { id: "4AC9", source: "The Ruby Weapon" } 86.3 "Flexiclaw" Ability { id: "4A92", source: "The Ruby Weapon" } 95.9 "Ravensclaw" Ability { id: "4ACC", source: "The Ruby Weapon" } -102.0 "Liquefaction?/Undermine?" Ability { id: "(4ACF|4AD0)", source: "The Ruby Weapon" } +102.0 "Liquefaction?/Undermine?" Ability { id: ["4ACF", "4AD0"], source: "The Ruby Weapon" } 105.2 "Ruby Sphere 1" #Ability { id: "4ACA", source: "The Ruby Weapon" } 108.2 "Ruby Sphere 2" #Ability { id: "4ACA", source: "The Ruby Weapon" } 111.2 "Ruby Sphere 3" #Ability { id: "4ACA", source: "The Ruby Weapon" } @@ -57,7 +57,7 @@ hideall "--sync--" 261.8 "Ruby Sphere" Ability { id: "4AC9", source: "The Ruby Weapon" } 267.9 "Flexiclaw" Ability { id: "4A92", source: "The Ruby Weapon" } 277.5 "Ravensclaw" Ability { id: "4ACC", source: "The Ruby Weapon" } -283.6 "Undermine?/Liquefaction?" Ability { id: "(4ACF|4AD0)", source: "The Ruby Weapon" } +283.6 "Undermine?/Liquefaction?" Ability { id: ["4ACF", "4AD0"], source: "The Ruby Weapon" } 286.9 "Ruby Sphere 1" #Ability { id: "4ACA", source: "The Ruby Weapon" } 289.9 "Ruby Sphere 2" #Ability { id: "4ACA", source: "The Ruby Weapon" } 292.9 "Ruby Sphere 3" #Ability { id: "4ACA", source: "The Ruby Weapon" } diff --git a/ui/raidboss/data/05-shb/trial/ruby_weapon.txt b/ui/raidboss/data/05-shb/trial/ruby_weapon.txt index 15f319d15b..a8b6b29893 100644 --- a/ui/raidboss/data/05-shb/trial/ruby_weapon.txt +++ b/ui/raidboss/data/05-shb/trial/ruby_weapon.txt @@ -26,7 +26,7 @@ hideall "--sync--" 84.9 "--sync--" Ability { id: "4A9B", source: "The Ruby Weapon" } 90.1 "Flexiclaw" Ability { id: "4A92", source: "The Ruby Weapon" } 98.7 "Helicoclaw" Ability { id: "4A99", source: "The Ruby Weapon" } -99.4 "Spike Of Flame" Ability { id: "(4A9A|4D02)", source: "The Ruby Weapon" } +99.4 "Spike Of Flame" Ability { id: ["4A9A", "4D02"], source: "The Ruby Weapon" } 113.8 "High-Powered Homing Lasers" Ability { id: "4AC5", source: "The Ruby Weapon" } 120.5 "--sync--" Ability { id: "4A9B", source: "The Ruby Weapon" } 130.8 "Ravensflight" Ability { id: "4AA1", source: "The Ruby Weapon" } @@ -47,7 +47,7 @@ hideall "--sync--" 239.1 "--sync--" Ability { id: "4A9B", source: "The Ruby Weapon" } 244.4 "Flexiclaw" Ability { id: "4A92", source: "The Ruby Weapon" } 253.0 "Helicoclaw" Ability { id: "4A99", source: "The Ruby Weapon" } -253.7 "Spike Of Flame" Ability { id: "(4A9A|4D02)", source: "The Ruby Weapon" } +253.7 "Spike Of Flame" Ability { id: ["4A9A", "4D02"], source: "The Ruby Weapon" } 268.2 "High-Powered Homing Lasers" Ability { id: "4AC5", source: "The Ruby Weapon" } 274.9 "--sync--" Ability { id: "4A9B", source: "The Ruby Weapon" } 285.2 "Ravensflight" Ability { id: "4AA1", source: "The Ruby Weapon" } diff --git a/ui/raidboss/data/05-shb/trial/varis-ex.txt b/ui/raidboss/data/05-shb/trial/varis-ex.txt index c6554c7fa7..f2df6cb6bf 100644 --- a/ui/raidboss/data/05-shb/trial/varis-ex.txt +++ b/ui/raidboss/data/05-shb/trial/varis-ex.txt @@ -207,8 +207,8 @@ hideall "--sync--" 1200.0 "--untargetable--" 1200.0 "--sync--" Ability { id: "4CE0", source: "Varis Yae Galvus" } window 1200,0 1200.1 "Gunshield" -1210.4 "Magitek Spark/Torch" Ability { id: "(4CE4|4CE3)", source: "Gunshield" } window 10,5 -1219.1 "Magitek Torch/Spark" Ability { id: "(4CE4|4CE3)", source: "Gunshield" } window 5,5 +1210.4 "Magitek Spark/Torch" Ability { id: ["4CE4", "4CE3"], source: "Gunshield" } window 10,5 +1219.1 "Magitek Torch/Spark" Ability { id: ["4CE4", "4CE3"], source: "Gunshield" } window 5,5 # 52 second cast 1254.0 "Altius Enrage" Ability { id: "4CE1", source: "Varis Yae Galvus" } diff --git a/ui/raidboss/data/05-shb/trial/wol-ex.txt b/ui/raidboss/data/05-shb/trial/wol-ex.txt index 9faaa778e9..4a619c2223 100644 --- a/ui/raidboss/data/05-shb/trial/wol-ex.txt +++ b/ui/raidboss/data/05-shb/trial/wol-ex.txt @@ -139,7 +139,7 @@ hideall "Limit Break" 1559.4 "Meteor Impact 8" #Ability { id: "4F03", source: "Spectral Black Mage" } 1567.9 "Coruscant Saber" Ability { id: "4EF[12]", source: "Warrior Of Light" } 1568.0 "Cauterize" Ability { id: "4F07", source: "Wyrm Of Light" } -1580.2 "Limit Break" Ability { id: "(4EFB|53CB|515C)", source: "Warrior Of Light" } +1580.2 "Limit Break" Ability { id: ["4EFB", "53CB", "515C"], source: "Warrior Of Light" } ### TODO: bitter end gets moved up 0.5s if it's meteor??? 1593.1 "--sync--" StartsUsing { id: "4F0A", source: "Warrior Of Light" } window 10,10 1598.1 "The Bitter End" Ability { id: "4F0A", source: "Warrior Of Light" } @@ -185,7 +185,7 @@ hideall "Limit Break" 2556.6 "Absolute Holy" Ability { id: "4F2B", source: "Warrior Of Light" } 2556.6 "Deluge Of Death" Ability { id: "4F02", source: "Spectral Bard" } 2563.6 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" } -2571.8 "Limit Break" Ability { id: "(4EFB|53CB|515C)", source: "Warrior Of Light" } +2571.8 "Limit Break" Ability { id: ["4EFB", "53CB", "515C"], source: "Warrior Of Light" } 2584.1 "--sync--" StartsUsing { id: "4F0A", source: "Warrior Of Light" } window 10,10 2589.1 "The Bitter End" Ability { id: "4F0A", source: "Warrior Of Light" } @@ -326,7 +326,7 @@ hideall "Limit Break" 6050.9 "Coruscant Saber" Ability { id: "4EF[12]", source: "Warrior Of Light" } 6051.0 "Cauterize" Ability { id: "4F07", source: "Wyrm Of Light" } ### TODO: This is random (note: bitter end gets moved up 0.5s if it's meteor) -6063.1 "Limit Break" Ability { id: "(4EFB|53CB|515C)", source: "Warrior Of Light" } +6063.1 "Limit Break" Ability { id: ["4EFB", "53CB", "515C"], source: "Warrior Of Light" } 6075.9 "--sync--" StartsUsing { id: "4F0A", source: "Warrior Of Light" } window 10,10 6080.9 "The Bitter End" Ability { id: "4F0A", source: "Warrior Of Light" } 6084.1 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" } @@ -360,7 +360,7 @@ hideall "Limit Break" 7039.3 "Deluge Of Death" Ability { id: "4F02", source: "Spectral Bard" } 7039.3 "Absolute Holy" Ability { id: "4F2B", source: "Warrior Of Light" } 7046.3 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" } -7054.6 "Limit Break" Ability { id: "(4EFB|53CB|515C)", source: "Warrior Of Light" } +7054.6 "Limit Break" Ability { id: ["4EFB", "53CB", "515C"], source: "Warrior Of Light" } # TODO: guessing here 7066.8 "--sync--" StartsUsing { id: "4F0A", source: "Warrior Of Light" } window 10,10 7071.8 "The Bitter End" Ability { id: "4F0A", source: "Warrior Of Light" } diff --git a/ui/raidboss/data/06-ew/alliance/aglaia.txt b/ui/raidboss/data/06-ew/alliance/aglaia.txt index 70fa16d32e..d89c32c67c 100644 --- a/ui/raidboss/data/06-ew/alliance/aglaia.txt +++ b/ui/raidboss/data/06-ew/alliance/aglaia.txt @@ -49,8 +49,8 @@ hideall "Fan Flames" 1153.4 "The Builder's Forge" Ability { id: "716A", source: "Byregot" } 1168.0 "--sync--" StartsUsing { id: "72F9", source: "Byregot" } window 10,10 1171.0 "Builder's Build?" Ability { id: "72F9", source: "Byregot" } -1173.7 "--sync--" StartsUsing { id: "(725A|7167)", source: "Byregot" } window 10,10 -1179.7 "Byregot's Strike" Ability { id: "(725A|7167)", source: "Byregot" } +1173.7 "--sync--" StartsUsing { id: ["725A", "7167"], source: "Byregot" } window 10,10 +1179.7 "Byregot's Strike" Ability { id: ["725A", "7167"], source: "Byregot" } 1187.8 "Ordeal of Thunder" Ability { id: "7176", source: "Byregot" } 1196.9 "Reproduce" Ability { id: "716B", source: "Byregot" } 1199.8 "Builder's Build" Ability { id: "72FA", source: "Byregot's Avatar" } @@ -77,8 +77,8 @@ hideall "Fan Flames" 1319.9 "The Builder's Forge" Ability { id: "716A", source: "Byregot" } 1334.5 "--sync--" StartsUsing { id: "72F9", source: "Byregot" } window 10,10 1337.5 "Builder's Build?" Ability { id: "72F9", source: "Byregot" } -1340.2 "--sync--" StartsUsing { id: "(725A|7167)", source: "Byregot" } window 10,10 -1346.2 "Byregot's Strike" Ability { id: "(725A|7167)", source: "Byregot" } +1340.2 "--sync--" StartsUsing { id: ["725A", "7167"], source: "Byregot" } window 10,10 +1346.2 "Byregot's Strike" Ability { id: ["725A", "7167"], source: "Byregot" } 1354.3 "Ordeal of Thunder" Ability { id: "7176", source: "Byregot" } 1366.5 "Byregot's Ward" Ability { id: "7175", source: "Byregot" } 1374.6 "Reproduce" Ability { id: "716B", source: "Byregot" } @@ -217,11 +217,11 @@ hideall "Fan Flames" 4007.0 "--sync--" StartsUsing { id: "71D7", source: "Lioness of Aglaia" } window 10,10 4012.0 "Double Immolation" Ability { id: "71D7", source: "Lioness of Aglaia" } 4019.8 "--sync--" Ability { id: "71CD", source: "Lioness of Aglaia" } window 10,10 -4028.1 "Slash and Burn" Ability { id: "(71D0|71D2)", source: ["Lion of Aglaia", "Lioness of Aglaia"] } -4031.3 "Slash and Burn" Ability { id: "(71D6|71D5)", source: ["Lioness of Aglaia", "Lion of Aglaia"] } +4028.1 "Slash and Burn" Ability { id: ["71D0", "71D2"], source: ["Lion of Aglaia", "Lioness of Aglaia"] } +4031.3 "Slash and Burn" Ability { id: ["71D6", "71D5"], source: ["Lioness of Aglaia", "Lion of Aglaia"] } 4036.1 "--sync--" Ability { id: "71CD", source: "Lioness of Aglaia" } window 10,10 -4044.7 "Slash and Burn" Ability { id: "(71D0|71D2)", source: ["Lion of Aglaia", "Lioness of Aglaia"] } -4047.9 "Slash and Burn" Ability { id: "(71D6|71D5)", source: ["Lioness of Aglaia", "Lion of Aglaia"] } +4044.7 "Slash and Burn" Ability { id: ["71D0", "71D2"], source: ["Lion of Aglaia", "Lioness of Aglaia"] } +4047.9 "Slash and Burn" Ability { id: ["71D6", "71D5"], source: ["Lioness of Aglaia", "Lion of Aglaia"] } 4056.7 "--sync--" Ability { id: "71CD", source: "Lioness of Aglaia" } window 10,10 4063.8 "Roaring Blaze" Ability { id: "71CE", source: "Lioness of Aglaia" } 4066.8 "Roaring Blaze" Ability { id: "71CF", source: "Lion of Aglaia" } @@ -396,9 +396,9 @@ hideall "Fan Flames" # The Twin Halls will be sealed off 6000.0 "--sync--" SystemLogMessage { id: "7DC", param1: "1052" } window 10000,0 6008.2 "--sync--" StartsUsing { id: "70E9", source: "Nald'thal" } window 10,10 -6013.2 "As Above, So Below" Ability { id: "(70E8|70E9)", source: "Nald'thal" } +6013.2 "As Above, So Below" Ability { id: ["70E8", "70E9"], source: "Nald'thal" } 6027.4 "Heat Above, Flames Below" Ability { id: "73A5", source: "Nald'thal" } -6036.5 "As Above, So Below" Ability { id: "(70E8|70E9)", source: "Nald'thal" } +6036.5 "As Above, So Below" Ability { id: ["70E8", "70E9"], source: "Nald'thal" } 6049.7 "Heat Above, Flames Below" Ability { id: "73A4", source: "Nald'thal" } 6056.8 "--sync--" Ability { id: "73CD", source: "Nald'thal" } 6061.8 "Heavens' Trial" Ability { id: "711E", source: "Nald'thal" } @@ -413,7 +413,7 @@ hideall "Fan Flames" # Possible ~1s delay here 6102.0 "--sync--" StartsUsing { id: "70E[89]", source: "Nald'thal" } window 10,10 6107.0 "As Above, So Below" Ability { id: "70E[89]", source: "Nald'thal" } -6121.2 "Once Above, Ever Below" Ability { id: "(73BF|73C0|741C|741D)", source: "Nald'thal" } +6121.2 "Once Above, Ever Below" Ability { id: ["73BF", "73C0", "741C", "741D"], source: "Nald'thal" } # Possible ~5s delay here 6132.6 "--sync--" StartsUsing { id: "72B[79]", source: "Nald'thal" } window 10,10 @@ -438,7 +438,7 @@ hideall "Fan Flames" 6273.2 "Fortune's Flux" Ability { id: "7113", source: "Nald'thal" } 6275.1 "Seventh Passage 1" Ability { id: "7119", source: "Nald'thal" } 6277.8 "Seventh Passage 2" #Ability { id: "73AF", source: "Thal" } -6279.2 "Seventh Passage 3" #Ability { id: "(73AF|7118)", source: "Thal" } +6279.2 "Seventh Passage 3" #Ability { id: ["73AF", "7118"], source: "Thal" } 6289.7 "Soul's Measure" Ability { id: "7122", source: "Nald'thal" } 6290.8 "--untargetable--" @@ -457,19 +457,19 @@ hideall "Fan Flames" 7014.6 "Tipped Scales" Ability { id: "7388", source: "Nald'thal" } 7058.7 "--targetable--" -7070.2 "As Above, So Below" Ability { id: "(70E8|70E9)", source: "Nald'thal" } -7084.4 "Once Above, Ever Below" Ability { id: "(73BF|73C0|741C|741D)", source: "Nald'thal" } +7070.2 "As Above, So Below" Ability { id: ["70E8", "70E9"], source: "Nald'thal" } +7084.4 "Once Above, Ever Below" Ability { id: ["73BF", "73C0", "741C", "741D"], source: "Nald'thal" } 7091.6 "--sync--" Ability { id: "73CD", source: "Nald'thal" } 7095.5 "Stygian Tenet?" Ability { id: "711C", source: "Nald'thal" } 7096.6 "Heavens' Trial?" Ability { id: "711E", source: "Nald'thal" } 7097.5 "Smelting?" Ability { id: "7120", source: "Nald" } -7105.7 "As Above, So Below" Ability { id: "(70E8|70E9)", source: "Nald'thal" } -7119.9 "Hearth Above, Flight Below" Ability { id: "(741B|73CA|73CB|73CC)", source: "Nald'thal" } +7105.7 "As Above, So Below" Ability { id: ["70E8", "70E9"], source: "Nald'thal" } +7119.9 "Hearth Above, Flight Below" Ability { id: ["741B", "73CA", "73CB", "73CC"], source: "Nald'thal" } 7121.1 "Far-flung Fire?" Ability { id: "73AD", source: "Nald" } 7125.7 "Deepest Pit?" Ability { id: "73C7", source: "Thal" } duration 4 -7131.1 "Golden Tenet/Hells' Trial" Ability { id: "(7121|711A)", source: "Nald'thal" } +7131.1 "Golden Tenet/Hells' Trial" Ability { id: ["7121", "711A"], source: "Nald'thal" } 7147.6 "Hell of Fire" Ability { id: "72B[79]", source: "Nald'thal" } # Branch to Wayward Soul / Fired Up. @@ -502,19 +502,19 @@ hideall "Fan Flames" # Main loop, repeating the loop block intro, but with no more branching -8070.2 "As Above, So Below" Ability { id: "(70E8|70E9)", source: "Nald'thal" } -8084.4 "Once Above, Ever Below" Ability { id: "(73BF|73C0|741C|741D)", source: "Nald'thal" } +8070.2 "As Above, So Below" Ability { id: ["70E8", "70E9"], source: "Nald'thal" } +8084.4 "Once Above, Ever Below" Ability { id: ["73BF", "73C0", "741C", "741D"], source: "Nald'thal" } 8091.6 "--sync--" Ability { id: "73CD", source: "Nald'thal" } 8095.5 "Stygian Tenet?" Ability { id: "711C", source: "Nald'thal" } 8096.6 "Heavens' Trial?" Ability { id: "711E", source: "Nald'thal" } 8097.5 "Smelting?" Ability { id: "7120", source: "Nald" } -8105.7 "As Above, So Below" Ability { id: "(70E8|70E9)", source: "Nald'thal" } -8119.9 "Hearth Above, Flight Below" Ability { id: "(741B|73CA|73CB|73CC)", source: "Nald'thal" } +8105.7 "As Above, So Below" Ability { id: ["70E8", "70E9"], source: "Nald'thal" } +8119.9 "Hearth Above, Flight Below" Ability { id: ["741B", "73CA", "73CB", "73CC"], source: "Nald'thal" } 8121.1 "Far-flung Fire?" Ability { id: "73AD", source: "Nald" } 8125.7 "Deepest Pit?" Ability { id: "73C7", source: "Thal" } duration 4 -8131.1 "Golden Tenet/Hells' Trial" Ability { id: "(7121|711A)", source: "Nald'thal" } +8131.1 "Golden Tenet/Hells' Trial" Ability { id: ["7121", "711A"], source: "Nald'thal" } 8147.6 "Hell of Fire" Ability { id: "72B[79]", source: "Nald'thal" } 8159.5 "--sync--" StartsUsing { id: "7112", source: "Nald'thal" } window 20,20 @@ -524,7 +524,7 @@ hideall "Fan Flames" 8185.8 "Fortune's Flux" Ability { id: "7113", source: "Nald'thal" } 8187.7 "Seventh Passage 1" Ability { id: "7119", source: "Nald'thal" } 8190.4 "Seventh Passage 2" #Ability { id: "73AF", source: "Thal" } -8191.7 "Seventh Passage 3" #Ability { id: "(73AF|7118)", source: "Thal" } +8191.7 "Seventh Passage 3" #Ability { id: ["73AF", "7118"], source: "Thal" } 8197.1 "--sync--" Ability { id: "73CD", source: "Nald'thal" } 8202.1 "Heavens' Trial" Ability { id: "711E", source: "Nald'thal" } @@ -532,17 +532,17 @@ hideall "Fan Flames" 8212.3 "Golden Tenet" Ability { id: "711A", source: "Nald'thal" } 8227.5 "Hells' Trial" Ability { id: "7121", source: "Nald'thal" } -8238.5 "As Above, So Below" Ability { id: "(70E8|70E9)", source: "Nald'thal" } +8238.5 "As Above, So Below" Ability { id: ["70E8", "70E9"], source: "Nald'thal" } 8252.7 "Once Above, Ever Below" Ability { id: "73C0", source: "Nald'thal" } 8263.8 "Stygian Tenet?" Ability { id: "711C", source: "Nald'thal" } 8264.9 "Heavens' Trial?" Ability { id: "711E", source: "Nald'thal" } 8265.8 "Smelting?" Ability { id: "7120", source: "Nald" } -8274.0 "As Above, So Below" Ability { id: "(70E8|70E9)", source: "Nald'thal" } -8288.2 "Hearth Above, Flight Below" Ability { id: "(741B|73CA|73CB|73CC)", source: "Nald'thal" } +8274.0 "As Above, So Below" Ability { id: ["70E8", "70E9"], source: "Nald'thal" } +8288.2 "Hearth Above, Flight Below" Ability { id: ["741B", "73CA", "73CB", "73CC"], source: "Nald'thal" } 8289.4 "Far-flung Fire?" Ability { id: "73AD", source: "Nald" } 8294.0 "Deepest Pit?" Ability { id: "73C7", source: "Thal" } duration 4 -8299.4 "Golden Tenet/Hells' Trial" Ability { id: "(7121|711A)", source: "Nald'thal" } +8299.4 "Golden Tenet/Hells' Trial" Ability { id: ["7121", "711A"], source: "Nald'thal" } 8315.9 "Hell of Fire" Ability { id: "72B[79]", source: "Nald'thal" } 8324.1 "--sync--" Ability { id: "710D", source: "Nald'thal" } window 20,20 @@ -556,8 +556,8 @@ hideall "Fan Flames" 8390.5 "Hells' Trial" Ability { id: "7121", source: "Nald'thal" } # Loop back to beginning of loop block -8401.1 "As Above, So Below" Ability { id: "(70E8|70E9)", source: "Nald'thal" } window 50,50 jump 8070.2 -8415.3 "Once Above, Ever Below" #Ability { id: "(73BF|73C0|741C|741D)", source: "Nald'thal" } +8401.1 "As Above, So Below" Ability { id: ["70E8", "70E9"], source: "Nald'thal" } window 50,50 jump 8070.2 +8415.3 "Once Above, Ever Below" #Ability { id: ["73BF", "73C0", "741C", "741D"], source: "Nald'thal" } 8422.5 "--sync--" #Ability { id: "73CD", source: "Nald'thal" } 8426.4 "Stygian Tenet?" #Ability { id: "711C", source: "Nald'thal" } @@ -565,4 +565,4 @@ hideall "Fan Flames" 8428.4 "Smelting?" #Ability { id: "7120", source: "Nald" } 8436.6 "As Above, So Below" #Ability { id: "70E9", source: "Nald'thal" } -8450.8 "Hearth Above, Flight Below" #Ability { id: "(741B|73CA|73CB|73CC)", source: "Nald'thal" } +8450.8 "Hearth Above, Flight Below" #Ability { id: ["741B", "73CA", "73CB", "73CC"], source: "Nald'thal" } diff --git a/ui/raidboss/data/06-ew/alliance/euphrosyne.txt b/ui/raidboss/data/06-ew/alliance/euphrosyne.txt index 4f2c90886b..e9ccab46b7 100644 --- a/ui/raidboss/data/06-ew/alliance/euphrosyne.txt +++ b/ui/raidboss/data/06-ew/alliance/euphrosyne.txt @@ -37,9 +37,9 @@ hideall "Season's Passing" 1115.5 "Matron's Harvest" Ability { id: "7C1E", source: "Nophica" } 1123.7 "--middle--" Ability { id: "7C25", source: "Nophica" } -1143.8 "Blueblossoms/Giltblossoms 1" Ability { id: "(7C20|7C21)", source: "Nophica" } -1149.8 "Blueblossoms/Giltblossoms 2" Ability { id: "(7C20|7C21)", source: "Nophica" } -1155.8 "Blueblossoms/Giltblossoms 3" Ability { id: "(7C20|7C21)", source: "Nophica" } +1143.8 "Blueblossoms/Giltblossoms 1" Ability { id: ["7C20", "7C21"], source: "Nophica" } +1149.8 "Blueblossoms/Giltblossoms 2" Ability { id: ["7C20", "7C21"], source: "Nophica" } +1155.8 "Blueblossoms/Giltblossoms 3" Ability { id: ["7C20", "7C21"], source: "Nophica" } 1161.5 "Abundance" Ability { id: "7C24", source: "Nophica" } 1170.3 "Matron's Plenty" Ability { id: "7C08", source: "Nophica" } @@ -57,12 +57,12 @@ hideall "Season's Passing" 1227.9 "Matron's Harvest" Ability { id: "7C1E", source: "Nophica" } 1236.1 "--sync--" Ability { id: "7C25", source: "Nophica" } 1240.5 "Matron's Breath" Ability { id: "7C1F", source: "Nophica" } -1256.1 "Blueblossoms/Giltblossoms 1" Ability { id: "(7C20|7C21)", source: "Nophica" } -1259.7 "Blueblossoms/Giltblossoms 2" Ability { id: "(7C20|7C21)", source: "Nophica" } -1263.3 "Blueblossoms/Giltblossoms 3" Ability { id: "(7C20|7C21)", source: "Nophica" } -1266.9 "Blueblossoms/Giltblossoms 4" Ability { id: "(7C20|7C21)", source: "Nophica" } -1270.5 "Blueblossoms/Giltblossoms 5" Ability { id: "(7C20|7C21)", source: "Nophica" } -1274.1 "Blueblossoms/Giltblossoms 6" Ability { id: "(7C20|7C21)", source: "Nophica" } +1256.1 "Blueblossoms/Giltblossoms 1" Ability { id: ["7C20", "7C21"], source: "Nophica" } +1259.7 "Blueblossoms/Giltblossoms 2" Ability { id: ["7C20", "7C21"], source: "Nophica" } +1263.3 "Blueblossoms/Giltblossoms 3" Ability { id: ["7C20", "7C21"], source: "Nophica" } +1266.9 "Blueblossoms/Giltblossoms 4" Ability { id: ["7C20", "7C21"], source: "Nophica" } +1270.5 "Blueblossoms/Giltblossoms 5" Ability { id: ["7C20", "7C21"], source: "Nophica" } +1274.1 "Blueblossoms/Giltblossoms 6" Ability { id: ["7C20", "7C21"], source: "Nophica" } 1280.1 "Furrow" Ability { id: "7C16", source: "Nophica" } 1288.2 "Heavens' Earth" Ability { id: "7C22", source: "Nophica" } 1299.4 "Abundance" Ability { id: "7C24", source: "Nophica" } @@ -121,7 +121,7 @@ hideall "Season's Passing" 2235.2 "Petrai" Ability { id: "7A48", source: "Althyk" } 2240.2 "--middle--" Ability { id: "7A4A", source: "Althyk" } -2243.9 "Philotes" Ability { id: "(7A35|7A36)", source: "Althyk" } +2243.9 "Philotes" Ability { id: ["7A35", "7A36"], source: "Althyk" } 2247.7 "Hydrostasis" Ability { id: "7A3A", source: "Nymeia" } window 20,20 2261.0 "Time and Tide" Ability { id: "7A39", source: "Althyk" } 2261.8 "Hydrostasis 1" Ability { id: "7A3E", source: "Nymeia" } @@ -326,7 +326,7 @@ hideall "Season's Passing" 4038.0 "First Blush" Ability { id: "7BBC", source: "Menphina" } 4040.3 "--middle--" Ability { id: "7BD3", source: "Menphina" } -4048.6 "Midnight Frost" Ability { id: "(7BCB|7BCC)", source: "Menphina" } +4048.6 "Midnight Frost" Ability { id: ["7BCB", "7BCC"], source: "Menphina" } 4061.2 "Lunar Kiss" Ability { id: "7BF7", source: "Menphina" } 4070.0 "--sync--" Ability { id: "7BF5", source: "Menphina" } @@ -345,7 +345,7 @@ hideall "Season's Passing" 4109.9 "Lovers' Bridge 1" Ability { id: "7BBD", source: "Menphina" } 4112.8 "--middle--" Ability { id: "7BD3", source: "Menphina" } 4116.0 "Lovers' Bridge 2" Ability { id: "7BBE", source: "Menphina" } -4121.0 "Midnight Frost" Ability { id: "(7BCB|7BCC)", source: "Menphina" } +4121.0 "Midnight Frost" Ability { id: ["7BCB", "7BCC"], source: "Menphina" } # add phase 4125.8 "--sync--" Ability { id: "7BD3", source: "Menphina" } @@ -362,28 +362,28 @@ hideall "Season's Passing" 4500.0 "--sync--" StartsUsing { id: "8064", source: "Menphina" } window 500,0 4510.0 "Rise of the Twin Moons" Ability { id: "8064", source: "Menphina" } 4513.2 "--targetable--" -4526.6 "Midnight Frost" Ability { id: "(7BD7|7BD8|7BD9|7BDA)", source: "Menphina" } -4526.8 "Waxing Claw" Ability { id: "(7BE0|7BE1)", source: "Menphina" } +4526.6 "Midnight Frost" Ability { id: ["7BD7", "7BD8", "7BD9", "7BDA"], source: "Menphina" } +4526.8 "Waxing Claw" Ability { id: ["7BE0", "7BE1"], source: "Menphina" } -4535.5 "Playful Orbit" Ability { id: "(7BE2|7BE3)", source: "Menphina" } -4545.7 "Midnight Frost" Ability { id: "(7BE4|7BE5|7BE6|7BE7|7F0A|7F0B|7F0C|7F0D)", source: "Menphina" } -4545.8 "Waxing Claw" Ability { id: "(7BE0|7BE1)", source: "Menphina" } +4535.5 "Playful Orbit" Ability { id: ["7BE2", "7BE3"], source: "Menphina" } +4545.7 "Midnight Frost" Ability { id: ["7BE4", "7BE5", "7BE6", "7BE7", "7F0A", "7F0B", "7F0C", "7F0D"], source: "Menphina" } +4545.8 "Waxing Claw" Ability { id: ["7BE0", "7BE1"], source: "Menphina" } -4548.8 "--sync--" Ability { id: "(7C06|7C07)", source: "Menphina" } +4548.8 "--sync--" Ability { id: ["7C06", "7C07"], source: "Menphina" } 4558.9 "Blue Moon" Ability { id: "7BFB", source: "Menphina" } 4566.7 "--sync--" Ability { id: "7BF3", source: "Menphina" } 4573.3 "Keen Moonbeam" Ability { id: "7BF4", source: "Menphina" } -4579.3 "Midnight Frost" Ability { id: "(7BD7|7BD8|7BD9|7BDA)", source: "Menphina" } -4579.4 "Waxing Claw" Ability { id: "(7BE0|7BE1)", source: "Menphina" } +4579.3 "Midnight Frost" Ability { id: ["7BD7", "7BD8", "7BD9", "7BDA"], source: "Menphina" } +4579.4 "Waxing Claw" Ability { id: ["7BE0", "7BE1"], source: "Menphina" } 4586.4 "Cratering Chill" Ability { id: "7BEE", source: "Menphina" } 4593.5 "Winter Solstice" Ability { id: "7BED", source: "Menphina" } 4593.8 "--sync--" Ability { id: "7BEF", source: "Menphina" } -4597.9 "Playful Orbit" Ability { id: "(7BE2|7BE3)", source: "Menphina" } -4608.1 "Winter Halo" Ability { id: "(7BE8|7BE9|7F0E|7F0F|7BDB|7BDC)", source: "Menphina" } -4608.2 "Waxing Claw" Ability { id: "(7BE0|7BE1)", source: "Menphina" } +4597.9 "Playful Orbit" Ability { id: ["7BE2", "7BE3"], source: "Menphina" } +4608.1 "Winter Halo" Ability { id: ["7BE8", "7BE9", "7F0E", "7F0F", "7BDB", "7BDC"], source: "Menphina" } +4608.2 "Waxing Claw" Ability { id: ["7BE0", "7BE1"], source: "Menphina" } -4611.2 "--sync--" Ability { id: "(7C06|7C07)", source: "Menphina" } +4611.2 "--sync--" Ability { id: ["7C06", "7C07"], source: "Menphina" } 4619.3 "Moonset Rays" Ability { id: "80F9", source: "Menphina" } 4628.0 "Love's Light" Ability { id: "7BC3", source: "Menphina" } 4632.7 "Full Bright" Ability { id: "7BC5", source: "Menphina" } @@ -395,17 +395,17 @@ hideall "Season's Passing" 4651.6 "Silver Mirror 1" #Ability { id: "7BF6", source: "Menphina" } 4653.6 "Silver Mirror 2" #Ability { id: "7BF6", source: "Menphina" } 4655.6 "Silver Mirror 3" #Ability { id: "7BF6", source: "Menphina" } -4661.3 "Midnight Frost/Winter Halo" Ability { id: "(7BD7|7BD8|7BD9|7BDA|7BE8|7BE9|7F0E|7F0F|7BDB|7BDC)", source: "Menphina" } -4661.5 "Waxing Claw" Ability { id: "(7BE0|7BE1)", source: "Menphina" } +4661.3 "Midnight Frost/Winter Halo" Ability { id: ["7BD7", "7BD8", "7BD9", "7BDA", "7BE8", "7BE9", "7F0E", "7F0F", "7BDB", "7BDC"], source: "Menphina" } +4661.5 "Waxing Claw" Ability { id: ["7BE0", "7BE1"], source: "Menphina" } 4671.5 "Love's Light" Ability { id: "7BC2", source: "Menphina" } 4676.2 "Full Bright" Ability { id: "7BC5", source: "Menphina" } -4681.4 "Playful Orbit" Ability { id: "(7BE2|7BE3)", source: "Menphina" } +4681.4 "Playful Orbit" Ability { id: ["7BE2", "7BE3"], source: "Menphina" } 4687.4 "First Blush" Ability { id: "7BBC", source: "Menphina" } -4691.5 "Midnight Frost" Ability { id: "(7BE4|7BE5|7BE6|7BE7|7F0A|7F0B|7F0C|7F0D)", source: "Menphina" } -4691.7 "Waxing Claw" Ability { id: "(7BE0|7BE1)", source: "Menphina" } +4691.5 "Midnight Frost" Ability { id: ["7BE4", "7BE5", "7BE6", "7BE7", "7F0A", "7F0B", "7F0C", "7F0D"], source: "Menphina" } +4691.7 "Waxing Claw" Ability { id: ["7BE0", "7BE1"], source: "Menphina" } -4694.6 "--sync--" Ability { id: "(7C06|7C07)", source: "Menphina" } +4694.6 "--sync--" Ability { id: ["7C06", "7C07"], source: "Menphina" } 4702.7 "Moonset Rays" Ability { id: "80F9", source: "Menphina" } 4717.4 "Lunar Kiss" Ability { id: "7BF8", source: "Menphina" } @@ -413,20 +413,20 @@ hideall "Season's Passing" 4729.9 "Full Bright" Ability { id: "7BC5", source: "Menphina" } 4736.7 "Lovers' Bridge 1" Ability { id: "7BBD", source: "Menphina" } # This regex could probably be shorter, but need more info. -4739.7 "Midnight Frost" Ability { id: "(7BCF|7BD0|7BD[789A]|7BE[4567]|7F0[ABCD])", source: "Menphina" } +4739.7 "Midnight Frost" Ability { id: ["7BCF", "7BD0", "7BD[789A]", "7BE[4567]", "7F0[ABCD]"], source: "Menphina" } 4742.7 "Lovers' Bridge 2" Ability { id: "7BBE", source: "Menphina" } 4748.5 "Blue Moon" Ability { id: "7BFB", source: "Menphina" } 4759.2 "Lunar Kiss" Ability { id: "7BF8", source: "Menphina" } 4765.9 "--sync--" Ability { id: "7BF3", source: "Menphina" } 4772.5 "Keen Moonbeam" Ability { id: "7BF4", source: "Menphina" } -4778.2 "Midnight Frost" Ability { id: "(7BD7|7BD8|7BD9|7BDA)", source: "Menphina" } -4778.4 "Waxing Claw" Ability { id: "(7BE0|7BE1)", source: "Menphina" } +4778.2 "Midnight Frost" Ability { id: ["7BD7", "7BD8", "7BD9", "7BDA"], source: "Menphina" } +4778.4 "Waxing Claw" Ability { id: ["7BE0", "7BE1"], source: "Menphina" } # loop, probably 4785.4 "Cratering Chill" Ability { id: "7BEE", source: "Menphina" } window 50,50 jump 4586.4 4792.5 "Winter Solstice" #Ability { id: "7BED", source: "Menphina" } 4792.8 "--sync--" #Ability { id: "7BEF", source: "Menphina" } -4796.9 "Playful Orbit" Ability { id: "(7BE2|7BE3)", source: "Menphina" } -4807.1 "Winter Halo" #Ability { id: "(7BE8|7BE9|7F0E|7F0F|7BDB|7BDC)", source: "Menphina" } -4807.2 "Waxing Claw" Ability { id: "(7BE0|7BE1)", source: "Menphina" } +4796.9 "Playful Orbit" Ability { id: ["7BE2", "7BE3"], source: "Menphina" } +4807.1 "Winter Halo" #Ability { id: ["7BE8", "7BE9", "7F0E", "7F0F", "7BDB", "7BDC"], source: "Menphina" } +4807.2 "Waxing Claw" Ability { id: ["7BE0", "7BE1"], source: "Menphina" } diff --git a/ui/raidboss/data/06-ew/alliance/thaleia.txt b/ui/raidboss/data/06-ew/alliance/thaleia.txt index cea22f13a2..0e688e45e3 100644 --- a/ui/raidboss/data/06-ew/alliance/thaleia.txt +++ b/ui/raidboss/data/06-ew/alliance/thaleia.txt @@ -27,8 +27,8 @@ hideall "--sync--" 1051.6 "Thlipsis" Ability { id: "88D8", source: "Thaliak" } 1059.7 "--middle--" Ability { id: "88DB", source: "Thaliak" } -1067.0 "Left Bank/Right Bank" Ability { id: "(88D2|88D3)", source: "Thaliak" } -1074.1 "Right Bank/Left Bank" Ability { id: "(88D3|88D2)", source: "Thaliak" } +1067.0 "Left Bank/Right Bank" Ability { id: ["88D2", "88D3"], source: "Thaliak" } +1074.1 "Right Bank/Left Bank" Ability { id: ["88D3", "88D2"], source: "Thaliak" } 1080.2 "Hydroptosis" Ability { id: "88D4", source: "Thaliak" } @@ -57,7 +57,7 @@ hideall "--sync--" 1225.1 "--sync--" Ability { id: "88D0", source: "Thaliak" } 1234.5 "Hieroglyphika 2" Ability { id: "88CF", source: "Thaliak" } 1254.5 "--sync--" Ability { id: "88D0", source: "Thaliak" } -1258.6 "Left Bank/Right Bank" Ability { id: "(8C2C|8C2D)", source: "Thaliak" } +1258.6 "Left Bank/Right Bank" Ability { id: ["8C2C", "8C2D"], source: "Thaliak" } 1264.7 "--middle--" Ability { id: "88DB", source: "Thaliak" } 1272.9 label "thaliak-loop" @@ -86,7 +86,7 @@ hideall "--sync--" 1379.2 "--middle--" Ability { id: "88DB", source: "Thaliak" } 1386.5 "Hieroglyphika" Ability { id: "88CF", source: "Thaliak" } 1406.5 "--sync--" Ability { id: "88D0", source: "Thaliak" } -1410.5 "Left Bank/Right Bank" Ability { id: "(8C2C|8C2D)", source: "Thaliak" } +1410.5 "Left Bank/Right Bank" Ability { id: ["8C2C", "8C2D"], source: "Thaliak" } 1416.6 "Hydroptosis" Ability { id: "88D4", source: "Thaliak" } 1427.7 "Katarraktes" Ability { id: "88D1", source: "Thaliak" } @@ -137,24 +137,24 @@ hideall "--sync--" 2000.0 "--sync--" SystemLogMessage { id: "7DC", param1: "116A" } window 10000,0 2007.1 "--sync--" StartsUsing { id: "880B", source: "Llymlaen" } window 10,10 2012.1 "Tempest" Ability { id: "880B", source: "Llymlaen" } -2023.2 "Seafoam Spiral/Wind Rose" Ability { id: "(880D|880C)", source: "Llymlaen" } -2032.3 "Wind Rose/Seafoam Spiral" Ability { id: "(880C|880D)", source: "Llymlaen" } +2023.2 "Seafoam Spiral/Wind Rose" Ability { id: ["880D", "880C"], source: "Llymlaen" } +2032.3 "Wind Rose/Seafoam Spiral" Ability { id: ["880C", "880D"], source: "Llymlaen" } 2041.6 "--middle--" Ability { id: "8809", source: "Llymlaen" } 2049.4 "Navigator's Trident" Ability { id: "880E", source: "Llymlaen" } -2050.5 "Dire Straits 1" #Ability { id: "(880F|8810)", source: "Llymlaen" } -2052.3 "Dire Straits 2" #Ability { id: "(880F|8810)", source: "Llymlaen" } +2050.5 "Dire Straits 1" #Ability { id: ["880F", "8810"], source: "Llymlaen" } +2052.3 "Dire Straits 2" #Ability { id: ["880F", "8810"], source: "Llymlaen" } 2052.7 "--jump--" Ability { id: "8CCF", source: "Llymlaen" } 2060.9 "Navigator's Trident" Ability { id: "8811", source: "Llymlaen" } 2064.0 "--middle--" Ability { id: "8809", source: "Llymlaen" } -2073.0 "Seafoam Spiral/Wind Rose" Ability { id: "(880D|880C)", source: "Llymlaen" } +2073.0 "Seafoam Spiral/Wind Rose" Ability { id: ["880D", "880C"], source: "Llymlaen" } 2084.0 "Surging Wave" Ability { id: "8812", source: "Llymlaen" } 2085.2 "Shockwave" Ability { id: "8814", source: "Llymlaen" } -2105.2 "Left Strait/Right Strait" Ability { id: "(8851|8852)", source: "Llymlaen" } +2105.2 "Left Strait/Right Strait" Ability { id: ["8851", "8852"], source: "Llymlaen" } 2113.4 "Deep Dive" Ability { id: "8819", source: "Llymlaen" } 2122.6 "--sync--" StartsUsing { id: "881A", source: "Llymlaen" } window 20,20 @@ -184,10 +184,10 @@ hideall "--sync--" 2178.2 "--middle--" Ability { id: "8809", source: "Llymlaen" } 2185.3 "Wind Rose" Ability { id: "880C", source: "Llymlaen" } -2185.4 "Serpents' Tide 1" Ability { id: "(8828|8829)", source: "Thalaos" } -2196.5 "Serpents' Tide 2" Ability { id: "(8828|8829)", source: "Thalaos" } -2201.3 " /Right Strait" Ability { id: "(8851|8852)", source: "Llymlaen" } -2207.4 "Serpents' Tide 3" Ability { id: "(8828|8829)", source: "Thalaos" } +2185.4 "Serpents' Tide 1" Ability { id: ["8828", "8829"], source: "Thalaos" } +2196.5 "Serpents' Tide 2" Ability { id: ["8828", "8829"], source: "Thalaos" } +2201.3 " /Right Strait" Ability { id: ["8851", "8852"], source: "Llymlaen" } +2207.4 "Serpents' Tide 3" Ability { id: ["8828", "8829"], source: "Thalaos" } 2212.0 "Maelstrom" Ability { id: "882A", source: "Llymlaen" } 2213.3 "--middle--" Ability { id: "8809", source: "Llymlaen" } @@ -197,23 +197,23 @@ hideall "--sync--" 2230.5 "--middle--" Ability { id: "8809", source: "Llymlaen" } 2238.3 label "llymlaen-loop" 2238.3 "Navigator's Trident" Ability { id: "880E", source: "Llymlaen" } -2239.3 "Dire Straits 1" #Ability { id: "(880F|8810)", source: "Llymlaen" } -2241.1 "Dire Straits 2" #Ability { id: "(880F|8810)", source: "Llymlaen" } +2239.3 "Dire Straits 1" #Ability { id: ["880F", "8810"], source: "Llymlaen" } +2241.1 "Dire Straits 2" #Ability { id: ["880F", "8810"], source: "Llymlaen" } # TODO: can this be 882B instead of 8CCF? 2241.5 "--jump--" Ability { id: "8CCF", source: "Llymlaen" } 2249.7 "Navigator's Trident" Ability { id: "8811", source: "Llymlaen" } -2250.8 "Serpents' Tide" Ability { id: "(8828|8829)", source: "Thalaos" } +2250.8 "Serpents' Tide" Ability { id: ["8828", "8829"], source: "Thalaos" } 2252.8 "--middle--" Ability { id: "8809", source: "Llymlaen" } -2261.8 "Seafoam Spiral/Wind Rose" Ability { id: "(880D|880C)", source: "Llymlaen" } +2261.8 "Seafoam Spiral/Wind Rose" Ability { id: ["880D", "880C"], source: "Llymlaen" } 2272.8 "Surging Wave" Ability { id: "8812", source: "Llymlaen" } 2274.0 "Shockwave" Ability { id: "8814", source: "Llymlaen" } 2281.9 "--sync--" Ability { id: "8815", source: "Llymlaen" } 2282.1 "To the Last 1" #Ability { id: "8817", source: "Llymlaen" } 2284.1 "To the Last 2" #Ability { id: "8817", source: "Llymlaen" } 2286.2 "To the Last 3" #Ability { id: "8817", source: "Llymlaen" } -2294.3 "Left Strait/Right Strait" Ability { id: "(8851|8852)", source: "Llymlaen" } +2294.3 "Left Strait/Right Strait" Ability { id: ["8851", "8852"], source: "Llymlaen" } 2297.4 "--middle--" Ability { id: "8809", source: "Llymlaen" } 2304.6 "Hard Water 1" Ability { id: "8835", source: "Perykos" } @@ -242,20 +242,20 @@ hideall "--sync--" 2355.0 "Serpents' Tide" Ability { id: "8829", source: "Thalaos" } 2359.6 "Maelstrom" Ability { id: "882A", source: "Llymlaen" } -2363.9 "Seafoam Spiral/Wind Rose" Ability { id: "(880D|880C)", source: "Llymlaen" } +2363.9 "Seafoam Spiral/Wind Rose" Ability { id: ["880D", "880C"], source: "Llymlaen" } 2366.0 "--middle--" Ability { id: "8809", source: "Llymlaen" } 2370.0 "--sync--" Ability { id: "8824", source: "Llymlaen" } 2373.0 "Godsbane" Ability { id: "8821", source: "Llymlaen" } -2392.2 "Seafoam Spiral/Wind Rose" Ability { id: "(880D|880C)", source: "Llymlaen" } +2392.2 "Seafoam Spiral/Wind Rose" Ability { id: ["880D", "880C"], source: "Llymlaen" } 2394.3 "Stormy Seas" Ability { id: "881D", source: "Llymlaen" } 2399.1 "Stormwhorl 1" #Ability { id: "881E", source: "Llymlaen" } 2401.1 "Stormwhorl 2" #Ability { id: "881E", source: "Llymlaen" } 2403.1 "Stormwhorl 3" #Ability { id: "881E", source: "Llymlaen" } 2404.1 "Stormwinds" #Ability { id: "881F", source: "Llymlaen" } -2410.4 "Left Strait/Right Strait" Ability { id: "(8851|8852)", source: "Llymlaen" } +2410.4 "Left Strait/Right Strait" Ability { id: ["8851", "8852"], source: "Llymlaen" } 2421.5 "Tempest" Ability { id: "880B", source: "Llymlaen" } 2431.8 "--middle--" Ability { id: "8809", source: "Llymlaen" } @@ -335,14 +335,14 @@ hideall "--sync--" 3033.6 "--middle--" Ability { id: "8998", source: "Oschon" } 3037.7 "Reproduce" Ability { id: "8989", source: "Oschon" } -3040.7 "--sync--" Ability { id: "(8830|8831)", source: "Oschon" } -3047.7 "--sync--" Ability { id: "(898A|898B)", source: "Oschon's Avatar" } +3040.7 "--sync--" Ability { id: ["8830", "8831"], source: "Oschon" } +3047.7 "--sync--" Ability { id: ["898A", "898B"], source: "Oschon's Avatar" } 3053.8 "Swinging Draw" Ability { id: "898C", source: "Oschon's Avatar" } 3054.9 "--middle--" Ability { id: "8998", source: "Oschon" } 3059.2 "Reproduce" Ability { id: "8989", source: "Oschon" } -3062.2 "--sync--" Ability { id: "(8830|8831)", source: "Oschon" } -3069.2 "--sync--" Ability { id: "(898A|898B)", source: "Oschon's Avatar" } +3062.2 "--sync--" Ability { id: ["8830", "8831"], source: "Oschon" } +3069.2 "--sync--" Ability { id: ["898A", "898B"], source: "Oschon's Avatar" } 3075.3 "Swinging Draw x2" Ability { id: "898C", source: "Oschon's Avatar" } 3076.4 "--middle--" Ability { id: "8998", source: "Oschon" } @@ -353,23 +353,23 @@ hideall "--sync--" 3109.4 label "oschon-p1-loop" 3109.4 "Reproduce" Ability { id: "8989", source: "Oschon" } -3112.4 "--sync--" Ability { id: "(8830|8831)", source: "Oschon" } -3119.4 "--sync--" Ability { id: "(898A|898B)", source: "Oschon's Avatar" } +3112.4 "--sync--" Ability { id: ["8830", "8831"], source: "Oschon" } +3119.4 "--sync--" Ability { id: ["898A", "898B"], source: "Oschon's Avatar" } 3125.5 "Swinging Draw x2" Ability { id: "898C", source: "Oschon's Avatar" } 3129.5 "Sudden Downpour" Ability { id: "8999", source: "Oschon" } 3133.6 "--middle--" Ability { id: "8998", source: "Oschon" } 3137.9 "Downhill (cast)" Ability { id: "899F", source: "Oschon" } -3145.0 "Climbing Shot" Ability { id: "(8990|8991|8992|8993)", source: "Oschon" } +3145.0 "Climbing Shot" Ability { id: ["8990", "8991", "8992", "8993"], source: "Oschon" } 3146.8 "Downhill" Ability { id: "89A1", source: "Oschon" } 3153.1 "Soaring Minuet" Ability { id: "8994", source: "Oschon" } 3160.8 "Flinted Foehn x6" Ability { id: "89A3", source: "Oschon" } duration 5.6 -3168.1 "--sync--" Ability { id: "(882E|882F)", source: "Oschon" } -3174.1 "--sync--" Ability { id: "(898D|898E)", source: "Oschon" } -3177.7 "Trek Shot" Ability { id: "(898F|8C44)", source: "Oschon" } +3168.1 "--sync--" Ability { id: ["882E", "882F"], source: "Oschon" } +3174.1 "--sync--" Ability { id: ["898D", "898E"], source: "Oschon" } +3177.7 "Trek Shot" Ability { id: ["898F", "8C44"], source: "Oschon" } 3184.4 "Sudden Downpour 1" Ability { id: "8999", source: "Oschon" } 3190.5 "Sudden Downpour 2" Ability { id: "8999", source: "Oschon" } @@ -392,14 +392,14 @@ hideall "--sync--" # Phase 2 -3544.0 "Piton Pull 1" Ability { id: "(89A9|89AA)", source: "Oschon" } -3556.1 "Piton Pull 2" Ability { id: "(89A9|89AA)", source: "Oschon" } +3544.0 "Piton Pull 1" Ability { id: ["89A9", "89AA"], source: "Oschon" } +3556.1 "Piton Pull 2" Ability { id: ["89A9", "89AA"], source: "Oschon" } 3568.2 "Altitude" Ability { id: "89AF", source: "Oschon" } 3578.9 "Flinted Foehn x6" Ability { id: "89A4", source: "Oschon" } duration 5.6 -3595.1 "Wandering Shot 1" Ability { id: "(8CF6|8CF7)", source: "Oschon" } +3595.1 "Wandering Shot 1" Ability { id: ["8CF6", "8CF7"], source: "Oschon" } 3598.8 "Great Whirlwind 1" Ability { id: "89AE", source: "Oschon" } -3609.4 "Wandering Shot 2" Ability { id: "(8CF6|8CF7)", source: "Oschon" } +3609.4 "Wandering Shot 2" Ability { id: ["8CF6", "8CF7"], source: "Oschon" } 3613.1 "Great Whirlwind 2" Ability { id: "89AE", source: "Oschon" } 3622.5 "The Arrow" Ability { id: "899C", source: "Oschon" } @@ -409,14 +409,14 @@ hideall "--sync--" 3642.9 "Downhill 1" Ability { id: "8C45", source: "Oschon" } 3646.9 "Downhill 2" Ability { id: "8C45", source: "Oschon" } 3650.9 "Downhill 3" Ability { id: "8C45", source: "Oschon" } -3657.9 "Piton Pull" Ability { id: "(89A9|89AA)", source: "Oschon" } +3657.9 "Piton Pull" Ability { id: ["89A9", "89AA"], source: "Oschon" } 3668.1 "Downhill (cast)" Ability { id: "89A0", source: "Oschon" } -3681.2 "Wandering Volley" Ability { id: "(89AC|89AD)", source: "Oschon" } +3681.2 "Wandering Volley" Ability { id: ["89AC", "89AD"], source: "Oschon" } 3682.4 "Downhill" Ability { id: "89A2", source: "Oschon" } 3684.7 "Great Whirlwind" Ability { id: "89AE", source: "Oschon" } -3692.1 "Piton Pull" Ability { id: "(89A9|89AA)", source: "Oschon" } +3692.1 "Piton Pull" Ability { id: ["89A9", "89AA"], source: "Oschon" } 3702.6 "Flinted Foehn x6" Ability { id: "89A4", source: "Oschon" } duration 5.6 @@ -506,24 +506,24 @@ hideall "--sync--" 4019.9 "--sync--" Ability { id: "8A02", source: "Eulogia" } 4022.0 "--sync--" Ability { id: "8A08", source: "Eulogia" } -4031.4 "First Form" Ability { id: "(8A0A|8A0D|8A10)", source: "Eulogia" } -4038.5 "Second Form" Ability { id: "(8A0B|8A0E|8A11)", source: "Eulogia" } -4045.6 "Third Form" Ability { id: "(8A0C|8A0F|8A12)", source: "Eulogia" } +4031.4 "First Form" Ability { id: ["8A0A", "8A0D", "8A10"], source: "Eulogia" } +4038.5 "Second Form" Ability { id: ["8A0B", "8A0E", "8A11"], source: "Eulogia" } +4045.6 "Third Form" Ability { id: ["8A0C", "8A0F", "8A12"], source: "Eulogia" } 4049.7 "--sync--" Ability { id: "8A16", source: "Eulogia" } -4049.9 "Quintessence 1" Ability { id: "(8A17|8A18|8A19)", source: "Eulogia" } -4053.6 "Quintessence 2" Ability { id: "(8A17|8A18|8A19)", source: "Eulogia" } -4057.2 "Quintessence 3" Ability { id: "(8A17|8A18|8A19)", source: "Eulogia" } +4049.9 "Quintessence 1" Ability { id: ["8A17", "8A18", "8A19"], source: "Eulogia" } +4053.6 "Quintessence 2" Ability { id: ["8A17", "8A18", "8A19"], source: "Eulogia" } +4057.2 "Quintessence 3" Ability { id: ["8A17", "8A18", "8A19"], source: "Eulogia" } 4071.5 "--sync--" Ability { id: "8A02", source: "Eulogia" } 4073.7 "--sync--" Ability { id: "8A08", source: "Eulogia" } -4083.1 "First Form" Ability { id: "(8A0A|8A0D|8A10)", source: "Eulogia" } -4090.3 "Second Form" Ability { id: "(8A0B|8A0E|8A11)", source: "Eulogia" } -4097.4 "Third Form" Ability { id: "(8A0C|8A0F|8A12)", source: "Eulogia" } +4083.1 "First Form" Ability { id: ["8A0A", "8A0D", "8A10"], source: "Eulogia" } +4090.3 "Second Form" Ability { id: ["8A0B", "8A0E", "8A11"], source: "Eulogia" } +4097.4 "Third Form" Ability { id: ["8A0C", "8A0F", "8A12"], source: "Eulogia" } 4101.5 "--sync--" Ability { id: "8A16", source: "Eulogia" } -4101.7 "Quintessence 1" Ability { id: "(8A17|8A18|8A19)", source: "Eulogia" } -4105.4 "Quintessence 2" Ability { id: "(8A17|8A18|8A19)", source: "Eulogia" } -4109.0 "Quintessence 3" Ability { id: "(8A17|8A18|8A19)", source: "Eulogia" } +4101.7 "Quintessence 1" Ability { id: ["8A17", "8A18", "8A19"], source: "Eulogia" } +4105.4 "Quintessence 2" Ability { id: ["8A17", "8A18", "8A19"], source: "Eulogia" } +4109.0 "Quintessence 3" Ability { id: ["8A17", "8A18", "8A19"], source: "Eulogia" } 4122.0 "Sunbeam" Ability { id: "8A00", source: "Eulogia" } @@ -554,14 +554,14 @@ hideall "--sync--" 4223.0 "--middle--" Ability { id: "8A02", source: "Eulogia" } 4230.3 "Hieroglyphika" Ability { id: "8A43", source: "Eulogia" } 4247.4 "--sync--" Ability { id: "8A44", source: "Eulogia" } -4252.2 "Hand of the Destroyer" Ability { id: "(8A47|8A48)", source: "Eulogia" } +4252.2 "Hand of the Destroyer" Ability { id: ["8A47", "8A48"], source: "Eulogia" } 4256.3 "--middle--" Ability { id: "8A02", source: "Eulogia" } 4261.4 "Matron's Breath" Ability { id: "8A4B", source: "Eulogia" } -4276.5 "Blueblossoms/Giltblossoms 1" Ability { id: "(8A4C|8A4D)", source: "Eulogia" } -4280.1 "Blueblossoms/Giltblossoms 2" Ability { id: "(8A4C|8A4D)", source: "Eulogia" } -4283.7 "Blueblossoms/Giltblossoms 3" Ability { id: "(8A4C|8A4D)", source: "Eulogia" } -4287.3 "Blueblossoms/Giltblossoms 4" Ability { id: "(8A4C|8A4D)", source: "Eulogia" } +4276.5 "Blueblossoms/Giltblossoms 1" Ability { id: ["8A4C", "8A4D"], source: "Eulogia" } +4280.1 "Blueblossoms/Giltblossoms 2" Ability { id: ["8A4C", "8A4D"], source: "Eulogia" } +4283.7 "Blueblossoms/Giltblossoms 3" Ability { id: ["8A4C", "8A4D"], source: "Eulogia" } +4287.3 "Blueblossoms/Giltblossoms 4" Ability { id: ["8A4C", "8A4D"], source: "Eulogia" } 4290.7 "Torrential Tridents" Ability { id: "8A4E", source: "Eulogia" } 4291.6 "Landing 1" #Ability { id: "8A4F", source: "Trident" } @@ -579,11 +579,11 @@ hideall "--sync--" 4316.7 "Destructive Bolt" Ability { id: "8CEC", source: "Eulogia" } 4327.1 "Byregot's Strike" Ability { id: "8A52", source: "Eulogia" } -4334.0 "Thousandfold Thrust" Ability { id: "(8A57|8A58)", source: "Eulogia" } duration 5.4 +4334.0 "Thousandfold Thrust" Ability { id: ["8A57", "8A58"], source: "Eulogia" } duration 5.4 4343.0 "--middle--" Ability { id: "8A02", source: "Eulogia" } -4350.2 "As Above, So Below" Ability { id: "(8A5B|8A5C)", source: "Eulogia" } -4362.3 "Climbing Shot" Ability { id: "(8D0A|8D0B)", source: "Eulogia" } +4350.2 "As Above, So Below" Ability { id: ["8A5B", "8A5C"], source: "Eulogia" } +4362.3 "Climbing Shot" Ability { id: ["8D0A", "8D0B"], source: "Eulogia" } 4372.8 "Soaring Minuet" Ability { id: "8A69", source: "Eulogia" } 4377.1 "--middle--" Ability { id: "8A08", source: "Eulogia" } @@ -604,13 +604,13 @@ hideall "--sync--" 4418.0 "--sync--" Ability { id: "8A02", source: "Eulogia" } 4420.3 label "Quintessence" 4420.3 "--sync--" Ability { id: "8A08", source: "Eulogia" } -4429.7 "First Form" Ability { id: "(8A0A|8A0D|8A10)", source: "Eulogia" } -4436.9 "Second Form" Ability { id: "(8A0B|8A0E|8A11)", source: "Eulogia" } -4444.1 "Third Form" Ability { id: "(8A0C|8A0F|8A12)", source: "Eulogia" } +4429.7 "First Form" Ability { id: ["8A0A", "8A0D", "8A10"], source: "Eulogia" } +4436.9 "Second Form" Ability { id: ["8A0B", "8A0E", "8A11"], source: "Eulogia" } +4444.1 "Third Form" Ability { id: ["8A0C", "8A0F", "8A12"], source: "Eulogia" } 4448.2 "--sync--" Ability { id: "8A16", source: "Eulogia" } -4448.4 "Quintessence 1" Ability { id: "(8A17|8A18|8A19)", source: "Eulogia" } -4452.1 "Quintessence 2" Ability { id: "(8A17|8A18|8A19)", source: "Eulogia" } -4455.7 "Quintessence 3" Ability { id: "(8A17|8A18|8A19)", source: "Eulogia" } +4448.4 "Quintessence 1" Ability { id: ["8A17", "8A18", "8A19"], source: "Eulogia" } +4452.1 "Quintessence 2" Ability { id: ["8A17", "8A18", "8A19"], source: "Eulogia" } +4455.7 "Quintessence 3" Ability { id: ["8A17", "8A18", "8A19"], source: "Eulogia" } 4468.5 "Sunbeam" Ability { id: "8A00", source: "Eulogia" } 4476.9 "--middle--" Ability { id: "8A02", source: "Eulogia" } @@ -623,7 +623,7 @@ hideall "--sync--" # This is probably Good Enough (TM). 4400.0 "--sync--" StartsUsing { id: "8A3B", source: "Eulogia" } window 0,10000 jump "Solar Fans" 4400.0 "--sync--" StartsUsing { id: "8A4B", source: "Eulogia" } window 0,10000 jump "Matron's Breath" -4400.0 "--sync--" StartsUsing { id: "(8A5B|8A5C)", source: "Eulogia" } window 0,10000 jump "As Above, So Below" +4400.0 "--sync--" StartsUsing { id: ["8A5B", "8A5C"], source: "Eulogia" } window 0,10000 jump "As Above, So Below" 4400.0 "--sync--" StartsUsing { id: "8A4E", source: "Eulogia" } window 0,10000 jump "Torrential Tridents" 4400.0 "--sync--" StartsUsing { id: "8A30", source: "Eulogia" } window 0,10000 jump "Love's Light" 4400.0 "--sync--" StartsUsing { id: "8A43", source: "Eulogia" } window 0,10000 jump "Hieroglyphika" @@ -643,15 +643,15 @@ hideall "--sync--" 5100.0 label "Matron's Breath" 5100.0 "--sync--"StartsUsing { id: "8A4B", source: "Eulogia" } 5103.0 "Matron's Breath" Ability { id: "8A4B", source: "Eulogia" } -5118.1 "Blueblossoms/Giltblossoms 1" Ability { id: "(8A4C|8A4D)", source: "Eulogia" } -5121.7 "Blueblossoms/Giltblossoms 2" Ability { id: "(8A4C|8A4D)", source: "Eulogia" } -5125.3 "Blueblossoms/Giltblossoms 3" Ability { id: "(8A4C|8A4D)", source: "Eulogia" } -5128.9 "Blueblossoms/Giltblossoms 4" Ability { id: "(8A4C|8A4D)", source: "Eulogia" } +5118.1 "Blueblossoms/Giltblossoms 1" Ability { id: ["8A4C", "8A4D"], source: "Eulogia" } +5121.7 "Blueblossoms/Giltblossoms 2" Ability { id: ["8A4C", "8A4D"], source: "Eulogia" } +5125.3 "Blueblossoms/Giltblossoms 3" Ability { id: ["8A4C", "8A4D"], source: "Eulogia" } +5128.9 "Blueblossoms/Giltblossoms 4" Ability { id: ["8A4C", "8A4D"], source: "Eulogia" } 5200.0 label "As Above, So Below" -5200.0 "--sync--" StartsUsing { id: "(8A5B|8A5C)", source: "Eulogia" } -5205.0 "As Above, So Below" Ability { id: "(8A5B|8A5C)", source: "Eulogia" } -5217.1 "Climbing Shot" Ability { id: "(8D0A|8D0B)", source: "Eulogia" } +5200.0 "--sync--" StartsUsing { id: ["8A5B", "8A5C"], source: "Eulogia" } +5205.0 "As Above, So Below" Ability { id: ["8A5B", "8A5C"], source: "Eulogia" } +5217.1 "Climbing Shot" Ability { id: ["8D0A", "8D0B"], source: "Eulogia" } 5227.4 "Soaring Minuet" Ability { id: "8A69", source: "Eulogia" } 5237.6 "Destructive Bolt" Ability { id: "8CEC", source: "Eulogia" } @@ -686,7 +686,7 @@ hideall "--sync--" 5500.0 "--sync--" StartsUsing { id: "8A43", source: "Eulogia" } 5505.0 "Hieroglyphika" Ability { id: "8A43", source: "Eulogia" } 5522.1 "--sync--" Ability { id: "8A44", source: "Eulogia" } -5526.8 "Hand of the Destroyer" Ability { id: "(8A47|8A48)", source: "Eulogia" } +5526.8 "Hand of the Destroyer" Ability { id: ["8A47", "8A48"], source: "Eulogia" } 5537.9 "Destructive Bolt" Ability { id: "8CEC", source: "Eulogia" } 5600.0 label "Hydrostasis" @@ -701,7 +701,7 @@ hideall "--sync--" 5700.0 label "Byregot's Strike" 5700.0 "--sync--" Ability { id: "8A52", source: "Eulogia" } 5706.0 "Byregot's Strike" Ability { id: "8A52", source: "Eulogia" } -5712.9 "Thousandfold Thrust" Ability { id: "(8A57|8A58)", source: "Eulogia" } duration 5.4 +5712.9 "Thousandfold Thrust" Ability { id: ["8A57", "8A58"], source: "Eulogia" } duration 5.4 5727.1 "Destructive Bolt" Ability { id: "8CEC", source: "Eulogia" } diff --git a/ui/raidboss/data/06-ew/dungeon/aloalo_island.txt b/ui/raidboss/data/06-ew/dungeon/aloalo_island.txt index 65f5a73219..19f518f872 100644 --- a/ui/raidboss/data/06-ew/dungeon/aloalo_island.txt +++ b/ui/raidboss/data/06-ew/dungeon/aloalo_island.txt @@ -176,8 +176,8 @@ hideall "--sync--" 2107.5 "Strewn Bubbles" Ability { id: "8A86", source: "Ketuduke" } 2114.5 "Sphere Shatter" Ability { id: "8A87", source: "Ketuduke" } -2123.5 "Receding Twintides/Encroaching Twintides" Ability { id: "(8A9D|8A9F)", source: "Ketuduke" } -2127.5 "Far Tide/Near Tide" Ability { id: "(8AA0|8A9E)", source: "Ketuduke" } +2123.5 "Receding Twintides/Encroaching Twintides" Ability { id: ["8A9D", "8A9F"], source: "Ketuduke" } +2127.5 "Far Tide/Near Tide" Ability { id: ["8AA0", "8A9E"], source: "Ketuduke" } 2134.2 "--middle--" Ability { id: "8A77", source: "Ketuduke" } 2146.4 "--sync--" StartsUsing { id: "8A79", source: "Ketuduke" } jump "ketuduke-01" @@ -240,15 +240,15 @@ hideall "--sync--" 2837.9 "Blowing Bubbles" Ability { id: "8A88", source: "Ketuduke" } 2843.9 "--middle--" Ability { id: "8A77", source: "Ketuduke" } -2851.8 "Receding Twintides/Encroaching Twintides" Ability { id: "(8A9D|8A9F)", source: "Ketuduke" } -2855.8 "Far Tide/Near Tide" Ability { id: "(8AA0|8A9E)", source: "Ketuduke" } +2851.8 "Receding Twintides/Encroaching Twintides" Ability { id: ["8A9D", "8A9F"], source: "Ketuduke" } +2855.8 "Far Tide/Near Tide" Ability { id: ["8AA0", "8A9E"], source: "Ketuduke" } 2867.5 "Tidal Roar" Ability { id: "8AA5", source: "Ketuduke" } 2874.3 "--middle--" Ability { id: "8A77", source: "Ketuduke" } 2879.4 "Strewn Bubbles" Ability { id: "8A86", source: "Ketuduke" } 2886.4 "Sphere Shatter" Ability { id: "8A87", source: "Ketuduke" } -2887.4 "Receding Twintides/Encroaching Twintides" Ability { id: "(8A9D|8A9F)", source: "Ketuduke" } -2891.4 "Far Tide/Near Tide" Ability { id: "(8AA0|8A9E)", source: "Ketuduke" } +2887.4 "Receding Twintides/Encroaching Twintides" Ability { id: ["8A9D", "8A9F"], source: "Ketuduke" } +2891.4 "Far Tide/Near Tide" Ability { id: ["8AA0", "8A9E"], source: "Ketuduke" } 2903.1 "Hydroblast" Ability { id: "8AA3", source: "Ketuduke" } 2914.8 "Tidal Roar" Ability { id: "8AA5", source: "Ketuduke" } @@ -441,12 +441,12 @@ hideall "--sync--" 4016.2 "Inferno Theorem" Ability { id: "887F", source: "Lala" } 4019.3 "--middle--" Ability { id: "8874", source: "Lala" } -4027.4 "Arcane Blight" Ability { id: "(886F|8870|8871|8872)", source: "Lala" } +4027.4 "Arcane Blight" Ability { id: ["886F", "8870", "8871", "8872"], source: "Lala" } 4040.5 "Arcane Plot" Ability { id: "8875", source: "Lala" } 4062.6 "Inferno Theorem" Ability { id: "887F", source: "Lala" } 4069.7 "--middle--" Ability { id: "8874", source: "Lala" } -4077.8 "Arcane Blight" Ability { id: "(886F|8870|8871|8872)", source: "Lala" } +4077.8 "Arcane Blight" Ability { id: ["886F", "8870", "8871", "8872"], source: "Lala" } 4088.9 "Analysis" Ability { id: "887B", source: "Lala" } 4102.7 "Targeted Light" Ability { id: "8CDC", source: "Lala" } @@ -471,7 +471,7 @@ hideall "--sync--" 4243.4 "--middle--" Ability { id: "8874", source: "Lala" } 4251.7 label "lala-05-loop" -4251.7 "Arcane Blight" Ability { id: "(886F|8870|8871|8872)", source: "Lala" } +4251.7 "Arcane Blight" Ability { id: ["886F", "8870", "8871", "8872"], source: "Lala" } 4260.8 "Analysis" Ability { id: "887B", source: "Lala" } 4272.5 "Targeted Light" Ability { id: "8CDC", source: "Lala" } @@ -485,7 +485,7 @@ hideall "--sync--" 4363.2 "Strategic Strike" Ability { id: "887E", source: "Lala" } 4371.4 "--middle--" Ability { id: "8874", source: "Lala" } -4379.7 "Arcane Blight" Ability { id: "(886F|8870|8871|8872)", source: "Lala" } window 40,40 forcejump "lala-05-loop" +4379.7 "Arcane Blight" Ability { id: ["886F", "8870", "8871", "8872"], source: "Lala" } window 40,40 forcejump "lala-05-loop" 4411.0 label "lala-06" @@ -496,7 +496,7 @@ hideall "--sync--" 4443.4 "--middle--" Ability { id: "8874", source: "Lala" } 4451.7 label "lala-06-loop" -4451.7 "Arcane Blight" Ability { id: "(886F|8870|8871|8872)", source: "Lala" } +4451.7 "Arcane Blight" Ability { id: ["886F", "8870", "8871", "8872"], source: "Lala" } 4460.8 "Analysis" Ability { id: "887B", source: "Lala" } 4472.5 "Targeted Light" Ability { id: "8CDC", source: "Lala" } @@ -510,7 +510,7 @@ hideall "--sync--" 4568.5 "Strategic Strike" Ability { id: "887E", source: "Lala" } 4576.7 "--middle--" Ability { id: "8874", source: "Lala" } -4584.9 "Arcane Blight" Ability { id: "(886F|8870|8871|8872)", source: "Lala" } window 40,40 forcejump "lala-06-loop" +4584.9 "Arcane Blight" Ability { id: ["886F", "8870", "8871", "8872"], source: "Lala" } window 40,40 forcejump "lala-06-loop" 4611.0 label "lala-07" @@ -521,7 +521,7 @@ hideall "--sync--" 4643.1 "--middle--" Ability { id: "8874", source: "Lala" } 4651.3 label "lala-07-loop" -4651.3 "Arcane Blight" Ability { id: "(886F|8870|8871|8872)", source: "Lala" } +4651.3 "Arcane Blight" Ability { id: ["886F", "8870", "8871", "8872"], source: "Lala" } 4660.4 "Analysis" Ability { id: "887B", source: "Lala" } 4672.1 "Targeted Light" Ability { id: "8CDC", source: "Lala" } @@ -535,7 +535,7 @@ hideall "--sync--" 4762.7 "Strategic Strike" Ability { id: "887E", source: "Lala" } 4770.9 "--middle--" Ability { id: "8874", source: "Lala" } -4779.1 "Arcane Blight" Ability { id: "(886F|8870|8871|8872)", source: "Lala" } window 40,40 forcejump "lala-07-loop" +4779.1 "Arcane Blight" Ability { id: ["886F", "8870", "8871", "8872"], source: "Lala" } window 40,40 forcejump "lala-07-loop" 4811.0 label "lala-08" @@ -547,7 +547,7 @@ hideall "--sync--" 4844.3 "--middle--" Ability { id: "8874", source: "Lala" } 4852.4 label "lala-08-loop" -4852.4 "Arcane Blight" Ability { id: "(886F|8870|8871|8872)", source: "Lala" } +4852.4 "Arcane Blight" Ability { id: ["886F", "8870", "8871", "8872"], source: "Lala" } 4861.5 "Analysis" Ability { id: "887B", source: "Lala" } 4873.2 "Targeted Light" Ability { id: "8CDC", source: "Lala" } @@ -562,7 +562,7 @@ hideall "--sync--" 4967.0 "Strategic Strike" Ability { id: "887E", source: "Lala" } 4975.2 "--middle--" Ability { id: "8874", source: "Lala" } -4983.5 "Arcane Blight" Ability { id: "(886F|8870|8871|8872)", source: "Lala" } window 40,40 forcejump "lala-08-loop" +4983.5 "Arcane Blight" Ability { id: ["886F", "8870", "8871", "8872"], source: "Lala" } window 40,40 forcejump "lala-08-loop" # ALL ENCOUNTER ABILITIES @@ -773,7 +773,7 @@ hideall "--sync--" 6275.2 "Thunderstorm 1" Ability { id: "8939", source: "Statice" } 6279.2 "Thunderstorm 2" Ability { id: "8939", source: "Statice" } 6283.2 "Thunderstorm 3" Ability { id: "8939", source: "Statice" } -6300.4 "Meteor/Sledgemagic/Hunks of Junk/Happy Surprise" Ability { id: "(893A|893B|893C|893D)", source: "Statice" } +6300.4 "Meteor/Sledgemagic/Hunks of Junk/Happy Surprise" Ability { id: ["893A", "893B", "893C", "893D"], source: "Statice" } 6310.5 label "statice-09-loop" 6310.5 "Pinwheel" Ability { id: "8933", source: "Statice" } @@ -812,7 +812,7 @@ hideall "--sync--" 6469.8 "Thunderstorm 1" Ability { id: "8939", source: "Statice" } 6473.8 "Thunderstorm 2" Ability { id: "8939", source: "Statice" } 6477.8 "Thunderstorm 3" Ability { id: "8939", source: "Statice" } -6495.0 "Meteor/Sledgemagic/Hunks of Junk/Happy Surprise" Ability { id: "(893A|893B|893C|893D)", source: "Statice" } +6495.0 "Meteor/Sledgemagic/Hunks of Junk/Happy Surprise" Ability { id: ["893A", "893B", "893C", "893D"], source: "Statice" } 6508.1 label "statice-10-loop" 6508.1 "Pinwheel" Ability { id: "8933", source: "Statice" } @@ -851,7 +851,7 @@ hideall "--sync--" 6672.1 "Thunderstorm 1" Ability { id: "8939", source: "Statice" } 6676.1 "Thunderstorm 2" Ability { id: "8939", source: "Statice" } 6680.1 "Thunderstorm 3" Ability { id: "8939", source: "Statice" } -6697.2 "Meteor/Sledgemagic/Hunks of Junk/Happy Surprise" Ability { id: "(893A|893B|893C|893D)", source: "Statice" } +6697.2 "Meteor/Sledgemagic/Hunks of Junk/Happy Surprise" Ability { id: ["893A", "893B", "893C", "893D"], source: "Statice" } 6707.3 label "statice-11-loop" 6707.3 "Pinwheel" Ability { id: "8933", source: "Statice" } diff --git a/ui/raidboss/data/06-ew/dungeon/alzadaals_legacy.txt b/ui/raidboss/data/06-ew/dungeon/alzadaals_legacy.txt index 4f2ed8606c..51992693ee 100644 --- a/ui/raidboss/data/06-ew/dungeon/alzadaals_legacy.txt +++ b/ui/raidboss/data/06-ew/dungeon/alzadaals_legacy.txt @@ -22,11 +22,11 @@ hideall "--sync--" 47.6 "Tentacle Dig" Ability { id: "6F59", source: "Ambujam" } 59.8 "--sync--" Ability { id: "6F5B", source: "Scarlet Tentacle" } -60.2 "Corrosive Venom/Toxin Shower" Ability { id: "(6F5C|71E6)", source: "Ambujam" } +60.2 "Corrosive Venom/Toxin Shower" Ability { id: ["6F5C", "71E6"], source: "Ambujam" } 66.0 "--sync--" Ability { id: "6F5A", source: "Ambujam" } window 66,20 -76.3 "Corrosive Fountain/Toxic Fountain 1" Ability { id: "(731A|731B|7374)", source: "Ambujam" } -79.3 "Corrosive Fountain/Toxic Fountain 2" Ability { id: "(731A|731B|7374)", source: "Ambujam" } -80.6 "Corrosive Fountain/Toxic Fountain 3" Ability { id: "(731A|731B|7374)", source: "Ambujam" } +76.3 "Corrosive Fountain/Toxic Fountain 1" Ability { id: ["731A", "731B", "7374"], source: "Ambujam" } +79.3 "Corrosive Fountain/Toxic Fountain 2" Ability { id: ["731A", "731B", "7374"], source: "Ambujam" } +80.6 "Corrosive Fountain/Toxic Fountain 3" Ability { id: ["731A", "731B", "7374"], source: "Ambujam" } 104.4 "Big Wave" Ability { id: "6F60", source: "Ambujam" } 113.8 "Tentacle Dig" Ability { id: "6F59", source: "Ambujam" } window 30,30 jump 47.6 @@ -49,59 +49,59 @@ hideall "--sync--" 1000.0 "--sync--" SystemLogMessage { id: "7DC", param1: "103F" } window 1000,1 1011.0 "Articulated Bits" Ability { id: "6F19", source: "Armored Chariot" } window 1011,0 1013.2 "Assail" Ability { id: "6F29", source: "Armored Chariot" } -1015.3 "--sync--" Ability { id: "(6F20|6F21)", source: "Armored Chariot" } +1015.3 "--sync--" Ability { id: ["6F20", "6F21"], source: "Armored Chariot" } 1021.9 "Assault Cannon" Ability { id: "6F1B", source: "Armored Drudge" } duration 5 1026.4 "--sync--" Ability { id: "6F22", source: "Armored Chariot" } 1030.0 "Assault Cannon" Ability { id: "6F1B", source: "Armored Drudge" } duration 5 # No Rail Cannon first time through the block. -1036.3 "--sync--" Ability { id: "(6F24|6F25)", source: "Armored Chariot" } +1036.3 "--sync--" Ability { id: ["6F24", "6F25"], source: "Armored Chariot" } 1047.4 "Diffusion Ray" Ability { id: "6F1E", source: "Armored Chariot" } 1056.6 "Articulated Bits" Ability { id: "6F19", source: "Armored Chariot" } 1058.8 "Assail" Ability { id: "6F28", source: "Armored Chariot" } -1060.9 "--sync--" Ability { id: "(6F20|6F21)", source: "Armored Chariot" } +1060.9 "--sync--" Ability { id: ["6F20", "6F21"], source: "Armored Chariot" } 1067.5 "Assault Cannon" Ability { id: "6F1B", source: "Armored Drudge" } duration 5 -1073.9 "--sync--" Ability { id: "(6F24|6F25)", source: "Armored Chariot" } +1073.9 "--sync--" Ability { id: ["6F24", "6F25"], source: "Armored Chariot" } 1083.2 "Articulated Bits" Ability { id: "6F19", source: "Armored Chariot" } 1085.4 "Assail" Ability { id: "6F29", source: "Armored Chariot" } -1087.5 "--sync--" Ability { id: "(6F20|6F21)", source: "Armored Chariot" } +1087.5 "--sync--" Ability { id: ["6F20", "6F21"], source: "Armored Chariot" } 1094.1 "Assault Cannon" Ability { id: "6F1B", source: "Armored Drudge" } duration 5 1098.7 "--sync--" Ability { id: "6F23", source: "Armored Chariot" } 1102.3 "Assault Cannon" Ability { id: "6F1B", source: "Armored Drudge" } duration 5 1104.8 "Graviton Cannon" Ability { id: "7373", source: "Armored Chariot" } -1108.6 "--sync--" Ability { id: "(6F24|6F25)", source: "Armored Chariot" } +1108.6 "--sync--" Ability { id: ["6F24", "6F25"], source: "Armored Chariot" } 1117.8 "Articulated Bits" Ability { id: "6F19", source: "Armored Chariot" } 1120.0 "Assail" Ability { id: "6F28", source: "Armored Chariot" } -1122.1 "--sync--" Ability { id: "(6F20|6F21)", source: "Armored Chariot" } +1122.1 "--sync--" Ability { id: ["6F20", "6F21"], source: "Armored Chariot" } 1128.7 "Assault Cannon" Ability { id: "6F1B", source: "Armored Drudge" } duration 5 -1135.0 "--sync--" Ability { id: "(6F24|6F25)", source: "Armored Chariot" } +1135.0 "--sync--" Ability { id: ["6F24", "6F25"], source: "Armored Chariot" } 1145.1 "Diffusion Ray" Ability { id: "6F1E", source: "Armored Chariot" } 1155.2 "Rail Cannon" Ability { id: "6F1F", source: "Armored Chariot" } 1168.4 "Articulated Bits" Ability { id: "6F19", source: "Armored Chariot" } 1170.6 "Assail" Ability { id: "6F28", source: "Armored Chariot" } -1172.7 "--sync--" Ability { id: "(6F20|6F21)", source: "Armored Chariot" } +1172.7 "--sync--" Ability { id: ["6F20", "6F21"], source: "Armored Chariot" } 1179.4 "Assault Cannon" Ability { id: "6F1B", source: "Armored Drudge" } duration 5 -1185.7 "--sync--" Ability { id: "(6F24|6F25)", source: "Armored Chariot" } +1185.7 "--sync--" Ability { id: ["6F24", "6F25"], source: "Armored Chariot" } 1194.9 "Articulated Bits" Ability { id: "6F19", source: "Armored Chariot" } 1197.1 "Assail" Ability { id: "6F29", source: "Armored Chariot" } -1199.2 "--sync--" Ability { id: "(6F20|6F21)", source: "Armored Chariot" } +1199.2 "--sync--" Ability { id: ["6F20", "6F21"], source: "Armored Chariot" } 1205.8 "Assault Cannon" Ability { id: "6F1B", source: "Armored Drudge" } duration 5 1210.4 "--sync--" Ability { id: "6F22", source: "Armored Chariot" } 1213.9 "Assault Cannon" Ability { id: "6F1B", source: "Armored Drudge" } duration 5 1216.6 "Graviton Cannon" Ability { id: "7373", source: "Armored Chariot" } -1220.1 "--sync--" Ability { id: "(6F24|6F25)", source: "Armored Chariot" } +1220.1 "--sync--" Ability { id: ["6F24", "6F25"], source: "Armored Chariot" } 1229.3 "Articulated Bits" Ability { id: "6F19", source: "Armored Chariot" } 1231.5 "Assail" Ability { id: "6F28", source: "Armored Chariot" } -1233.6 "--sync--" Ability { id: "(6F20|6F21)", source: "Armored Chariot" } +1233.6 "--sync--" Ability { id: ["6F20", "6F21"], source: "Armored Chariot" } 1240.2 "Assault Cannon" Ability { id: "6F1B", source: "Armored Drudge" } duration 5 -1246.5 "--sync--" Ability { id: "(6F24|6F25)", source: "Armored Chariot" } window 10,10 jump 2135 +1246.5 "--sync--" Ability { id: ["6F24", "6F25"], source: "Armored Chariot" } window 10,10 jump 2135 1256.6 "Diffusion Ray" Ability { id: "6F1E", source: "Armored Chariot" } 1266.7 "Rail Cannon" Ability { id: "6F1F", source: "Armored Chariot" } 1280.0 "Articulated Bits" Ability { id: "6F19", source: "Armored Chariot" } 1282.2 "Assail" Ability { id: "6F28", source: "Armored Chariot" } -1284.3 "--sync--" Ability { id: "(6F20|6F21)", source: "Armored Chariot" } +1284.3 "--sync--" Ability { id: ["6F20", "6F21"], source: "Armored Chariot" } #~~~~~~~~~~# # KAPIKULU # @@ -121,7 +121,7 @@ hideall "--sync--" 2074.7 "Wild Weave" Ability { id: "6F69", source: "Kapikulu" } 2084.5 "Power Serge" Ability { id: "6F6A", source: "Kapikulu" } 2088.8 "Mana Explosion" Ability { id: "6F6B", source: "Kapikulu" } -2099.6 "Magnitude Opus/Rotary Gale" Ability { id: "(6F6C|6F6E)", source: "Kapikulu" } +2099.6 "Magnitude Opus/Rotary Gale" Ability { id: ["6F6C", "6F6E"], source: "Kapikulu" } 2108.8 "--sync--" Ability { id: "6F62", source: "Kapikulu" } 2112.8 "Spin Out" Ability { id: "6F63", source: "Kapikulu" } 2120.5 "--sync--" Ability { id: "6F62", source: "Kapikulu" } @@ -136,7 +136,7 @@ hideall "--sync--" 2171.5 "Wild Weave" Ability { id: "6F69", source: "Kapikulu" } 2181.1 "Power Serge" Ability { id: "6F6A", source: "Kapikulu" } 2185.4 "Mana Explosion" Ability { id: "6F6B", source: "Kapikulu" } -2188.2 "Magnitude Opus/Rotary Gale" Ability { id: "(6F6C|6F6E)", source: "Kapikulu" } +2188.2 "Magnitude Opus/Rotary Gale" Ability { id: ["6F6C", "6F6E"], source: "Kapikulu" } 2199.4 "Crewel Slice" Ability { id: "6F72", source: "Kapikulu" } jump 2151.1 2206.5 "Billowing Bolts" Ability { id: "6F70", source: "Kapikulu" } @@ -144,4 +144,4 @@ hideall "--sync--" 2221.8 "Wild Weave" Ability { id: "6F69", source: "Kapikulu" } 2231.7 "Power Serge" Ability { id: "6F6A", source: "Kapikulu" } 2236.0 "Mana Explosion" Ability { id: "6F6B", source: "Kapikulu" } -2238.8 "Magnitude Opus/Rotary Gale" Ability { id: "(6F6C|6F6E)", source: "Kapikulu" } +2238.8 "Magnitude Opus/Rotary Gale" Ability { id: ["6F6C", "6F6E"], source: "Kapikulu" } diff --git a/ui/raidboss/data/06-ew/dungeon/another_aloalo_island-savage.txt b/ui/raidboss/data/06-ew/dungeon/another_aloalo_island-savage.txt index dc01e052af..1064e596a5 100644 --- a/ui/raidboss/data/06-ew/dungeon/another_aloalo_island-savage.txt +++ b/ui/raidboss/data/06-ew/dungeon/another_aloalo_island-savage.txt @@ -27,26 +27,26 @@ hideall "--sync--" 1022.0 "--middle--" Ability { id: "8A77", source: "Ketuduke" } 1027.0 "Spring Crystals 1" Ability { id: "8AA8", source: "Ketuduke" } 1034.0 "Bubble Net" Ability { id: "8AAD", source: "Ketuduke" } -1041.0 "Hydrobullet/Hydrofall (buff)" Ability { id: "(8AB8|8AB4)", source: "Ketuduke" } +1041.0 "Hydrobullet/Hydrofall (buff)" Ability { id: ["8AB8", "8AB4"], source: "Ketuduke" } 1050.0 "Fluke Gale (cast)" Ability { id: "8AB1", source: "Ketuduke" } 1060.0 "Fluke Gale 1" Ability { id: "8AB2", source: "Ketuduke" } 1062.0 "Fluke Gale 2" Ability { id: "8AB3", source: "Ketuduke" } 1065.0 "Saturate" Ability { id: "8ADC", source: "Spring Crystal" } -1065.1 "Hydrobullet/Hydrofall" Ability { id: "(8ADF|8ADE)", source: "Ketuduke" } +1065.1 "Hydrobullet/Hydrofall" Ability { id: ["8ADF", "8ADE"], source: "Ketuduke" } -1074.0 "Hydrofall/Hydrobullet (buff)" Ability { id: "(8AB4|8AB8)", source: "Ketuduke" } -1077.1 "Hydrobullet/Hydrofall (buff)" Ability { id: "(8C6D|8AB5)", source: "Ketuduke" } +1074.0 "Hydrofall/Hydrobullet (buff)" Ability { id: ["8AB4", "8AB8"], source: "Ketuduke" } +1077.1 "Hydrobullet/Hydrofall (buff)" Ability { id: ["8C6D", "8AB5"], source: "Ketuduke" } 1084.3 "Blowing Bubbles" Ability { id: "8ABD", source: "Ketuduke" } 1091.4 "Hydrobomb x3" Ability { id: "8AD0", source: "Ketuduke" } -1096.3 "Hydrofall/Hydrobullet" Ability { id: "(8ADE|8ADF)", source: "Ketuduke" } +1096.3 "Hydrofall/Hydrobullet" Ability { id: ["8ADE", "8ADF"], source: "Ketuduke" } 1099.6 "Hydrobomb x3" Ability { id: "8AD0", source: "Ketuduke" } -1102.5 "Hydrobullet/Hydrobullet" Ability { id: "(8ADF|8ADE)", source: "Ketuduke" } +1102.5 "Hydrobullet/Hydrobullet" Ability { id: ["8ADF", "8ADE"], source: "Ketuduke" } 1113.6 "Hydrofall (buff)" Ability { id: "8AB4", source: "Ketuduke" } 1118.9 "Strewn Bubbles" Ability { id: "8ABB", source: "Ketuduke" } -1130.3 "Receding Twintides/Encroaching Twintides" Ability { id: "(8AE7|8AE9)", source: "Ketuduke" } +1130.3 "Receding Twintides/Encroaching Twintides" Ability { id: ["8AE7", "8AE9"], source: "Ketuduke" } 1130.9 "Sphere Shatter 1" Ability { id: "8AE0", source: "Ketuduke" } -1133.4 "Far Tide/Near Tide" Ability { id: "(8AEA|8AE8)", source: "Ketuduke" } +1133.4 "Far Tide/Near Tide" Ability { id: ["8AEA", "8AE8"], source: "Ketuduke" } 1134.0 "Sphere Shatter 2" Ability { id: "8AE0", source: "Ketuduke" } 1134.0 "Hydrofall" Ability { id: "8ADE", source: "Ketuduke" } @@ -60,11 +60,11 @@ hideall "--sync--" 1184.1 "Hundred Lashings" Ability { id: "8ACA", source: "Aloalo Zaratan" } 1190.7 "--middle--" Ability { id: "8A77", source: "Ketuduke" } -1199.4 "Hydrofall/Hydrobullet (buff)" Ability { id: "(8AB4|8AB8)", source: "Ketuduke" } -1202.4 "Hydrobullet/Hydrofall (buff)" Ability { id: "(8C6D|8AB5)", source: "Ketuduke" } +1199.4 "Hydrofall/Hydrobullet (buff)" Ability { id: ["8AB4", "8AB8"], source: "Ketuduke" } +1202.4 "Hydrobullet/Hydrofall (buff)" Ability { id: ["8C6D", "8AB5"], source: "Ketuduke" } 1210.4 "Angry Seas" Ability { id: "8AE1", source: "Ketuduke" } -1211.6 "Hydrofall/Hydrobullet" Ability { id: "(8ADE|8ADF)", source: "Ketuduke" } -1212.2 "Hydrobullet/Hydrobullet" Ability { id: "(8ADF|8ADE)" } # this sometimes has the wrong source +1211.6 "Hydrofall/Hydrobullet" Ability { id: ["8ADE", "8ADF"], source: "Ketuduke" } +1212.2 "Hydrobullet/Hydrobullet" Ability { id: ["8ADF", "8ADE"] } # this sometimes has the wrong source 1214.8 "Spring Crystals 3" Ability { id: "8AA8", source: "Ketuduke" } 1216.8 "Hydrobullet" Ability { id: "8ADF", source: "Ketuduke" } 1221.8 "Bubble Net" Ability { id: "8AAD", source: "Ketuduke" } @@ -75,18 +75,18 @@ hideall "--sync--" 1246.7 "Spring Crystals 4" Ability { id: "8AA8", source: "Ketuduke" } 1253.7 "Bubble Net" Ability { id: "8AAD", source: "Ketuduke" } -1260.7 "Hydrobullet/Hydrofall (buff)" Ability { id: "(8AB8|8AB4)", source: "Ketuduke" } +1260.7 "Hydrobullet/Hydrofall (buff)" Ability { id: ["8AB8", "8AB4"], source: "Ketuduke" } 1269.8 "Fluke Gale (cast)" Ability { id: "8AB1", source: "Ketuduke" } 1279.9 "Fluke Gale 1" Ability { id: "8AB2", source: "Ketuduke" } 1281.9 "Fluke Gale 2" Ability { id: "8AB3", source: "Ketuduke" } 1284.9 "Saturate" Ability { id: "8ADC", source: "Spring Crystal" } -1285.0 "Hydrobullet/Hydrofall" Ability { id: "(8ADF|8ADE)", source: "Ketuduke" } +1285.0 "Hydrobullet/Hydrofall" Ability { id: ["8ADF", "8ADE"], source: "Ketuduke" } 1293.9 "Hydrofall (buff)" Ability { id: "8AB4", source: "Ketuduke" } 1299.2 "Strewn Bubbles" Ability { id: "8ABB", source: "Ketuduke" } -1310.6 "Receding Twintides/Encroaching Twintides" Ability { id: "(8AE7|8AE9)", source: "Ketuduke" } +1310.6 "Receding Twintides/Encroaching Twintides" Ability { id: ["8AE7", "8AE9"], source: "Ketuduke" } 1311.2 "Sphere Shatter 1" Ability { id: "8AE0", source: "Ketuduke" } -1313.7 "Far Tide/Near Tide" Ability { id: "(8AEA|8AE8)", source: "Ketuduke" } +1313.7 "Far Tide/Near Tide" Ability { id: ["8AEA", "8AE8"], source: "Ketuduke" } 1314.3 "Sphere Shatter 2" Ability { id: "8AE0", source: "Ketuduke" } 1314.3 "Hydrofall" Ability { id: "8ADE", source: "Ketuduke" } 1325.0 "Tidal Roar" Ability { id: "8AD4", source: "Ketuduke" } @@ -160,16 +160,16 @@ hideall "--sync--" 2011.1 "Inferno Theorem" Ability { id: "8C05", source: "Lala" } 2013.2 "--middle--" Ability { id: "8874", source: "Lala" } -2018.3 "Angular Addition" Ability { id: "(8BE0|8D2F)", source: "Lala" } -2026.4 "Arcane Blight" Ability { id: "(8BE2|8BE3|8BE4|8BE5)", source: "Lala" } +2018.3 "Angular Addition" Ability { id: ["8BE0", "8D2F"], source: "Lala" } +2026.4 "Arcane Blight" Ability { id: ["8BE2", "8BE3", "8BE4", "8BE5"], source: "Lala" } 2029.6 "--middle--" Ability { id: "8874", source: "Lala" } 2034.7 "Analysis" Ability { id: "8BEC", source: "Lala" } 2039.8 "Arcane Array 1" Ability { id: "8BE7", source: "Lala" } -2044.9 "Angular Addition" Ability { id: "(8BE0|8D2F)", source: "Lala" } +2044.9 "Angular Addition" Ability { id: ["8BE0", "8D2F"], source: "Lala" } 2045.6 "Bright Pulse" Ability { id: "8BE8", source: "Lala" } 2046.9 "Radiance 1" Ability { id: "8BEB", source: "Arcane Globe" } -2053.0 "Arcane Blight" Ability { id: "(8BE2|8BE3|8BE4|8BE5)", source: "Lala" } +2053.0 "Arcane Blight" Ability { id: ["8BE2", "8BE3", "8BE4", "8BE5"], source: "Lala" } # This can be +1.2s if it's on the final square instead of penultimate. 2054.1 "Radiance 2" #Ability { id: "8BEB", source: "Arcane Globe" } 2061.2 "Targeted Light" Ability { id: "8CE0", source: "Lala" } @@ -191,10 +191,10 @@ hideall "--sync--" 2150.5 "Radiance" Ability { id: "8D20", source: "Arcane Globe" } 2152.9 "Inferno Divide 2" Ability { id: "8BEA", source: "Arcane Font" } window 1,1 2156.6 "Inferno Divide 3" Ability { id: "8BEA", source: "Arcane Font" } window 1,1 -2157.6 "Angular Addition" Ability { id: "(8BE0|8D2F)", source: "Lala" } +2157.6 "Angular Addition" Ability { id: ["8BE0", "8D2F"], source: "Lala" } 2157.8 "Inferno Divide 4" Ability { id: "8BEA", source: "Arcane Font" } window 1,1 2160.2 "Inferno Divide 5" Ability { id: "8BEA", source: "Arcane Font" } window 1,1 -2165.6 "Arcane Blight" Ability { id: "(8BE2|8BE3|8BE4|8BE5)", source: "Lala" } +2165.6 "Arcane Blight" Ability { id: ["8BE2", "8BE3", "8BE4", "8BE5"], source: "Lala" } 2173.7 "Inferno Theorem" Ability { id: "8C05", source: "Lala" } 2184.8 "Inferno Theorem" Ability { id: "8C05", source: "Lala" } @@ -216,10 +216,10 @@ hideall "--sync--" 2263.6 "--middle--" Ability { id: "8874", source: "Lala" } 2269.0 "Analysis" Ability { id: "8BEC", source: "Lala" } 2274.1 "Arcane Array 3" Ability { id: "8BE7", source: "Lala" } -2279.2 "Angular Addition" Ability { id: "(8BE0|8D2F)", source: "Lala" } +2279.2 "Angular Addition" Ability { id: ["8BE0", "8D2F"], source: "Lala" } 2279.9 "Bright Pulse" Ability { id: "8BE8", source: "Lala" } 2281.2 "Radiance 1" Ability { id: "8BEB", source: "Arcane Globe" } -2287.3 "Arcane Blight" Ability { id: "(8BE2|8BE3|8BE4|8BE5)", source: "Lala" } +2287.3 "Arcane Blight" Ability { id: ["8BE2", "8BE3", "8BE4", "8BE5"], source: "Lala" } 2290.9 "Radiance 2" Ability { id: "8BEB", source: "Arcane Globe" } 2295.6 "Targeted Light" Ability { id: "8CE0", source: "Lala" } 2306.7 "Strategic Strike" Ability { id: "8C04", source: "Lala" } diff --git a/ui/raidboss/data/06-ew/dungeon/another_aloalo_island.txt b/ui/raidboss/data/06-ew/dungeon/another_aloalo_island.txt index fc7f6354d6..c3827714aa 100644 --- a/ui/raidboss/data/06-ew/dungeon/another_aloalo_island.txt +++ b/ui/raidboss/data/06-ew/dungeon/another_aloalo_island.txt @@ -22,26 +22,26 @@ hideall "--sync--" 1022.0 "--middle--" Ability { id: "8A77", source: "Ketuduke" } 1027.0 "Spring Crystals 1" Ability { id: "8AA8", source: "Ketuduke" } 1034.0 "Bubble Net" Ability { id: "8AAD", source: "Ketuduke" } -1041.0 "Hydrobullet/Hydrofall (buff)" Ability { id: "(8AB8|8AB4)", source: "Ketuduke" } +1041.0 "Hydrobullet/Hydrofall (buff)" Ability { id: ["8AB8", "8AB4"], source: "Ketuduke" } 1050.0 "Fluke Gale (cast)" Ability { id: "8AB1", source: "Ketuduke" } 1060.0 "Fluke Gale 1" Ability { id: "8AB2", source: "Ketuduke" } 1062.0 "Fluke Gale 2" Ability { id: "8AB3", source: "Ketuduke" } 1065.0 "Saturate" Ability { id: "8AAC", source: "Spring Crystal" } -1065.1 "Hydrobullet/Hydrofall" Ability { id: "(8ABA|8AB7)", source: "Ketuduke" } +1065.1 "Hydrobullet/Hydrofall" Ability { id: ["8ABA", "8AB7"], source: "Ketuduke" } -1074.0 "Hydrofall/Hydrobullet (buff)" Ability { id: "(8AB4|8AB8)", source: "Ketuduke" } -1077.1 "Hydrobullet/Hydrofall (buff)" Ability { id: "(8C6D|8AB5)", source: "Ketuduke" } +1074.0 "Hydrofall/Hydrobullet (buff)" Ability { id: ["8AB4", "8AB8"], source: "Ketuduke" } +1077.1 "Hydrobullet/Hydrofall (buff)" Ability { id: ["8C6D", "8AB5"], source: "Ketuduke" } 1084.3 "Blowing Bubbles" Ability { id: "8ABD", source: "Ketuduke" } 1091.4 "Hydrobomb x3" Ability { id: "8AD0", source: "Ketuduke" } -1096.3 "Hydrofall/Hydrobullet" Ability { id: "(8AB7|8ABA)", source: "Ketuduke" } +1096.3 "Hydrofall/Hydrobullet" Ability { id: ["8AB7", "8ABA"], source: "Ketuduke" } 1099.6 "Hydrobomb x3" Ability { id: "8AD0", source: "Ketuduke" } -1102.5 "Hydrobullet/Hydrobullet" Ability { id: "(8ABA|8AB7)", source: "Ketuduke" } +1102.5 "Hydrobullet/Hydrobullet" Ability { id: ["8ABA", "8AB7"], source: "Ketuduke" } 1113.6 "Hydrofall (buff)" Ability { id: "8AB4", source: "Ketuduke" } 1118.9 "Strewn Bubbles" Ability { id: "8ABB", source: "Ketuduke" } -1130.3 "Receding Twintides/Encroaching Twintides" Ability { id: "(8ACC|8ACE)", source: "Ketuduke" } +1130.3 "Receding Twintides/Encroaching Twintides" Ability { id: ["8ACC", "8ACE"], source: "Ketuduke" } 1130.9 "Sphere Shatter 1" Ability { id: "8ABC", source: "Ketuduke" } -1133.4 "Far Tide/Near Tide" Ability { id: "(8ACF|8ACD)", source: "Ketuduke" } +1133.4 "Far Tide/Near Tide" Ability { id: ["8ACF", "8ACD"], source: "Ketuduke" } 1134.0 "Sphere Shatter 2" Ability { id: "8ABC", source: "Ketuduke" } 1134.0 "Hydrofall" Ability { id: "8AB7", source: "Ketuduke" } @@ -55,11 +55,11 @@ hideall "--sync--" 1184.1 "Hundred Lashings" Ability { id: "8ACA", source: "Aloalo Zaratan" } 1190.7 "--middle--" Ability { id: "8A77", source: "Ketuduke" } -1199.4 "Hydrofall/Hydrobullet (buff)" Ability { id: "(8AB4|8AB8)", source: "Ketuduke" } -1202.4 "Hydrobullet/Hydrofall (buff)" Ability { id: "(8C6D|8AB5)", source: "Ketuduke" } +1199.4 "Hydrofall/Hydrobullet (buff)" Ability { id: ["8AB4", "8AB8"], source: "Ketuduke" } +1202.4 "Hydrobullet/Hydrofall (buff)" Ability { id: ["8C6D", "8AB5"], source: "Ketuduke" } 1210.4 "Angry Seas" Ability { id: "8AC1", source: "Ketuduke" } -1211.6 "Hydrofall/Hydrobullet" Ability { id: "(8AB7|8ABA)", source: "Ketuduke" } -1212.2 "Hydrobullet/Hydrobullet" Ability { id: "(8ABA|8AB7)" } # this sometimes has the wrong source +1211.6 "Hydrofall/Hydrobullet" Ability { id: ["8AB7", "8ABA"], source: "Ketuduke" } +1212.2 "Hydrobullet/Hydrobullet" Ability { id: ["8ABA", "8AB7"] } # this sometimes has the wrong source 1214.8 "Spring Crystals 3" Ability { id: "8AA8", source: "Ketuduke" } 1216.8 "Hydrobullet" Ability { id: "8ABA", source: "Ketuduke" } 1221.8 "Bubble Net" Ability { id: "8AAD", source: "Ketuduke" } @@ -70,18 +70,18 @@ hideall "--sync--" 1246.7 "Spring Crystals 4" Ability { id: "8AA8", source: "Ketuduke" } 1253.7 "Bubble Net" Ability { id: "8AAD", source: "Ketuduke" } -1260.7 "Hydrobullet/Hydrofall (buff)" Ability { id: "(8AB8|8AB4)", source: "Ketuduke" } +1260.7 "Hydrobullet/Hydrofall (buff)" Ability { id: ["8AB8", "8AB4"], source: "Ketuduke" } 1269.8 "Fluke Gale (cast)" Ability { id: "8AB1", source: "Ketuduke" } 1279.9 "Fluke Gale 1" Ability { id: "8AB2", source: "Ketuduke" } 1281.9 "Fluke Gale 2" Ability { id: "8AB3", source: "Ketuduke" } 1284.9 "Saturate" Ability { id: "8AAC", source: "Spring Crystal" } -1285.0 "Hydrobullet/Hydrofall" Ability { id: "(8ABA|8AB7)", source: "Ketuduke" } +1285.0 "Hydrobullet/Hydrofall" Ability { id: ["8ABA", "8AB7"], source: "Ketuduke" } 1293.9 "Hydrofall (buff)" Ability { id: "8AB4", source: "Ketuduke" } 1299.2 "Strewn Bubbles" Ability { id: "8ABB", source: "Ketuduke" } -1310.6 "Receding Twintides/Encroaching Twintides" Ability { id: "(8ACC|8ACE)", source: "Ketuduke" } +1310.6 "Receding Twintides/Encroaching Twintides" Ability { id: ["8ACC", "8ACE"], source: "Ketuduke" } 1311.2 "Sphere Shatter 1" Ability { id: "8ABC", source: "Ketuduke" } -1313.7 "Far Tide/Near Tide" Ability { id: "(8ACF|8ACD)", source: "Ketuduke" } +1313.7 "Far Tide/Near Tide" Ability { id: ["8ACF", "8ACD"], source: "Ketuduke" } 1314.3 "Sphere Shatter 2" Ability { id: "8ABC", source: "Ketuduke" } 1314.3 "Hydrofall" Ability { id: "8AB7", source: "Ketuduke" } 1325.0 "Tidal Roar" Ability { id: "8AD4", source: "Ketuduke" } @@ -155,16 +155,16 @@ hideall "--sync--" 2011.1 "Inferno Theorem" Ability { id: "88AE", source: "Lala" } 2013.2 "--middle--" Ability { id: "8874", source: "Lala" } -2018.3 "Angular Addition" Ability { id: "(8889|8D2E)", source: "Lala" } -2026.4 "Arcane Blight" Ability { id: "(888B|888C|888D|888E)", source: "Lala" } +2018.3 "Angular Addition" Ability { id: ["8889", "8D2E"], source: "Lala" } +2026.4 "Arcane Blight" Ability { id: ["888B", "888C", "888D", "888E"], source: "Lala" } 2029.6 "--middle--" Ability { id: "8874", source: "Lala" } 2034.7 "Analysis" Ability { id: "8895", source: "Lala" } 2039.8 "Arcane Array 1" Ability { id: "8890", source: "Lala" } -2044.9 "Angular Addition" Ability { id: "(8889|8D2E)", source: "Lala" } +2044.9 "Angular Addition" Ability { id: ["8889", "8D2E"], source: "Lala" } 2045.6 "Bright Pulse" Ability { id: "8891", source: "Lala" } 2046.9 "Radiance 1" Ability { id: "8894", source: "Arcane Globe" } -2053.0 "Arcane Blight" Ability { id: "(888B|888C|888D|888E)", source: "Lala" } +2053.0 "Arcane Blight" Ability { id: ["888B", "888C", "888D", "888E"], source: "Lala" } # This can be +1.2s if it's on the final square instead of penultimate. 2054.1 "Radiance 2" #Ability { id: "8894", source: "Arcane Globe" } 2061.2 "Targeted Light" Ability { id: "8CDE", source: "Lala" } @@ -186,10 +186,10 @@ hideall "--sync--" 2150.5 "Radiance" Ability { id: "8D1F", source: "Arcane Globe" } 2152.9 "Inferno Divide 2" Ability { id: "8893", source: "Arcane Font" } window 1,1 2156.6 "Inferno Divide 3" Ability { id: "8893", source: "Arcane Font" } window 1,1 -2157.6 "Angular Addition" Ability { id: "(8889|8D2E)", source: "Lala" } +2157.6 "Angular Addition" Ability { id: ["8889", "8D2E"], source: "Lala" } 2157.8 "Inferno Divide 4" Ability { id: "8893", source: "Arcane Font" } window 1,1 2160.2 "Inferno Divide 5" Ability { id: "8893", source: "Arcane Font" } window 1,1 -2165.6 "Arcane Blight" Ability { id: "(888B|888C|888D|888E)", source: "Lala" } +2165.6 "Arcane Blight" Ability { id: ["888B", "888C", "888D", "888E"], source: "Lala" } 2173.7 "Inferno Theorem" Ability { id: "88AE", source: "Lala" } 2184.8 "Inferno Theorem" Ability { id: "88AE", source: "Lala" } @@ -211,10 +211,10 @@ hideall "--sync--" 2263.6 "--middle--" Ability { id: "8874", source: "Lala" } 2269.0 "Analysis" Ability { id: "8895", source: "Lala" } 2274.1 "Arcane Array 3" Ability { id: "8890", source: "Lala" } -2279.2 "Angular Addition" Ability { id: "(8889|8D2E)", source: "Lala" } +2279.2 "Angular Addition" Ability { id: ["8889", "8D2E"], source: "Lala" } 2279.9 "Bright Pulse" Ability { id: "8891", source: "Lala" } 2281.2 "Radiance 1" Ability { id: "8894", source: "Arcane Globe" } -2287.3 "Arcane Blight" Ability { id: "(888B|888C|888D|888E)", source: "Lala" } +2287.3 "Arcane Blight" Ability { id: ["888B", "888C", "888D", "888E"], source: "Lala" } 2290.9 "Radiance 2" Ability { id: "8894", source: "Arcane Globe" } 2295.6 "Targeted Light" Ability { id: "8CDE", source: "Lala" } 2306.7 "Strategic Strike" Ability { id: "88AD", source: "Lala" } diff --git a/ui/raidboss/data/06-ew/dungeon/another_mount_rokkon-savage.txt b/ui/raidboss/data/06-ew/dungeon/another_mount_rokkon-savage.txt index 5d9921ce84..82cc90482e 100644 --- a/ui/raidboss/data/06-ew/dungeon/another_mount_rokkon-savage.txt +++ b/ui/raidboss/data/06-ew/dungeon/another_mount_rokkon-savage.txt @@ -56,10 +56,10 @@ hideall "--sync--" 1093.9 "Haunting Cry" Ability { id: "8431", source: "Shishio" } 1105.9 "Right Swipe" Ability { id: "8432", source: "Devilish Thrall" } 1105.9 "Left Swipe" Ability { id: "8433", source: "Devilish Thrall" } -1106.8 "Unnatural Ailment/Unnatural Force 1" Ability { id: "(843F|8440)", source: "Shishio" } +1106.8 "Unnatural Ailment/Unnatural Force 1" Ability { id: ["843F", "8440"], source: "Shishio" } 1112.9 "Right Swipe" Ability { id: "8432", source: "Devilish Thrall" } 1112.9 "Left Swipe" Ability { id: "8433", source: "Devilish Thrall" } -1113.8 "Unnatural Force/Unnatural Ailment 2" Ability { id: "(8440|843F)", source: "Shishio" } +1113.8 "Unnatural Force/Unnatural Ailment 2" Ability { id: ["8440", "843F"], source: "Shishio" } 1118.1 "--middle--" Ability { id: "8444", source: "Shishio" } 1123.4 "Stormcloud Summons (lines)" Ability { id: "841F", source: "Shishio" } @@ -69,12 +69,12 @@ hideall "--sync--" 1155.7 "--middle--" Ability { id: "8444", source: "Shishio" } window 10,10 1160.8 "Unnatural Wail" Ability { id: "843E", source: "Shishio" } -1168.1 "Eye of the Thunder Vortex/Vortex of the Thunder Eye" Ability { id: "(843A|843C)", source: "Shishio" } -1168.8 "Unnatural Ailment/Unnatural Force 1" Ability { id: "(843F|8440)", source: "Shishio" } +1168.1 "Eye of the Thunder Vortex/Vortex of the Thunder Eye" Ability { id: ["843A", "843C"], source: "Shishio" } +1168.8 "Unnatural Ailment/Unnatural Force 1" Ability { id: ["843F", "8440"], source: "Shishio" } # Technically, the in/out and out/in for each pair are named the same thing. # But in a timeline, switching them makes it obvious it's the other. -1172.1 "Vortex of the Thunder Eye/Eye of the Thunder Vortex" Ability { id: "(843B|843D)", source: "Shishio" } -1172.8 "Unnatural Force/Unnatural Ailment 2" Ability { id: "(8440|843F)", source: "Shishio" } +1172.1 "Vortex of the Thunder Eye/Eye of the Thunder Vortex" Ability { id: ["843B", "843D"], source: "Shishio" } +1172.8 "Unnatural Force/Unnatural Ailment 2" Ability { id: ["8440", "843F"], source: "Shishio" } 1181.4 "Enkyo" Ability { id: "8441", source: "Shishio" } 1189.5 "Haunting Cry" Ability { id: "8431", source: "Shishio" } @@ -101,10 +101,10 @@ hideall "--sync--" 1307.4 "--middle--" Ability { id: "8444", source: "Shishio" } 1312.5 "Unnatural Wail" Ability { id: "843E", source: "Shishio" } -1319.8 "Eye of the Thunder Vortex/Vortex of the Thunder Eye" Ability { id: "(843A|843C)", source: "Shishio" } -1320.4 "Unnatural Ailment/Unnatural Force 1" Ability { id: "(843F|8440)", source: "Shishio" } -1323.8 "Vortex of the Thunder Eye/Eye of the Thunder Vortex" Ability { id: "(843B|843D)", source: "Shishio" } -1324.4 "Unnatural Force/Unnatural Ailment 2" Ability { id: "(8440|843F)", source: "Shishio" } +1319.8 "Eye of the Thunder Vortex/Vortex of the Thunder Eye" Ability { id: ["843A", "843C"], source: "Shishio" } +1320.4 "Unnatural Ailment/Unnatural Force 1" Ability { id: ["843F", "8440"], source: "Shishio" } +1323.8 "Vortex of the Thunder Eye/Eye of the Thunder Vortex" Ability { id: ["843B", "843D"], source: "Shishio" } +1324.4 "Unnatural Force/Unnatural Ailment 2" Ability { id: ["8440", "843F"], source: "Shishio" } 1329.4 "--sync--" StartsUsing { id: "841E", source: "Shishio" } window 20,20 1339.4 "Enkyo Enrage" Ability { id: "841E", source: "Shishio" } @@ -167,9 +167,9 @@ hideall "--sync--" 2021.7 "--middle--" Ability { id: "84D3", source: "Gorai the Uncaged" } 2028.0 "Seal of Scurrying Sparks" Ability { id: "8503", source: "Gorai the Uncaged" } 2033.3 "Flame and Sulphur" Ability { id: "8508", source: "Gorai the Uncaged" } -2044.6 "Brazen Ballad" Ability { id: "(8509|850A)", source: "Gorai the Uncaged" } -2047.7 "Falling Rock" Ability { id: "(853F|8540)", source: "Gorai the Uncaged" } -2047.7 "Fire Spread" Ability { id: "(853C|853D)", source: "Gorai the Uncaged" } +2044.6 "Brazen Ballad" Ability { id: ["8509", "850A"], source: "Gorai the Uncaged" } +2047.7 "Falling Rock" Ability { id: ["853F", "8540"], source: "Gorai the Uncaged" } +2047.7 "Fire Spread" Ability { id: ["853C", "853D"], source: "Gorai the Uncaged" } 2048.0 "Greater Ball of Fire" Ability { id: "8539", source: "Gorai the Uncaged" } 2055.6 "Impure Purgation 1" Ability { id: "8552", source: "Gorai the Uncaged" } 2057.6 "Impure Purgation 2" Ability { id: "8553", source: "Gorai the Uncaged" } @@ -197,8 +197,8 @@ hideall "--sync--" 2163.1 "--middle--" Ability { id: "84D3", source: "Gorai the Uncaged" } 2169.2 "Seal of Scurrying Sparks" Ability { id: "8503", source: "Gorai the Uncaged" } 2178.5 "Cloud to Ground" Ability { id: "854D", source: "Gorai the Uncaged" } duration 6.3 -2180.5 "Greater Ball of Fire/Great Ball of Fire" Ability { id: "(8539|853A)", source: "Gorai the Uncaged" } window 1,1 -2183.5 "Great Ball of Fire/Greater Ball of Fire" Ability { id: "(853A|8539)", source: "Gorai the Uncaged" } window 1,1 +2180.5 "Greater Ball of Fire/Great Ball of Fire" Ability { id: ["8539", "853A"], source: "Gorai the Uncaged" } window 1,1 +2183.5 "Great Ball of Fire/Greater Ball of Fire" Ability { id: ["853A", "8539"], source: "Gorai the Uncaged" } window 1,1 2193.5 "--middle--" Ability { id: "84D3", source: "Gorai the Uncaged" } 2202.2 "Fighting Spirits" Ability { id: "854F", source: "Gorai the Uncaged" } @@ -303,14 +303,14 @@ hideall "--sync--" 3011.4 "--sync--" StartsUsing { id: "860C", source: "Moko the Restless" } window 10000,10 3016.4 "Kenki Release" Ability { id: "860C", source: "Moko the Restless" } -3035.6 "Triple Kasumi-giri 1" Ability { id: "(85E4|85E5|85E6|85E7|85EE|85EF|85F0|85F1)", source: "Moko the Restless" } -3038.6 "Triple Kasumi-giri 2" Ability { id: "(85E8|85E9|85EA|85EB|85F2|85F3|85F4|85F5)", source: "Moko the Restless" } -3041.6 "Triple Kasumi-giri 3" Ability { id: "(85E8|85E9|85EA|85EB|85F2|85F3|85F4|85F5)", source: "Moko the Restless" } -3055.7 "Triple Kasumi-giri 1" Ability { id: "(85E4|85E5|85E6|85E7|85EE|85EF|85F0|85F1)", source: "Moko the Restless" } -3058.7 "Triple Kasumi-giri 2" Ability { id: "(85E8|85E9|85EA|85EB|85F2|85F3|85F4|85F5)", source: "Moko the Restless" } -3061.7 "Triple Kasumi-giri 3" Ability { id: "(85E8|85E9|85EA|85EB|85F2|85F3|85F4|85F5)", source: "Moko the Restless" } +3035.6 "Triple Kasumi-giri 1" Ability { id: ["85E4", "85E5", "85E6", "85E7", "85EE", "85EF", "85F0", "85F1"], source: "Moko the Restless" } +3038.6 "Triple Kasumi-giri 2" Ability { id: ["85E8", "85E9", "85EA", "85EB", "85F2", "85F3", "85F4", "85F5"], source: "Moko the Restless" } +3041.6 "Triple Kasumi-giri 3" Ability { id: ["85E8", "85E9", "85EA", "85EB", "85F2", "85F3", "85F4", "85F5"], source: "Moko the Restless" } +3055.7 "Triple Kasumi-giri 1" Ability { id: ["85E4", "85E5", "85E6", "85E7", "85EE", "85EF", "85F0", "85F1"], source: "Moko the Restless" } +3058.7 "Triple Kasumi-giri 2" Ability { id: ["85E8", "85E9", "85EA", "85EB", "85F2", "85F3", "85F4", "85F5"], source: "Moko the Restless" } +3061.7 "Triple Kasumi-giri 3" Ability { id: ["85E8", "85E9", "85EA", "85EB", "85F2", "85F3", "85F4", "85F5"], source: "Moko the Restless" } -3063.8 "--sync--" Ability { id: "(871F|8720)", source: "Moko the Restless" } +3063.8 "--sync--" Ability { id: ["871F", "8720"], source: "Moko the Restless" } 3071.1 "Lateral Slice" Ability { id: "860D", source: "Moko the Restless" } 3077.2 "--middle--" Ability { id: "85AF", source: "Moko the Restless" } @@ -319,11 +319,11 @@ hideall "--sync--" 3096.0 "Invocation of Vengeance" Ability { id: "85BD", source: "Moko the Restless" } 3108.1 "Fleeting Iai-giri (cast)" Ability { id: "85C2", source: "Moko the Restless" } 3108.3 "--jump--" Ability { id: "85C3", source: "Moko the Restless" } -3110.6 "Fleeting Iai-giri" Ability { id: "(85F6|85F7|85F8)", source: "Moko the Restless" } +3110.6 "Fleeting Iai-giri" Ability { id: ["85F6", "85F7", "85F8"], source: "Moko the Restless" } 3111.7 "Explosion 1" Ability { id: "8602", source: "Moko the Restless" } -3111.8 "Vengeful Flame/Vengeful Pyre" Ability { id: "(8608|8609)", source: "Moko the Restless" } +3111.8 "Vengeful Flame/Vengeful Pyre" Ability { id: ["8608", "8609"], source: "Moko the Restless" } 3118.6 "Explosion 2" Ability { id: "8602", source: "Moko the Restless" } -3119.7 "Vengeful Pyre/Vengeful Flame" Ability { id: "(8609|8608)", source: "Moko the Restless" } +3119.7 "Vengeful Pyre/Vengeful Flame" Ability { id: ["8609", "8608"], source: "Moko the Restless" } 3127.6 "Kenki Release" Ability { id: "860C", source: "Moko the Restless" } @@ -331,20 +331,20 @@ hideall "--sync--" 3139.0 "Shadow-twin" Ability { id: "85C7", source: "Moko the Restless" } 3145.1 "Moonless Night" Ability { id: "860A", source: "Moko the Restless" } -3154.2 "Near Edge/Far Edge 1" Ability { id: "(85D9|85D8)", source: "Moko the Restless" } +3154.2 "Near Edge/Far Edge 1" Ability { id: ["85D9", "85D8"], source: "Moko the Restless" } 3154.2 "Double Iai-giri x2" Ability { id: "85C8", source: "Moko's Shadow" } 3154.2 "Clearout x3" Ability { id: "8C22", source: "Oni's Claw" } 3154.2 "--jump--" Ability { id: "85C9", source: "Moko's Shadow" } 3156.9 "Shadow Kasumi-giri 1" Ability { id: "85F9", source: "Moko's Shadow" } -3160.0 "Shadow Kasumi-giri 2" Ability { id: "(86CC|86CD|86CE)", source: "Moko's Shadow" } +3160.0 "Shadow Kasumi-giri 2" Ability { id: ["86CC", "86CD", "86CE"], source: "Moko's Shadow" } 3165.4 "Moonless Night" Ability { id: "860A", source: "Moko the Restless" } -3174.5 "Far Edge/Near Edge 2" Ability { id: "(85D8|85D9)", source: "Moko the Restless" } +3174.5 "Far Edge/Near Edge 2" Ability { id: ["85D8", "85D9"], source: "Moko the Restless" } 3174.5 "Double Iai-giri x2" Ability { id: "85C8", source: "Moko's Shadow" } 3174.5 "Clearout x3" Ability { id: "8C22", source: "Oni's Claw" } 3174.7 "--jump--" Ability { id: "85C9", source: "Moko's Shadow" } 3176.8 "Shadow Kasumi-giri 1" Ability { id: "85F9", source: "Moko's Shadow" } -3179.8 "Shadow Kasumi-giri 2" Ability { id: "(86CC|86CD|86CE)", source: "Moko's Shadow" } +3179.8 "Shadow Kasumi-giri 2" Ability { id: ["86CC", "86CD", "86CE"], source: "Moko's Shadow" } 3187.1 "Kenki Release" Ability { id: "860C", source: "Moko the Restless" } @@ -356,12 +356,12 @@ hideall "--sync--" 3224.8 "Upwell 3" Ability { id: "8605", source: "Moko the Restless" } 3225.2 "--middle--" Ability { id: "85AF", source: "Moko the Restless" } 3227.8 "Upwell 4" Ability { id: "8605", source: "Moko the Restless" } -3238.7 "Triple Kasumi-giri 1" Ability { id: "(85E4|85E5|85E6|85E7|85EE|85EF|85F0|85F1)", source: "Moko the Restless" } -3241.7 "Triple Kasumi-giri 2" Ability { id: "(85E8|85E9|85EA|85EB|85F2|85F3|85F4|85F5)", source: "Moko the Restless" } -3244.7 "Triple Kasumi-giri 3" Ability { id: "(85E8|85E9|85EA|85EB|85F2|85F3|85F4|85F5)", source: "Moko the Restless" } +3238.7 "Triple Kasumi-giri 1" Ability { id: ["85E4", "85E5", "85E6", "85E7", "85EE", "85EF", "85F0", "85F1"], source: "Moko the Restless" } +3241.7 "Triple Kasumi-giri 2" Ability { id: ["85E8", "85E9", "85EA", "85EB", "85F2", "85F3", "85F4", "85F5"], source: "Moko the Restless" } +3244.7 "Triple Kasumi-giri 3" Ability { id: ["85E8", "85E9", "85EA", "85EB", "85F2", "85F3", "85F4", "85F5"], source: "Moko the Restless" } 3251.8 "Kenki Release" Ability { id: "860C", source: "Moko the Restless" } -3254.9 "--sync--" Ability { id: "(871F|8720)", source: "Moko the Restless" } +3254.9 "--sync--" Ability { id: ["871F", "8720"], source: "Moko the Restless" } 3260.0 "--middle--" Ability { id: "85AF", source: "Moko the Restless" } 3264.1 "Soldiers of Death" Ability { id: "8593", source: "Moko the Restless" } 3270.2 "Shadow-twin" Ability { id: "85C7", source: "Moko the Restless" } @@ -370,16 +370,16 @@ hideall "--sync--" 3285.9 "Iron Storm" Ability { id: "85FF", source: "Ashigaru Kyuhei" } 3285.9 "Iron Rain" Ability { id: "85FE", source: "Ashigaru Kyuhei" } 3288.3 "Shadow Kasumi-giri 1" Ability { id: "85F9", source: "Moko's Shadow" } -3291.3 "Shadow Kasumi-giri 2" Ability { id: "(86CC|86CE)", source: "Moko's Shadow" } +3291.3 "Shadow Kasumi-giri 2" Ability { id: ["86CC", "86CE"], source: "Moko's Shadow" } 3291.7 "Iron Storm" Ability { id: "87AA", source: "Ashigaru Kyuhei" } 3291.7 "Iron Rain" Ability { id: "87A9", source: "Ashigaru Kyuhei" } 3291.8 "--middle--" Ability { id: "85AF", source: "Moko the Restless" } -3305.1 "Triple Kasumi-giri 1" Ability { id: "(85E4|85E5|85E6|85E7|85EE|85EF|85F0|85F1)", source: "Moko the Restless" } -3308.2 "Triple Kasumi-giri 2" Ability { id: "(85E8|85E9|85EA|85EB|85F2|85F3|85F4|85F5)", source: "Moko the Restless" } -3311.3 "Triple Kasumi-giri 3" Ability { id: "(85E8|85E9|85EA|85EB|85F2|85F3|85F4|85F5)", source: "Moko the Restless" } +3305.1 "Triple Kasumi-giri 1" Ability { id: ["85E4", "85E5", "85E6", "85E7", "85EE", "85EF", "85F0", "85F1"], source: "Moko the Restless" } +3308.2 "Triple Kasumi-giri 2" Ability { id: ["85E8", "85E9", "85EA", "85EB", "85F2", "85F3", "85F4", "85F5"], source: "Moko the Restless" } +3311.3 "Triple Kasumi-giri 3" Ability { id: ["85E8", "85E9", "85EA", "85EB", "85F2", "85F3", "85F4", "85F5"], source: "Moko the Restless" } 3318.3 "Kenki Release" Ability { id: "860C", source: "Moko the Restless" } -3321.4 "--sync--" Ability { id: "(871F|8720)", source: "Moko the Restless" } +3321.4 "--sync--" Ability { id: ["871F", "8720"], source: "Moko the Restless" } 3328.8 "Lateral Slice" Ability { id: "860D", source: "Moko the Restless" } 3336.8 "Kenki Release" Ability { id: "860C", source: "Moko the Restless" } diff --git a/ui/raidboss/data/06-ew/dungeon/another_mount_rokkon.txt b/ui/raidboss/data/06-ew/dungeon/another_mount_rokkon.txt index 9449850541..6370e05d98 100644 --- a/ui/raidboss/data/06-ew/dungeon/another_mount_rokkon.txt +++ b/ui/raidboss/data/06-ew/dungeon/another_mount_rokkon.txt @@ -51,10 +51,10 @@ hideall "--sync--" 1093.9 "Haunting Cry" Ability { id: "840A", source: "Shishio" } 1105.9 "Right Swipe" Ability { id: "840B", source: "Devilish Thrall" } 1105.9 "Left Swipe" Ability { id: "840C", source: "Devilish Thrall" } -1106.8 "Unnatural Ailment/Unnatural Force 1" Ability { id: "(8418|8419)", source: "Shishio" } +1106.8 "Unnatural Ailment/Unnatural Force 1" Ability { id: ["8418", "8419"], source: "Shishio" } 1112.9 "Right Swipe" Ability { id: "840B", source: "Devilish Thrall" } 1112.9 "Left Swipe" Ability { id: "840C", source: "Devilish Thrall" } -1113.8 "Unnatural Force/Unnatural Ailment 2" Ability { id: "(8419|8418)", source: "Shishio" } +1113.8 "Unnatural Force/Unnatural Ailment 2" Ability { id: ["8419", "8418"], source: "Shishio" } 1118.1 "--middle--" Ability { id: "841D", source: "Shishio" } 1123.4 "Stormcloud Summons (lines)" Ability { id: "83F8", source: "Shishio" } @@ -64,12 +64,12 @@ hideall "--sync--" 1155.7 "--middle--" Ability { id: "841D", source: "Shishio" } window 10,10 1160.8 "Unnatural Wail" Ability { id: "8417", source: "Shishio" } -1168.1 "Eye of the Thunder Vortex/Vortex of the Thunder Eye" Ability { id: "(8413|8415)", source: "Shishio" } -1168.8 "Unnatural Ailment/Unnatural Force 1" Ability { id: "(8418|8419)", source: "Shishio" } +1168.1 "Eye of the Thunder Vortex/Vortex of the Thunder Eye" Ability { id: ["8413", "8415"], source: "Shishio" } +1168.8 "Unnatural Ailment/Unnatural Force 1" Ability { id: ["8418", "8419"], source: "Shishio" } # Technically, the in/out and out/in for each pair are named the same thing. # But in a timeline, switching them makes it obvious it's the other. -1172.1 "Vortex of the Thunder Eye/Eye of the Thunder Vortex" Ability { id: "(8414|8416)", source: "Shishio" } -1172.8 "Unnatural Force/Unnatural Ailment 2" Ability { id: "(8419|8418)", source: "Shishio" } +1172.1 "Vortex of the Thunder Eye/Eye of the Thunder Vortex" Ability { id: ["8414", "8416"], source: "Shishio" } +1172.8 "Unnatural Force/Unnatural Ailment 2" Ability { id: ["8419", "8418"], source: "Shishio" } 1181.4 "Enkyo" Ability { id: "841A", source: "Shishio" } 1189.5 "Haunting Cry" Ability { id: "840A", source: "Shishio" } @@ -96,10 +96,10 @@ hideall "--sync--" 1307.4 "--middle--" Ability { id: "841D", source: "Shishio" } 1312.5 "Unnatural Wail" Ability { id: "8417", source: "Shishio" } -1319.8 "Eye of the Thunder Vortex/Vortex of the Thunder Eye" Ability { id: "(8413|8415)", source: "Shishio" } -1320.4 "Unnatural Ailment/Unnatural Force 1" Ability { id: "(8418|8419)", source: "Shishio" } -1323.8 "Vortex of the Thunder Eye/Eye of the Thunder Vortex" Ability { id: "(8414|8416)", source: "Shishio" } -1324.4 "Unnatural Force/Unnatural Ailment 2" Ability { id: "(8419|8418)", source: "Shishio" } +1319.8 "Eye of the Thunder Vortex/Vortex of the Thunder Eye" Ability { id: ["8413", "8415"], source: "Shishio" } +1320.4 "Unnatural Ailment/Unnatural Force 1" Ability { id: ["8418", "8419"], source: "Shishio" } +1323.8 "Vortex of the Thunder Eye/Eye of the Thunder Vortex" Ability { id: ["8414", "8416"], source: "Shishio" } +1324.4 "Unnatural Force/Unnatural Ailment 2" Ability { id: ["8419", "8418"], source: "Shishio" } 1329.4 "--sync--" StartsUsing { id: "841E", source: "Shishio" } window 20,20 1339.4 "Enkyo Enrage" Ability { id: "841E", source: "Shishio" } @@ -162,9 +162,9 @@ hideall "--sync--" 2021.7 "--middle--" Ability { id: "84D3", source: "Gorai the Uncaged" } 2028.0 "Seal of Scurrying Sparks" Ability { id: "8503", source: "Gorai the Uncaged" } 2033.3 "Flame and Sulphur" Ability { id: "8508", source: "Gorai the Uncaged" } -2044.6 "Brazen Ballad" Ability { id: "(8509|850A)", source: "Gorai the Uncaged" } -2047.7 "Falling Rock" Ability { id: "(850E|850F)", source: "Gorai the Uncaged" } -2047.7 "Fire Spread" Ability { id: "(850B|850C)", source: "Gorai the Uncaged" } +2044.6 "Brazen Ballad" Ability { id: ["8509", "850A"], source: "Gorai the Uncaged" } +2047.7 "Falling Rock" Ability { id: ["850E", "850F"], source: "Gorai the Uncaged" } +2047.7 "Fire Spread" Ability { id: ["850B", "850C"], source: "Gorai the Uncaged" } 2048.0 "Greater Ball of Fire" Ability { id: "8505", source: "Gorai the Uncaged" } 2055.6 "Impure Purgation 1" Ability { id: "8530", source: "Gorai the Uncaged" } 2057.6 "Impure Purgation 2" Ability { id: "8531", source: "Gorai the Uncaged" } @@ -192,8 +192,8 @@ hideall "--sync--" 2163.1 "--middle--" Ability { id: "84D3", source: "Gorai the Uncaged" } 2169.2 "Seal of Scurrying Sparks" Ability { id: "8503", source: "Gorai the Uncaged" } 2178.5 "Cloud to Ground" Ability { id: "8529", source: "Gorai the Uncaged" } duration 6.3 -2180.5 "Greater Ball of Fire/Great Ball of Fire" Ability { id: "(8505|8506)", source: "Gorai the Uncaged" } window 1,1 -2183.5 "Great Ball of Fire/Greater Ball of Fire" Ability { id: "(8506|8505)", source: "Gorai the Uncaged" } window 1,1 +2180.5 "Greater Ball of Fire/Great Ball of Fire" Ability { id: ["8505", "8506"], source: "Gorai the Uncaged" } window 1,1 +2183.5 "Great Ball of Fire/Greater Ball of Fire" Ability { id: ["8506", "8505"], source: "Gorai the Uncaged" } window 1,1 2193.5 "--middle--" Ability { id: "84D3", source: "Gorai the Uncaged" } 2202.2 "Fighting Spirits" Ability { id: "852C", source: "Gorai the Uncaged" } @@ -298,14 +298,14 @@ hideall "--sync--" 3011.4 "--sync--" StartsUsing { id: "85E0", source: "Moko the Restless" } window 10000,10 3016.4 "Kenki Release" Ability { id: "85E0", source: "Moko the Restless" } -3035.6 "Triple Kasumi-giri 1" Ability { id: "(85B0|85B1|85B2|85B3|85BA|85BB|85BC|85BD)", source: "Moko the Restless" } -3038.6 "Triple Kasumi-giri 2" Ability { id: "(85B4|85B5|85B6|85B7|85BE|85BF|85C0|85C1)", source: "Moko the Restless" } -3041.6 "Triple Kasumi-giri 3" Ability { id: "(85B4|85B5|85B6|85B7|85BE|85BF|85C0|85C1)", source: "Moko the Restless" } -3055.7 "Triple Kasumi-giri 1" Ability { id: "(85B0|85B1|85B2|85B3|85BA|85BB|85BC|85BD)", source: "Moko the Restless" } -3058.7 "Triple Kasumi-giri 2" Ability { id: "(85B4|85B5|85B6|85B7|85BE|85BF|85C0|85C1)", source: "Moko the Restless" } -3061.7 "Triple Kasumi-giri 3" Ability { id: "(85B4|85B5|85B6|85B7|85BE|85BF|85C0|85C1)", source: "Moko the Restless" } +3035.6 "Triple Kasumi-giri 1" Ability { id: ["85B0", "85B1", "85B2", "85B3", "85BA", "85BB", "85BC", "85BD"], source: "Moko the Restless" } +3038.6 "Triple Kasumi-giri 2" Ability { id: ["85B4", "85B5", "85B6", "85B7", "85BE", "85BF", "85C0", "85C1"], source: "Moko the Restless" } +3041.6 "Triple Kasumi-giri 3" Ability { id: ["85B4", "85B5", "85B6", "85B7", "85BE", "85BF", "85C0", "85C1"], source: "Moko the Restless" } +3055.7 "Triple Kasumi-giri 1" Ability { id: ["85B0", "85B1", "85B2", "85B3", "85BA", "85BB", "85BC", "85BD"], source: "Moko the Restless" } +3058.7 "Triple Kasumi-giri 2" Ability { id: ["85B4", "85B5", "85B6", "85B7", "85BE", "85BF", "85C0", "85C1"], source: "Moko the Restless" } +3061.7 "Triple Kasumi-giri 3" Ability { id: ["85B4", "85B5", "85B6", "85B7", "85BE", "85BF", "85C0", "85C1"], source: "Moko the Restless" } -3063.8 "--sync--" Ability { id: "(871F|8720)", source: "Moko the Restless" } +3063.8 "--sync--" Ability { id: ["871F", "8720"], source: "Moko the Restless" } 3071.1 "Lateral Slice" Ability { id: "85E3", source: "Moko the Restless" } 3077.2 "--middle--" Ability { id: "85AF", source: "Moko the Restless" } @@ -314,11 +314,11 @@ hideall "--sync--" 3096.0 "Invocation of Vengeance" Ability { id: "85DB", source: "Moko the Restless" } 3108.1 "Fleeting Iai-giri (cast)" Ability { id: "85C2", source: "Moko the Restless" } 3108.3 "--jump--" Ability { id: "85C3", source: "Moko the Restless" } -3110.6 "Fleeting Iai-giri" Ability { id: "(85C4|85C5|85C6)", source: "Moko the Restless" } +3110.6 "Fleeting Iai-giri" Ability { id: ["85C4", "85C5", "85C6"], source: "Moko the Restless" } 3111.7 "Explosion 1" Ability { id: "85D3", source: "Moko the Restless" } -3111.8 "Vengeful Flame/Vengeful Pyre" Ability { id: "(85DC|85DD)", source: "Moko the Restless" } +3111.8 "Vengeful Flame/Vengeful Pyre" Ability { id: ["85DC", "85DD"], source: "Moko the Restless" } 3118.6 "Explosion 2" Ability { id: "85D3", source: "Moko the Restless" } -3119.7 "Vengeful Pyre/Vengeful Flame" Ability { id: "(85DD|85DC)", source: "Moko the Restless" } +3119.7 "Vengeful Pyre/Vengeful Flame" Ability { id: ["85DD", "85DC"], source: "Moko the Restless" } 3127.6 "Kenki Release" Ability { id: "85E0", source: "Moko the Restless" } @@ -326,20 +326,20 @@ hideall "--sync--" 3139.0 "Shadow-twin" Ability { id: "85C7", source: "Moko the Restless" } 3145.1 "Moonless Night" Ability { id: "85DE", source: "Moko the Restless" } -3154.2 "Near Edge/Far Edge 1" Ability { id: "(85D9|85D8)", source: "Moko the Restless" } +3154.2 "Near Edge/Far Edge 1" Ability { id: ["85D9", "85D8"], source: "Moko the Restless" } 3154.2 "Double Iai-giri x2" Ability { id: "85C8", source: "Moko's Shadow" } 3154.2 "Clearout x3" Ability { id: "8C21", source: "Oni's Claw" } 3154.2 "--jump--" Ability { id: "85C9", source: "Moko's Shadow" } 3156.9 "Shadow Kasumi-giri 1" Ability { id: "85CA", source: "Moko's Shadow" } -3160.0 "Shadow Kasumi-giri 2" Ability { id: "(86C4|86C5|86C6)", source: "Moko's Shadow" } +3160.0 "Shadow Kasumi-giri 2" Ability { id: ["86C4", "86C5", "86C6"], source: "Moko's Shadow" } 3165.4 "Moonless Night" Ability { id: "85DE", source: "Moko the Restless" } -3174.5 "Far Edge/Near Edge 2" Ability { id: "(85D8|85D9)", source: "Moko the Restless" } +3174.5 "Far Edge/Near Edge 2" Ability { id: ["85D8", "85D9"], source: "Moko the Restless" } 3174.5 "Double Iai-giri x2" Ability { id: "85C8", source: "Moko's Shadow" } 3174.5 "Clearout x3" Ability { id: "8C21", source: "Oni's Claw" } 3174.7 "--jump--" Ability { id: "85C9", source: "Moko's Shadow" } 3176.8 "Shadow Kasumi-giri 1" Ability { id: "85CA", source: "Moko's Shadow" } -3179.8 "Shadow Kasumi-giri 2" Ability { id: "(86C4|86C5|86C6)", source: "Moko's Shadow" } +3179.8 "Shadow Kasumi-giri 2" Ability { id: ["86C4", "86C5", "86C6"], source: "Moko's Shadow" } 3187.1 "Kenki Release" Ability { id: "85E0", source: "Moko the Restless" } @@ -351,12 +351,12 @@ hideall "--sync--" 3224.8 "Upwell 3" Ability { id: "85D6", source: "Moko the Restless" } 3225.2 "--middle--" Ability { id: "85AF", source: "Moko the Restless" } 3227.8 "Upwell 4" Ability { id: "85D6", source: "Moko the Restless" } -3238.7 "Triple Kasumi-giri 1" Ability { id: "(85B0|85B1|85B2|85B3|85BA|85BB|85BC|85BD)", source: "Moko the Restless" } -3241.7 "Triple Kasumi-giri 2" Ability { id: "(85B4|85B5|85B6|85B7|85BE|85BF|85C0|85C1)", source: "Moko the Restless" } -3244.7 "Triple Kasumi-giri 3" Ability { id: "(85B4|85B5|85B6|85B7|85BE|85BF|85C0|85C1)", source: "Moko the Restless" } +3238.7 "Triple Kasumi-giri 1" Ability { id: ["85B0", "85B1", "85B2", "85B3", "85BA", "85BB", "85BC", "85BD"], source: "Moko the Restless" } +3241.7 "Triple Kasumi-giri 2" Ability { id: ["85B4", "85B5", "85B6", "85B7", "85BE", "85BF", "85C0", "85C1"], source: "Moko the Restless" } +3244.7 "Triple Kasumi-giri 3" Ability { id: ["85B4", "85B5", "85B6", "85B7", "85BE", "85BF", "85C0", "85C1"], source: "Moko the Restless" } 3251.8 "Kenki Release" Ability { id: "85E0", source: "Moko the Restless" } -3254.9 "--sync--" Ability { id: "(871F|8720)", source: "Moko the Restless" } +3254.9 "--sync--" Ability { id: ["871F", "8720"], source: "Moko the Restless" } 3260.0 "--middle--" Ability { id: "85AF", source: "Moko the Restless" } 3264.1 "Soldiers of Death" Ability { id: "8593", source: "Moko the Restless" } 3270.2 "Shadow-twin" Ability { id: "85C7", source: "Moko the Restless" } @@ -365,16 +365,16 @@ hideall "--sync--" 3285.9 "Iron Storm" Ability { id: "85D0", source: "Ashigaru Kyuhei" } 3285.9 "Iron Rain" Ability { id: "85CF", source: "Ashigaru Kyuhei" } 3288.3 "Shadow Kasumi-giri 1" Ability { id: "85CA", source: "Moko's Shadow" } -3291.3 "Shadow Kasumi-giri 2" Ability { id: "(86C4|86C6)", source: "Moko's Shadow" } +3291.3 "Shadow Kasumi-giri 2" Ability { id: ["86C4", "86C6"], source: "Moko's Shadow" } 3291.7 "Iron Storm" Ability { id: "87A8", source: "Ashigaru Kyuhei" } 3291.7 "Iron Rain" Ability { id: "87A7", source: "Ashigaru Kyuhei" } 3291.8 "--middle--" Ability { id: "85AF", source: "Moko the Restless" } -3305.1 "Triple Kasumi-giri 1" Ability { id: "(85B0|85B1|85B2|85B3|85BA|85BB|85BC|85BD)", source: "Moko the Restless" } -3308.2 "Triple Kasumi-giri 2" Ability { id: "(85B4|85B5|85B6|85B7|85BE|85BF|85C0|85C1)", source: "Moko the Restless" } -3311.3 "Triple Kasumi-giri 3" Ability { id: "(85B4|85B5|85B6|85B7|85BE|85BF|85C0|85C1)", source: "Moko the Restless" } +3305.1 "Triple Kasumi-giri 1" Ability { id: ["85B0", "85B1", "85B2", "85B3", "85BA", "85BB", "85BC", "85BD"], source: "Moko the Restless" } +3308.2 "Triple Kasumi-giri 2" Ability { id: ["85B4", "85B5", "85B6", "85B7", "85BE", "85BF", "85C0", "85C1"], source: "Moko the Restless" } +3311.3 "Triple Kasumi-giri 3" Ability { id: ["85B4", "85B5", "85B6", "85B7", "85BE", "85BF", "85C0", "85C1"], source: "Moko the Restless" } 3318.3 "Kenki Release" Ability { id: "85E0", source: "Moko the Restless" } -3321.4 "--sync--" Ability { id: "(871F|8720)", source: "Moko the Restless" } +3321.4 "--sync--" Ability { id: ["871F", "8720"], source: "Moko the Restless" } 3328.8 "Lateral Slice" Ability { id: "85E3", source: "Moko the Restless" } 3336.8 "Kenki Release" Ability { id: "85E0", source: "Moko the Restless" } diff --git a/ui/raidboss/data/06-ew/dungeon/another_sildihn_subterrane-savage.txt b/ui/raidboss/data/06-ew/dungeon/another_sildihn_subterrane-savage.txt index 4436f990df..2a6f3333ba 100644 --- a/ui/raidboss/data/06-ew/dungeon/another_sildihn_subterrane-savage.txt +++ b/ui/raidboss/data/06-ew/dungeon/another_sildihn_subterrane-savage.txt @@ -28,21 +28,21 @@ hideall "--sync--" 38.4 "Fresh Puff 1" Ability { id: "7789", source: "Silkie" } 43.5 "Bracing Suds" Ability { id: "777A", source: "Silkie" } -50.1 "--sync--" Ability { id: "(7774|7775)", source: "Silkie" } +50.1 "--sync--" Ability { id: ["7774", "7775"], source: "Silkie" } 51.6 "Squeaky Clean" Ability { id: "7776", source: "Silkie" } duration 3.2 53.3 "--sync--" Ability { id: "7777", source: "Silkie" } -54.8 "--sync--" Ability { id: "(7778|7779)", source: "Silkie" } +54.8 "--sync--" Ability { id: ["7778", "7779"], source: "Silkie" } 61.9 "Chilling Suds" Ability { id: "777B", source: "Silkie" } 64.0 "--sync--" Ability { id: "79FB", source: "Silkie" } 69.0 "Slippery Soap" Ability { id: "7781", source: "Silkie" } 73.0 "Chilling Duster" Ability { id: "7786", source: "Silkie" } 80.6 "Carpet Beater" Ability { id: "7772", source: "Silkie" } 89.7 "Soaping Spree" Ability { id: "778A", source: "Silkie" } -89.7 "Chilling Duster / Fizzling Duster" #Ability { id: "(778B|778D)", source: "Silken Puff" } +89.7 "Chilling Duster / Fizzling Duster" #Ability { id: ["778B", "778D"], source: "Silken Puff" } 89.7 "Bracing Duster" #Ability { id: "778C", source: "Silken Puff" } 89.7 "Chilling Duster" #Ability { id: "778B", source: "Silken Puff" } 100.9 "Total Wash 1" Ability { id: "7773", source: "Silkie" } -106.0 "Bracing Suds / Chilling Suds" Ability { id: "(777A|777B)", source: "Silkie" } +106.0 "Bracing Suds / Chilling Suds" Ability { id: ["777A", "777B"], source: "Silkie" } 112.1 "Fresh Puff 2" Ability { id: "7789", source: "Silkie" } 116.3 "--middle--" @@ -50,18 +50,18 @@ hideall "--sync--" 129.5 "Soaping Spree" Ability { id: "778A", source: "Silkie" } 129.5 "Fizzling Duster x2" #Ability { id: "778D", source: "Silken Puff" } 129.5 "Chilling Duster x2" #Ability { id: "778B", source: "Silken Puff" } -129.5 "Bracing Duster / Chilling Duster" #Ability { id: "(778C|778B)", source: "Silkie" } -134.6 "Bracing Suds / Fizzling Suds" Ability { id: "(777A|777C)", source: "Silkie" } +129.5 "Bracing Duster / Chilling Duster" #Ability { id: ["778C", "778B"], source: "Silkie" } +134.6 "Bracing Suds / Fizzling Suds" Ability { id: ["777A", "777C"], source: "Silkie" } 136.7 "--sync--" Ability { id: "79FB", source: "Silkie" } 141.7 "Slippery Soap" Ability { id: "7781", source: "Silkie" } -145.7 "Bracing Duster / Fizzling Duster" Ability { id: "(7787|7788)", source: "Silkie" } +145.7 "Bracing Duster / Fizzling Duster" Ability { id: ["7787", "7788"], source: "Silkie" } 160.1 "Total Wash 2" Ability { id: "7773", source: "Silkie" } 166.2 "Fresh Puff 3" Ability { id: "7789", source: "Silkie" } 172.3 "Eastern Ewers" Ability { id: "7790", source: "Silkie" } 178.6 "Rinse" Ability { id: "7792", source: "Eastern Ewer" } duration 7.3 188.1 "Soaping Spree" Ability { id: "778A", source: "Silkie" } -188.1 "Bracing Duster / Chilling Duster / Fizzling Duster" #Ability { id: "(778C|778B|778D)", source: "Silken Puff" } +188.1 "Bracing Duster / Chilling Duster / Fizzling Duster" #Ability { id: ["778C", "778B", "778D"], source: "Silken Puff" } 188.1 "Fizzling Duster" #Ability { id: "778D", source: "Silken Puff" } 195.2 "Chilling Suds" Ability { id: "777B", source: "Silkie" } 202.3 "Carpet Beater" Ability { id: "7772", source: "Silkie" } @@ -77,23 +77,23 @@ hideall "--sync--" 249.6 "Bracing Suds" Ability { id: "777A", source: "Silkie" } 255.7 "Fresh Puff 4" Ability { id: "7789", source: "Silkie" } -262.3 "--sync--" Ability { id: "(7774|7775)", source: "Silkie" } +262.3 "--sync--" Ability { id: ["7774", "7775"], source: "Silkie" } 263.8 "Squeaky Clean" Ability { id: "7776", source: "Silkie" } duration 3.2 265.5 "--sync--" Ability { id: "7777", source: "Silkie" } 266.9 "Puff and Tumble x4" duration 0.7 #Ability { id: "7794", source: "Silken Puff" } -266.9 "--sync--" Ability { id: "(7778|7779)", source: "Silkie" } +266.9 "--sync--" Ability { id: ["7778", "7779"], source: "Silkie" } 276.0 "Soaping Spree" Ability { id: "778A", source: "Silkie" } 276.0 "Chilling Duster x4" #Ability { id: "778B", source: "Silken Puff" } 276.0 "Bracing Duster" #Ability { id: "778C", source: "Silkie" } 283.1 "Total Wash 3" Ability { id: "7773", source: "Silkie" } -292.3 "Bracing Suds / Chilling Suds / Fizzling Suds" Ability { id: "(777A|777B|777C)", source: "Silkie" } +292.3 "Bracing Suds / Chilling Suds / Fizzling Suds" Ability { id: ["777A", "777B", "777C"], source: "Silkie" } 294.4 "--sync--" Ability { id: "79FB", source: "Silkie" } 299.4 "Slippery Soap" Ability { id: "7781", source: "Silkie" } -303.5 "Bracing Duster / Chilling Duster / Fizzling Duster" Ability { id: "(7787|7786|7788)", source: "Silkie" } -309.0 "Bracing Suds / Chilling Suds / Fizzling Suds" Ability { id: "(777A|777B|777C)", source: "Silkie" } +303.5 "Bracing Duster / Chilling Duster / Fizzling Duster" Ability { id: ["7787", "7786", "7788"], source: "Silkie" } +309.0 "Bracing Suds / Chilling Suds / Fizzling Suds" Ability { id: ["777A", "777B", "777C"], source: "Silkie" } 311.1 "--sync--" Ability { id: "79FB", source: "Silkie" } 316.1 "Slippery Soap" Ability { id: "7781", source: "Silkie" } -320.0 "Bracing Duster / Chilling Duster / Fizzling Duster" Ability { id: "(7787|7786|7788)", source: "Silkie" } +320.0 "Bracing Duster / Chilling Duster / Fizzling Duster" Ability { id: ["7787", "7786", "7788"], source: "Silkie" } 322.9 "--sync--" StartsUsing { id: "79E1", source: "Silkie" } window 15,5 332.9 "Total Wash (enrage)" Ability { id: "79E1", source: "Silkie" } @@ -131,13 +131,13 @@ hideall "--sync--" 1141.7 "Wrath of Ruin" Ability { id: "77A5", source: "Gladiator of Sil'dih" } 1150.7 "Gold Flame x4" Ability { id: "77B1", source: "Hateful Visage" } 1150.7 "Silver Flame x4" #Ability { id: "77B2", source: "Hateful Visage" } -1152.3 "Nothing beside Remains" Ability { id: "(768B|77BC)", source: "Gladiator of Sil'dih" } +1152.3 "Nothing beside Remains" Ability { id: ["768B", "77BC"], source: "Gladiator of Sil'dih" } 1161.4 "Flash of Steel" Ability { id: "77B3", source: "Gladiator of Sil'dih" } 1171.6 "Accursed Visage" Ability { id: "77BE", source: "Gladiator of Sil'dih" } 1176.7 "Wrath of Ruin" Ability { id: "77A5", source: "Gladiator of Sil'dih" } 1185.7 "Gold Flame x4" Ability { id: "77B1", source: "Hateful Visage" } 1185.7 "Silver Flame x4" #Ability { id: "77B2", source: "Hateful Visage" } -1187.3 "Nothing beside Remains" Ability { id: "(768B|77BC)", source: "Gladiator of Sil'dih" } +1187.3 "Nothing beside Remains" Ability { id: ["768B", "77BC"], source: "Gladiator of Sil'dih" } 1196.4 "Flash of Steel" Ability { id: "77B3", source: "Gladiator of Sil'dih" } 1206.6 "--middle--" Ability { id: "7639", source: "Gladiator of Sil'dih" } diff --git a/ui/raidboss/data/06-ew/dungeon/another_sildihn_subterrane.txt b/ui/raidboss/data/06-ew/dungeon/another_sildihn_subterrane.txt index d1da153ca1..bdbda23ca4 100644 --- a/ui/raidboss/data/06-ew/dungeon/another_sildihn_subterrane.txt +++ b/ui/raidboss/data/06-ew/dungeon/another_sildihn_subterrane.txt @@ -23,21 +23,21 @@ hideall "--sync--" 38.4 "Fresh Puff 1" Ability { id: "7766", source: "Silkie" } 43.5 "Bracing Suds" Ability { id: "7757", source: "Silkie" } -50.1 "--sync--" Ability { id: "(7751|7752)", source: "Silkie" } +50.1 "--sync--" Ability { id: ["7751", "7752"], source: "Silkie" } 51.6 "Squeaky Clean" Ability { id: "7753", source: "Silkie" } duration 3.2 53.3 "--sync--" Ability { id: "7754", source: "Silkie" } -54.8 "--sync--" Ability { id: "(7755|7756)", source: "Silkie" } +54.8 "--sync--" Ability { id: ["7755", "7756"], source: "Silkie" } 61.9 "Chilling Suds" Ability { id: "7758", source: "Silkie" } 64.0 "--sync--" Ability { id: "79FB", source: "Silkie" } 69.0 "Slippery Soap" Ability { id: "775E", source: "Silkie" } 73.0 "Chilling Duster" Ability { id: "7763", source: "Silkie" } 80.6 "Carpet Beater" Ability { id: "774F", source: "Silkie" } 89.7 "Soaping Spree" Ability { id: "7767", source: "Silkie" } -89.7 "Chilling Duster / Fizzling Duster" #Ability { id: "(7768|776A)", source: "Silken Puff" } +89.7 "Chilling Duster / Fizzling Duster" #Ability { id: ["7768", "776A"], source: "Silken Puff" } 89.7 "Bracing Duster" #Ability { id: "7769", source: "Silken Puff" } 89.7 "Chilling Duster" #Ability { id: "7768", source: "Silken Puff" } 100.9 "Total Wash 1" Ability { id: "7750", source: "Silkie" } -106.0 "Bracing Suds / Chilling Suds" Ability { id: "(7757|7758)", source: "Silkie" } +106.0 "Bracing Suds / Chilling Suds" Ability { id: ["7757", "7758"], source: "Silkie" } 112.1 "Fresh Puff 2" Ability { id: "7766", source: "Silkie" } 116.3 "--middle--" @@ -45,18 +45,18 @@ hideall "--sync--" 129.5 "Soaping Spree" Ability { id: "7767", source: "Silkie" } 129.5 "Fizzling Duster x2" #Ability { id: "776A", source: "Silken Puff" } 129.5 "Chilling Duster x2" #Ability { id: "7768", source: "Silken Puff" } -129.5 "Bracing Duster / Chilling Duster" #Ability { id: "(7769|7768)", source: "Silkie" } -134.6 "Bracing Suds / Fizzling Suds" Ability { id: "(7757|7759)", source: "Silkie" } +129.5 "Bracing Duster / Chilling Duster" #Ability { id: ["7769", "7768"], source: "Silkie" } +134.6 "Bracing Suds / Fizzling Suds" Ability { id: ["7757", "7759"], source: "Silkie" } 136.7 "--sync--" Ability { id: "79FB", source: "Silkie" } 141.7 "Slippery Soap" Ability { id: "775E", source: "Silkie" } -145.7 "Bracing Duster / Fizzling Duster" Ability { id: "(7764|7765)", source: "Silkie" } +145.7 "Bracing Duster / Fizzling Duster" Ability { id: ["7764", "7765"], source: "Silkie" } 160.1 "Total Wash 2" Ability { id: "7750", source: "Silkie" } 166.2 "Fresh Puff 3" Ability { id: "7766", source: "Silkie" } 172.3 "Eastern Ewers" Ability { id: "776D", source: "Silkie" } 178.6 "Rinse" Ability { id: "776F", source: "Eastern Ewer" } duration 7.3 188.1 "Soaping Spree" Ability { id: "7767", source: "Silkie" } -188.1 "Bracing Duster / Chilling Duster / Fizzling Duster" #Ability { id: "(7769|7768|776A)", source: "Silken Puff" } +188.1 "Bracing Duster / Chilling Duster / Fizzling Duster" #Ability { id: ["7769", "7768", "776A"], source: "Silken Puff" } 188.1 "Fizzling Duster" #Ability { id: "776A", source: "Silken Puff" } 195.2 "Chilling Suds" Ability { id: "7758", source: "Silkie" } 202.3 "Carpet Beater" Ability { id: "774F", source: "Silkie" } @@ -72,23 +72,23 @@ hideall "--sync--" 249.6 "Bracing Suds" Ability { id: "7757", source: "Silkie" } 255.7 "Fresh Puff 4" Ability { id: "7766", source: "Silkie" } -262.3 "--sync--" Ability { id: "(7751|7752)", source: "Silkie" } +262.3 "--sync--" Ability { id: ["7751", "7752"], source: "Silkie" } 263.8 "Squeaky Clean" Ability { id: "7753", source: "Silkie" } duration 3.2 265.5 "--sync--" Ability { id: "7754", source: "Silkie" } 266.9 "Puff and Tumble x4" duration 0.7 #Ability { id: "7771", source: "Silken Puff" } -266.9 "--sync--" Ability { id: "(7755|7756)", source: "Silkie" } +266.9 "--sync--" Ability { id: ["7755", "7756"], source: "Silkie" } 276.0 "Soaping Spree" Ability { id: "7767", source: "Silkie" } 276.0 "Chilling Duster x4" #Ability { id: "7768", source: "Silken Puff" } 276.0 "Bracing Duster" #Ability { id: "7769", source: "Silkie" } 283.1 "Total Wash 3" Ability { id: "7750", source: "Silkie" } -292.3 "Bracing Suds / Chilling Suds / Fizzling Suds" Ability { id: "(7757|7758|7759)", source: "Silkie" } +292.3 "Bracing Suds / Chilling Suds / Fizzling Suds" Ability { id: ["7757", "7758", "7759"], source: "Silkie" } 294.4 "--sync--" Ability { id: "79FB", source: "Silkie" } 299.4 "Slippery Soap" Ability { id: "775E", source: "Silkie" } -303.5 "Bracing Duster / Chilling Duster / Fizzling Duster" Ability { id: "(7764|7763|7765)", source: "Silkie" } -309.0 "Bracing Suds / Chilling Suds / Fizzling Suds" Ability { id: "(7757|7758|7759)", source: "Silkie" } +303.5 "Bracing Duster / Chilling Duster / Fizzling Duster" Ability { id: ["7764", "7763", "7765"], source: "Silkie" } +309.0 "Bracing Suds / Chilling Suds / Fizzling Suds" Ability { id: ["7757", "7758", "7759"], source: "Silkie" } 311.1 "--sync--" Ability { id: "79FB", source: "Silkie" } 316.1 "Slippery Soap" Ability { id: "775E", source: "Silkie" } -320.0 "Bracing Duster / Chilling Duster / Fizzling Duster" Ability { id: "(7764|7763|7765)", source: "Silkie" } +320.0 "Bracing Duster / Chilling Duster / Fizzling Duster" Ability { id: ["7764", "7763", "7765"], source: "Silkie" } 322.9 "--sync--" StartsUsing { id: "79E0", source: "Silkie" } window 15,5 332.9 "Total Wash (enrage)" Ability { id: "79E0", source: "Silkie" } @@ -126,13 +126,13 @@ hideall "--sync--" 1141.7 "Wrath of Ruin" Ability { id: "7663", source: "Gladiator of Sil'dih" } 1150.7 "Gold Flame x4" Ability { id: "766F", source: "Hateful Visage" } 1150.7 "Silver Flame x4" #Ability { id: "7670", source: "Hateful Visage" } -1152.3 "Nothing beside Remains" Ability { id: "(768B|768C)", source: "Gladiator of Sil'dih" } +1152.3 "Nothing beside Remains" Ability { id: ["768B", "768C"], source: "Gladiator of Sil'dih" } 1161.4 "Flash of Steel" Ability { id: "7671", source: "Gladiator of Sil'dih" } 1171.6 "Accursed Visage" Ability { id: "768D", source: "Gladiator of Sil'dih" } 1176.7 "Wrath of Ruin" Ability { id: "7663", source: "Gladiator of Sil'dih" } 1185.7 "Gold Flame x4" Ability { id: "766F", source: "Hateful Visage" } 1185.7 "Silver Flame x4" #Ability { id: "7670", source: "Hateful Visage" } -1187.3 "Nothing beside Remains" Ability { id: "(768B|768C)", source: "Gladiator of Sil'dih" } +1187.3 "Nothing beside Remains" Ability { id: ["768B", "768C"], source: "Gladiator of Sil'dih" } 1196.4 "Flash of Steel" Ability { id: "7671", source: "Gladiator of Sil'dih" } 1206.6 "--middle--" Ability { id: "7639", source: "Gladiator of Sil'dih" } diff --git a/ui/raidboss/data/06-ew/dungeon/ktisis_hyperboreia.txt b/ui/raidboss/data/06-ew/dungeon/ktisis_hyperboreia.txt index ab8fe9f746..49f88ed5a4 100644 --- a/ui/raidboss/data/06-ew/dungeon/ktisis_hyperboreia.txt +++ b/ui/raidboss/data/06-ew/dungeon/ktisis_hyperboreia.txt @@ -61,7 +61,7 @@ hideall "--sync--" # -ii 368 653B -# "Pyric Breath" Ability { id: "(6486|6487|6488|6489|648A|648B)", source: "Ladon Lord" } +# "Pyric Breath" Ability { id: ["6486", "6487", "6488", "6489", "648A", "648B"], source: "Ladon Lord" } # Concept Review will be sealed off 1000.0 "--sync--" SystemLogMessage { id: "7DC", param1: "EB7" } window 1000,5 @@ -73,8 +73,8 @@ hideall "--sync--" 1045.3 "Inhale" Ability { id: "6484", source: "Ladon Lord" } 1051.6 "--sync--" Ability { id: "6485", source: "Ladon Lord" } 1053.1 "--rotate--" -1060.1 "Pyric Breath #1" #Ability { id: "(6486|6487|6488|6489|648A|648B)", source: "Ladon Lord" } -1062.2 "Pyric Breath #2" #Ability { id: "(6486|6487|6488|6489|648A|648B)", source: "Ladon Lord" } +1060.1 "Pyric Breath #1" #Ability { id: ["6486", "6487", "6488", "6489", "648A", "648B"], source: "Ladon Lord" } +1062.2 "Pyric Breath #2" #Ability { id: ["6486", "6487", "6488", "6489", "648A", "648B"], source: "Ladon Lord" } 1067.3 "--sync--" Ability { id: "648C", source: "Ladon Lord" } # Rotation block. @@ -86,8 +86,8 @@ hideall "--sync--" 1079.8 "--sync--" Ability { id: "6485", source: "Ladon Lord" } 1081.9 "--rotate--" 1082.5 "Pyric Sphere" Ability { id: "6491", source: "Pyric Sphere" } -1088.9 "Pyric Breath #1" #Ability { id: "(6486|6487|6488|6489|648A|648B)", source: "Ladon Lord" } -1091.0 "Pyric Breath #2" #Ability { id: "(6486|6487|6488|6489|648A|648B)", source: "Ladon Lord" } +1088.9 "Pyric Breath #1" #Ability { id: ["6486", "6487", "6488", "6489", "648A", "648B"], source: "Ladon Lord" } +1091.0 "Pyric Breath #2" #Ability { id: ["6486", "6487", "6488", "6489", "648A", "648B"], source: "Ladon Lord" } 1099.1 "Intimidation" Ability { id: "648D", source: "Ladon Lord" } 1105.3 "--sync--" Ability { id: "648C", source: "Ladon Lord" } 1110.4 "Inhale" Ability { id: "6484", source: "Ladon Lord" } window 30,30 @@ -96,8 +96,8 @@ hideall "--sync--" 1122.9 "Pyric Blast" Ability { id: "648E", source: "Ladon Lord" } window 10,10 1126.2 "--sync--" Ability { id: "6485", source: "Ladon Lord" } 1128.0 "--rotate--" -1135.0 "Pyric Breath #1" #Ability { id: "(6486|6487|6488|6489|648A|648B)", source: "Ladon Lord" } -1137.1 "Pyric Breath #2" #Ability { id: "(6486|6487|6488|6489|648A|648B)", source: "Ladon Lord" } +1135.0 "Pyric Breath #1" #Ability { id: ["6486", "6487", "6488", "6489", "648A", "648B"], source: "Ladon Lord" } +1137.1 "Pyric Breath #2" #Ability { id: ["6486", "6487", "6488", "6489", "648A", "648B"], source: "Ladon Lord" } 1146.3 "Scratch" Ability { id: "648F", source: "Ladon Lord" } 1151.4 "--sync--" Ability { id: "648C", source: "Ladon Lord" } window 30,30 @@ -123,7 +123,7 @@ hideall "--sync--" 2029.7 "True Aero IV" Ability { id: "6521", source: "Karukeion" } 2038.4 "True Tornado" Ability { id: "652E", source: "Hermes" } 2038.5 "--sync--" Ability { id: "652F", source: "Hermes" } # True Tornado -2038.5 "--sync--" Ability { id: "(6530|6531)", source: "Hermes" } # True Tornado +2038.5 "--sync--" Ability { id: ["6530", "6531"], source: "Hermes" } # True Tornado 2046.6 "Meteor" Ability { id: "6522", source: "Hermes" } window 2046.6,30 2054.7 "Cosmic Kiss" Ability { id: "6523", source: "Meteor" } @@ -145,11 +145,11 @@ hideall "--sync--" 2137.9 "True Aero IV #3" Ability { id: "6CBD", source: "Karukeion" } 2140.7 "Double" Ability { id: "6524", source: "Hermes" } window 30,10 2140.9 "True Aero IV #4" Ability { id: "6CBD", source: "Karukeion" } -2147.8 "True Aero II #1" Ability { id: "(6528|6529)", source: "Hermes" } +2147.8 "True Aero II #1" Ability { id: ["6528", "6529"], source: "Hermes" } 2152.3 "True Aero II #2" Ability { id: "652A", source: "Hermes" } 2160.0 "Double" Ability { id: "6524", source: "Hermes" } 2167.2 "True Tornado" Ability { id: "652E", source: "Hermes" } window 30,30 -2167.3 "--sync--" Ability { id: "(6530|6531)", source: "Hermes" } # True Tornado +2167.3 "--sync--" Ability { id: ["6530", "6531"], source: "Hermes" } # True Tornado 2170.9 "--sync--" Ability { id: "6532", source: "Hermes" } # True Tornado 2186.5 "Trismegistos" Ability { id: "651E", source: "Hermes" } 2194.7 "Trismegistos" Ability { id: "651E", source: "Hermes" } diff --git a/ui/raidboss/data/06-ew/dungeon/lapis_manalis.txt b/ui/raidboss/data/06-ew/dungeon/lapis_manalis.txt index 737b50a035..31429ef611 100644 --- a/ui/raidboss/data/06-ew/dungeon/lapis_manalis.txt +++ b/ui/raidboss/data/06-ew/dungeon/lapis_manalis.txt @@ -21,11 +21,11 @@ hideall "--sync--" 26.9 "Wildlife Crossing 2" MapEffect { flags: "00020001" } window 5,5 duration 15 41.4 "Albion's Embrace" Ability { id: "7A85", source: "Albion" } 48.4 "--sync--" Ability { id: "802C", source: "Albion" } -55.1 "Left Slam/Right Slam" Ability { id: "(802E|802D)", source: "Albion" } +55.1 "Left Slam/Right Slam" Ability { id: ["802E", "802D"], source: "Albion" } 65.7 "Knock on Ice" Ability { id: "7A7F", source: "Albion" } 72.0 "Icebreaker" Ability { id: "7A81", source: "Albion" } 75.0 "--sync--" Ability { id: "7A82", source: "Albion" } -81.2 "Icy Throes" Ability { id: "(800F|7A83)", source: "Albion" } +81.2 "Icy Throes" Ability { id: ["800F", "7A83"], source: "Albion" } 81.6 "--sync--" Ability { id: "802C", source: "Albion" } 86.2 "Icy Throes" Ability { id: "7FB9", source: "Albion" } @@ -33,15 +33,15 @@ hideall "--sync--" 103.3 "Call of the Mountain" Ability { id: "7A7C", source: "Albion" } 106.1 "Wildlife Crossing 1" MapEffect { flags: "00020001" } window 5,5 duration 15 108.7 "--sync--" Ability { id: "802C", source: "Albion" } -115.5 "Left Slam/Right Slam" Ability { id: "(802E|802D)", source: "Albion" } +115.5 "Left Slam/Right Slam" Ability { id: ["802E", "802D"], source: "Albion" } 120.0 "Wildlife Crossing 2" MapEffect { flags: "00020001" } window 5,5 duration 15 123.9 "--sync--" Ability { id: "802C", source: "Albion" } -130.8 "Left Slam/Right Slam" Ability { id: "(802E|802D)", source: "Albion" } +130.8 "Left Slam/Right Slam" Ability { id: ["802E", "802D"], source: "Albion" } 141.4 "Albion's Embrace" Ability { id: "7A85", source: "Albion" } 151.5 "Knock on Ice" Ability { id: "7A7F", source: "Albion" } 157.6 "Icebreaker" Ability { id: "7A81", source: "Albion" } 160.6 "--sync--" Ability { id: "7A82", source: "Albion" } -166.8 "Icy Throes" Ability { id: "(800F|7A83)", source: "Albion" } +166.8 "Icy Throes" Ability { id: ["800F", "7A83"], source: "Albion" } 167.2 "--sync--" Ability { id: "802C", source: "Albion" } 171.8 "Icy Throes" Ability { id: "7FB9", source: "Albion" } @@ -50,10 +50,10 @@ hideall "--sync--" 188.9 "Call of the Mountain" #Ability { id: "7A7C", source: "Albion" } 191.7 "Wildlife Crossing 1" #MapEffect { flags: "00020001" } window 5,5 duration 15 194.3 "--sync--" #Ability { id: "802C", source: "Albion" } -201.1 "Left Slam/Right Slam" #Ability { id: "(802E|802D)", source: "Albion" } +201.1 "Left Slam/Right Slam" #Ability { id: ["802E", "802D"], source: "Albion" } 205.6 "Wildlife Crossing 2" #MapEffect { flags: "00020001" } window 5,5 duration 15 209.5 "--sync--" #Ability { id: "802C", source: "Albion" } -216.4 "Left Slam/Right Slam" #Ability { id: "(802E|802D)", source: "Albion" } +216.4 "Left Slam/Right Slam" #Ability { id: ["802E", "802D"], source: "Albion" } #~~~~~~~~~~~~~~~# # Galatea Magna # @@ -64,9 +64,9 @@ hideall "--sync--" # Forum Messorum will be sealed off 1000.0 "--sync--" SystemLogMessage { id: "7DC", param1: "10B3" } window 1000,1 1010.2 "--sync--" Ability { id: "7F71", source: "Galatea Magna" } # manually added for early sync -1015.2 "Waxing Cycle/Waning Cycle" Ability { id: "(7A91|7F6E)", source: "Galatea Magna" } +1015.2 "Waxing Cycle/Waning Cycle" Ability { id: ["7A91", "7F6E"], source: "Galatea Magna" } 1016.8 "--sync--" Ability { id: "7F6F", source: "Galatea Magna" } -1017.2 "Waxing Cycle/Waning Cycle" Ability { id: "(7A93|7F70)", source: "Galatea Magna" } +1017.2 "Waxing Cycle/Waning Cycle" Ability { id: ["7A93", "7F70"], source: "Galatea Magna" } 1028.3 "Soul Scythe" Ability { id: "7A9A", source: "Galatea Magna" } 1037.4 "Soul Nebula" Ability { id: "7A9E", source: "Galatea Magna" } 1049.1 "--sync--" Ability { id: "7A9B", source: "Galatea Magna" } @@ -78,9 +78,9 @@ hideall "--sync--" 1075.1 "Burst 3" #Ability { id: "7A97", source: "Galatea Magna" } 1077.1 "Burst 4" #Ability { id: "7A97", source: "Galatea Magna" } 1079.1 "Stony Gaze x4" Ability { id: "7A99", source: "Galatea Magna" } -1091.1 "Waxing Cycle/Waning Cycle" Ability { id: "(7A91|7F6E)", source: "Galatea Magna" } +1091.1 "Waxing Cycle/Waning Cycle" Ability { id: ["7A91", "7F6E"], source: "Galatea Magna" } 1092.7 "--sync--" Ability { id: "7A92", source: "Galatea Magna" } -1093.9 "Waxing Cycle/Waning Cycle" Ability { id: "(7A93|7F70)", source: "Galatea Magna" } +1093.9 "Waxing Cycle/Waning Cycle" Ability { id: ["7A93", "7F70"], source: "Galatea Magna" } 1103.1 "Soul Scythe" Ability { id: "7A9A", source: "Galatea Magna" } 1111.1 "Soul Nebula" Ability { id: "7A9E", source: "Galatea Magna" } 1122.8 "--sync--" Ability { id: "7A9B", source: "Galatea Magna" } @@ -94,9 +94,9 @@ hideall "--sync--" 1151.8 "Burst 3" #Ability { id: "7A97", source: "Galatea Magna" } 1153.8 "Burst 4" #Ability { id: "7A97", source: "Galatea Magna" } 1155.8 "Stony Gaze x4" Ability { id: "7A99", source: "Galatea Magna" } -1162.9 "Waxing Cycle/Waning Cycle" Ability { id: "(7A91|7F6E)", source: "Galatea Magna" } +1162.9 "Waxing Cycle/Waning Cycle" Ability { id: ["7A91", "7F6E"], source: "Galatea Magna" } 1164.5 "--sync--" Ability { id: "7A92", source: "Galatea Magna" } -1165.6 "Waxing Cycle/Waning Cycle" Ability { id: "(7A93|7F70)", source: "Galatea Magna" } +1165.6 "Waxing Cycle/Waning Cycle" Ability { id: ["7A93", "7F70"], source: "Galatea Magna" } 1174.3 "Soul Scythe" Ability { id: "7A9A", source: "Galatea Magna" } 1182.3 "Soul Nebula" Ability { id: "7A9E", source: "Galatea Magna" } 1194.0 "--sync--" Ability { id: "7A9B", source: "Galatea Magna" } @@ -111,9 +111,9 @@ hideall "--sync--" 1225.0 "Burst 4" #Ability { id: "7A97", source: "Galatea Magna" } 1227.0 "Stony Gaze x4" #Ability { id: "7A99", source: "Galatea Magna" } 1232.0 "Dark Harvest" Ability { id: "7A9F", source: "Galatea Magna" } # first time tankbuster is used -1244.1 "Waxing Cycle/Waning Cycle" Ability { id: "(7A91|7F6E)", source: "Galatea Magna" } +1244.1 "Waxing Cycle/Waning Cycle" Ability { id: ["7A91", "7F6E"], source: "Galatea Magna" } 1245.7 "--sync--" Ability { id: "7F6F", source: "Galatea Magna" } -1246.1 "Waxing Cycle/Waning Cycle" Ability { id: "(7A93|7F70)", source: "Galatea Magna" } +1246.1 "Waxing Cycle/Waning Cycle" Ability { id: ["7A93", "7F70"], source: "Galatea Magna" } # loop 1256.0 "Soul Scythe" Ability { id: "7A9A", source: "Galatea Magna" } window 30,30 jump 1174.3 @@ -140,7 +140,7 @@ hideall "--sync--" 2038.0 "Antediluvian 1" Ability { id: "7990", source: "Cagnazzo" } 2042.0 "Antediluvian 2" Ability { id: "7990", source: "Cagnazzo" } 2043.3 "--sync--" Ability { id: "7991", source: "Cagnazzo" } -2044.3 "Body Slam" Ability { id: "(7992|7993)", source: "Cagnazzo" } +2044.3 "Body Slam" Ability { id: ["7992", "7993"], source: "Cagnazzo" } 2046.0 "Antediluvian 3" Ability { id: "7990", source: "Cagnazzo" } 2051.1 "--sync--" Ability { id: "799B", source: "Cagnazzo" } 2060.9 "--sync--" Ability { id: "7FB4", source: "Cagnazzo" } @@ -184,7 +184,7 @@ hideall "--sync--" 2622.3 "Antediluvian 1" Ability { id: "7990", source: "Cagnazzo" } 2626.3 "Antediluvian 2" Ability { id: "7990", source: "Cagnazzo" } 2627.6 "--sync--" Ability { id: "7991", source: "Cagnazzo" } -2628.6 "Body Slam" Ability { id: "(7992|7993)", source: "Cagnazzo" } +2628.6 "Body Slam" Ability { id: ["7992", "7993"], source: "Cagnazzo" } 2630.3 "Antediluvian 3" Ability { id: "7990", source: "Cagnazzo" } 2635.3 "--sync--" Ability { id: "799B", source: "Cagnazzo" } 2642.6 "--sync--" Ability { id: "7986", source: "Cagnazzo" } diff --git a/ui/raidboss/data/06-ew/dungeon/mount_rokkon.txt b/ui/raidboss/data/06-ew/dungeon/mount_rokkon.txt index 08c11fe132..e09ee63857 100644 --- a/ui/raidboss/data/06-ew/dungeon/mount_rokkon.txt +++ b/ui/raidboss/data/06-ew/dungeon/mount_rokkon.txt @@ -187,9 +187,9 @@ hideall "--sync--" 2124.2 "Kenki Release" Ability { id: "85AD", source: "Moko the Restless" } 2131.4 "--middle--" Ability { id: "85AF", source: "Moko the Restless" } 2143.5 "Double Kasumi-giri 1" Ability { id: "858[BCDE]", source: "Moko the Restless" } -2147.1 "Double Kasumi-giri 2" Ability { id: "(858F|859[012])", source: "Moko the Restless" } +2147.1 "Double Kasumi-giri 2" Ability { id: ["858F", "859[012]"], source: "Moko the Restless" } 2160.2 "Double Kasumi-giri 1" Ability { id: "858[BCDE]", source: "Moko the Restless" } -2163.8 "Double Kasumi-giri 2" Ability { id: "(858F|859[012])", source: "Moko the Restless" } +2163.8 "Double Kasumi-giri 2" Ability { id: ["858F", "859[012]"], source: "Moko the Restless" } # => path 01 2169.0 "--sync--" StartsUsing { id: "85A8", source: "Moko the Restless" } window 50,50 jump 2269.0 @@ -211,9 +211,9 @@ hideall "--sync--" # path 01 2231.4 "--middle--" Ability { id: "85AF", source: "Moko the Restless" } 2243.5 "Double Kasumi-giri 1" Ability { id: "858[BCDE]", source: "Moko the Restless" } -2247.1 "Double Kasumi-giri 2" Ability { id: "(858F|859[012])", source: "Moko the Restless" } +2247.1 "Double Kasumi-giri 2" Ability { id: ["858F", "859[012]"], source: "Moko the Restless" } 2260.2 "Double Kasumi-giri 1" Ability { id: "858[BCDE]", source: "Moko the Restless" } -2263.8 "Double Kasumi-giri 2" Ability { id: "(858F|859[012])", source: "Moko the Restless" } +2263.8 "Double Kasumi-giri 2" Ability { id: ["858F", "859[012]"], source: "Moko the Restless" } 2269.0 "--sync--" StartsUsing { id: "85A8", source: "Moko the Restless" } 2272.0 "Untempered Sword" Ability { id: "85A8", source: "Moko the Restless" } @@ -238,7 +238,7 @@ hideall "--sync--" 2356.3 "Upwell 3" Ability { id: "859F", source: "Moko the Restless" } duration 10 2366.7 "--middle--" Ability { id: "85AF", source: "Moko the Restless" } 2378.8 "Double Kasumi-giri 1" Ability { id: "858[BCDE]", source: "Moko the Restless" } -2382.4 "Double Kasumi-giri 2" Ability { id: "(858F|859[012])", source: "Moko the Restless" } +2382.4 "Double Kasumi-giri 2" Ability { id: ["858F", "859[012]"], source: "Moko the Restless" } 2389.5 "Kenki Release" Ability { id: "85AD", source: "Moko the Restless" } 2398.6 "Soldiers of Death" Ability { id: "8593", source: "Moko the Restless" } 2407.3 "Spearman's Orders" Ability { id: "8595", source: "Moko the Restless" } @@ -253,9 +253,9 @@ hideall "--sync--" # path 02 2531.4 "--middle--" Ability { id: "85AF", source: "Moko the Restless" } 2543.5 "Double Kasumi-giri 1" Ability { id: "858[BCDE]", source: "Moko the Restless" } -2547.1 "Double Kasumi-giri 2" Ability { id: "(858F|859[012])", source: "Moko the Restless" } +2547.1 "Double Kasumi-giri 2" Ability { id: ["858F", "859[012]"], source: "Moko the Restless" } 2560.2 "Double Kasumi-giri 1" Ability { id: "858[BCDE]", source: "Moko the Restless" } -2563.8 "Double Kasumi-giri 2" Ability { id: "(858F|859[012])", source: "Moko the Restless" } +2563.8 "Double Kasumi-giri 2" Ability { id: ["858F", "859[012]"], source: "Moko the Restless" } 2569.1 "--sync--" Ability { id: "85AF", source: "Moko the Restless" } 2570.5 "--sync--" StartsUsing { id: "85AB", source: "Moko the Restless" } @@ -275,7 +275,7 @@ hideall "--sync--" 2651.9 "Explosion 3" Ability { id: "859B", source: "Moko the Restless" } 2652.3 "--middle--" Ability { id: "85AF", source: "Moko the Restless" } 2664.5 "Double Kasumi-giri 1" Ability { id: "858[BCDE]", source: "Moko the Restless" } -2668.1 "Double Kasumi-giri 2" Ability { id: "(858F|859[012])", source: "Moko the Restless" } +2668.1 "Double Kasumi-giri 2" Ability { id: ["858F", "859[012]"], source: "Moko the Restless" } 2675.2 "Kenki Release" Ability { id: "85AD", source: "Moko the Restless" } 2684.3 "Soldiers of Death" Ability { id: "8593", source: "Moko the Restless" } 2693.0 "Spearman's Orders" Ability { id: "8595", source: "Moko the Restless" } @@ -290,9 +290,9 @@ hideall "--sync--" # path 03 2831.4 "--middle--" Ability { id: "85AF", source: "Moko the Restless" } 2843.5 "Double Kasumi-giri 1" Ability { id: "858[BCDE]", source: "Moko the Restless" } -2847.1 "Double Kasumi-giri 2" Ability { id: "(858F|859[012])", source: "Moko the Restless" } +2847.1 "Double Kasumi-giri 2" Ability { id: ["858F", "859[012]"], source: "Moko the Restless" } 2860.2 "Double Kasumi-giri 1" Ability { id: "858[BCDE]", source: "Moko the Restless" } -2863.8 "Double Kasumi-giri 2" Ability { id: "(858F|859[012])", source: "Moko the Restless" } +2863.8 "Double Kasumi-giri 2" Ability { id: ["858F", "859[012]"], source: "Moko the Restless" } 2869.0 "--sync--" StartsUsing { id: "85A1", source: "Moko the Restless" } 2872.0 "Tengu-yobi" Ability { id: "85A1", source: "Moko the Restless" } @@ -313,7 +313,7 @@ hideall "--sync--" 2973.8 "--middle--" Ability { id: "85AF", source: "Moko the Restless" } 2985.9 "Double Kasumi-giri 1" Ability { id: "858[BCDE]", source: "Moko the Restless" } -2989.5 "Double Kasumi-giri 2" Ability { id: "(858F|859[012])", source: "Moko the Restless" } +2989.5 "Double Kasumi-giri 2" Ability { id: ["858F", "859[012]"], source: "Moko the Restless" } 2996.6 "Kenki Release" Ability { id: "85AD", source: "Moko the Restless" } 3005.7 "Soldiers of Death" Ability { id: "8593", source: "Moko the Restless" } @@ -329,9 +329,9 @@ hideall "--sync--" # path 04 3131.4 "--middle--" Ability { id: "85AF", source: "Moko the Restless" } 3143.5 "Double Kasumi-giri 1" Ability { id: "858[BCDE]", source: "Moko the Restless" } -3147.1 "Double Kasumi-giri 2" Ability { id: "(858F|859[012])", source: "Moko the Restless" } +3147.1 "Double Kasumi-giri 2" Ability { id: ["858F", "859[012]"], source: "Moko the Restless" } 3160.2 "Double Kasumi-giri 1" Ability { id: "858[BCDE]", source: "Moko the Restless" } -3163.8 "Double Kasumi-giri 2" Ability { id: "(858F|859[012])", source: "Moko the Restless" } +3163.8 "Double Kasumi-giri 2" Ability { id: ["858F", "859[012]"], source: "Moko the Restless" } 3169.0 "--sync--" StartsUsing { id: "85A5", source: "Moko the Restless" } 3172.0 "Spiritspark" Ability { id: "85A5", source: "Moko the Restless" } @@ -353,7 +353,7 @@ hideall "--sync--" 3261.7 "--middle--" Ability { id: "85AF", source: "Moko the Restless" } 3273.9 "Double Kasumi-giri 1" Ability { id: "858[BCDE]", source: "Moko the Restless" } -3277.5 "Double Kasumi-giri 2" Ability { id: "(858F|859[012])", source: "Moko the Restless" } +3277.5 "Double Kasumi-giri 2" Ability { id: ["858F", "859[012]"], source: "Moko the Restless" } 3284.6 "Kenki Release" Ability { id: "85AD", source: "Moko the Restless" } 3293.7 "Soldiers of Death" Ability { id: "8593", source: "Moko the Restless" } 3302.4 "Spearman's Orders" Ability { id: "8595", source: "Moko the Restless" } @@ -642,13 +642,13 @@ hideall "--sync--" 5610.9 "Unenlightenment" Ability { id: "8500", source: "Gorai the Uncaged" } 5620.2 "Flame and Sulphur" Ability { id: "84D7", source: "Gorai the Uncaged" } -5630.5 "Plectrum of Power/Morphic Melody" Ability { id: "(84D8|84D9)", source: "Gorai the Uncaged" } -5633.2 "Falling Rock" Ability { id: "(84DD|84DE)", source: "Gorai the Uncaged" } -5633.2 "Fire Spread" Ability { id: "(84DA|84DB)", source: "Gorai the Uncaged" } +5630.5 "Plectrum of Power/Morphic Melody" Ability { id: ["84D8", "84D9"], source: "Gorai the Uncaged" } +5633.2 "Falling Rock" Ability { id: ["84DD", "84DE"], source: "Gorai the Uncaged" } +5633.2 "Fire Spread" Ability { id: ["84DA", "84DB"], source: "Gorai the Uncaged" } 5641.4 "Flame and Sulphur" Ability { id: "84D7", source: "Gorai the Uncaged" } -5651.7 "Morphic Melody/Plectrum of Power" Ability { id: "(84D9|84D8)", source: "Gorai the Uncaged" } -5654.4 "Falling Rock" Ability { id: "(84DD|84DE)", source: "Gorai the Uncaged" } -5654.4 "Fire Spread" Ability { id: "(84DA|84DB)", source: "Gorai the Uncaged" } +5651.7 "Morphic Melody/Plectrum of Power" Ability { id: ["84D9", "84D8"], source: "Gorai the Uncaged" } +5654.4 "Falling Rock" Ability { id: ["84DD", "84DE"], source: "Gorai the Uncaged" } +5654.4 "Fire Spread" Ability { id: ["84DA", "84DB"], source: "Gorai the Uncaged" } 5664.5 "Torching Torment" Ability { id: "84FE", source: "Gorai the Uncaged" } 5676.8 "Unenlightenment" Ability { id: "8500", source: "Gorai the Uncaged" } @@ -954,7 +954,7 @@ hideall "--sync--" 7768.4 "Smokeater 2?" #Ability { id: "83D9", source: "Shishio" } 7770.4 "Smokeater 3?" #Ability { id: "83D9", source: "Shishio" } # Note: this is +/- 2 seconds depending on how many Smokeaters, so no sync -7773.4 "Thunder Onefold/Thunder Twofold/Thunder Threefold" #Ability { id: "(83E1|87AD|87FA)", source: "Shishio" } +7773.4 "Thunder Onefold/Thunder Twofold/Thunder Threefold" #Ability { id: ["83E1", "87AD", "87FA"], source: "Shishio" } 7798.8 "Splitting Cry" Ability { id: "83F6", source: "Shishio" } 7804.9 "--jump--" Ability { id: "83F7", source: "Shishio" } @@ -1051,8 +1051,8 @@ hideall "--sync--" 8103.7 "--sync--" Ability { id: "804E", source: "Enenra" } 8107.6 "Into the Fire x2" #Ability { id: "804D", source: "Enenra" } 8111.8 "--sync--" Ability { id: "84C2", source: "Enenra" } -8121.6 "--sync--" Ability { id: "(8062|8063)", source: "Enenra" } -8125.0 "Clearing Smoke/Smoke Rings" Ability { id: "(8052|8053)", source: "Enenra" } +8121.6 "--sync--" Ability { id: ["8062", "8063"], source: "Enenra" } +8125.0 "Clearing Smoke/Smoke Rings" Ability { id: ["8052", "8053"], source: "Enenra" } 8130.8 "Smoke Stack" Ability { id: "8046", source: "Enenra" } 8136.3 "--sync--" Ability { id: "84C2", source: "Enenra" } @@ -1074,9 +1074,9 @@ hideall "--sync--" 8195.3 "--sync--" Ability { id: "84C2", source: "Enenra" } 8201.3 "Smoldering 1" #Ability { id: "8050", source: "Enenra" } 8203.9 "Smoldering 2" #Ability { id: "8050", source: "Enenra" } -8205.1 "--sync--" Ability { id: "(8062|8063)", source: "Enenra" } +8205.1 "--sync--" Ability { id: ["8062", "8063"], source: "Enenra" } 8206.3 "Smoldering 3" #Ability { id: "8050", source: "Enenra" } -8208.5 "Clearing Smoke/Smoke Rings" Ability { id: "(8052|8053)", source: "Enenra" } +8208.5 "Clearing Smoke/Smoke Rings" Ability { id: ["8052", "8053"], source: "Enenra" } 8214.3 "Smoke Stack" Ability { id: "8046", source: "Enenra" } 8222.7 "Flagrant Combustion" Ability { id: "8042", source: "Enenra" } diff --git a/ui/raidboss/data/06-ew/dungeon/smileton.txt b/ui/raidboss/data/06-ew/dungeon/smileton.txt index 18a6116f69..2811b11ba3 100644 --- a/ui/raidboss/data/06-ew/dungeon/smileton.txt +++ b/ui/raidboss/data/06-ew/dungeon/smileton.txt @@ -96,7 +96,7 @@ hideall "--sync--" 3060.0 "Excavated" Ability { id: "6C32", source: "Excavation Bomb" } 3064.0 "Explosives Distribution" Ability { id: "674E", source: "The Big Cheese" } -3077.1 "Left Disassembler/Right Disassembler" Ability { id: "(674F|6750)", source: "The Big Cheese" } +3077.1 "Left Disassembler/Right Disassembler" Ability { id: ["674F", "6750"], source: "The Big Cheese" } 3077.1 "Iron Kiss" Ability { id: "674D", source: "Bomb" } 3086.2 "Dispense Explosives" Ability { id: "6C30", source: "The Big Cheese" } 3087.4 "--sync--" Ability { id: "6C34", source: "Excavation Bomb" } @@ -105,7 +105,7 @@ hideall "--sync--" 3108.6 "Electric Arc" Ability { id: "6753", source: "The Big Cheese" } 3121.2 "Iron Kiss" Ability { id: "674D", source: "Bomb" } -3124.7 "Left Disassembler/Right Disassembler" Ability { id: "(674F|6750)", source: "The Big Cheese" } +3124.7 "Left Disassembler/Right Disassembler" Ability { id: ["674F", "6750"], source: "The Big Cheese" } 3137.8 "Iron Kiss" Ability { id: "674D", source: "Bomb" } 3141.9 "Leveling Missile" Ability { id: "6754", source: "The Big Cheese" } 3147.0 "Explosive Power" Ability { id: "6C31", source: "The Big Cheese" } @@ -114,7 +114,7 @@ hideall "--sync--" 3165.3 "Violent Discharge" Ability { id: "6752", source: "The Big Cheese" } 3173.4 "Explosives Distribution" Ability { id: "674E", source: "The Big Cheese" } -3186.5 "Left Disassembler/Right Disassembler" Ability { id: "(674F|6750)", source: "The Big Cheese" } +3186.5 "Left Disassembler/Right Disassembler" Ability { id: ["674F", "6750"], source: "The Big Cheese" } 3186.5 "Iron Kiss" Ability { id: "674D", source: "Bomb" } 3196.6 "Dispense Explosives" Ability { id: "6C30", source: "The Big Cheese" } 3197.8 "--sync--" Ability { id: "6C34", source: "Excavation Bomb" } @@ -124,7 +124,7 @@ hideall "--sync--" 3231.6 "Iron Kiss" Ability { id: "674D", source: "Bomb" } 3234.5 "Excavated" Ability { id: "6C32", source: "Excavation Bomb" } -3235.1 "Left Disassembler/Right Disassembler" Ability { id: "(674F|6750)", source: "The Big Cheese" } window 30,30 jump 3124.7 +3235.1 "Left Disassembler/Right Disassembler" Ability { id: ["674F", "6750"], source: "The Big Cheese" } window 30,30 jump 3124.7 3248.3 "Iron Kiss" #Ability { id: "674D", source: "Bomb" } 3252.3 "Leveling Missile" #Ability { id: "6754", source: "The Big Cheese" } 3257.4 "Explosive Power" #Ability { id: "6C31", source: "The Big Cheese" } diff --git a/ui/raidboss/data/06-ew/dungeon/stigma_dreamscape.txt b/ui/raidboss/data/06-ew/dungeon/stigma_dreamscape.txt index bf2867913c..8326d9d41f 100644 --- a/ui/raidboss/data/06-ew/dungeon/stigma_dreamscape.txt +++ b/ui/raidboss/data/06-ew/dungeon/stigma_dreamscape.txt @@ -13,8 +13,8 @@ hideall "--sync--" # A-4 Command will be sealed off 0.0 "--sync--" SystemLogMessage { id: "7DC", param1: "ECF" } window 0,1 -12.6 "Side Cannons" Ability { id: "(6320|6321)", source: "Proto-Omega" } window 12.6,10 -24.2 "Forward Interceptors/Rear Interceptors" Ability { id: "(6322|6324)", source: "Proto-Omega" } +12.6 "Side Cannons" Ability { id: ["6320", "6321"], source: "Proto-Omega" } window 12.6,10 +24.2 "Forward Interceptors/Rear Interceptors" Ability { id: ["6322", "6324"], source: "Proto-Omega" } 29.3 "Chemical Missile" Ability { id: "6328", source: "Proto-Omega" } 34.4 "Burn" Ability { id: "6329", source: "Proto-Omega" } 40.6 "Electric Slide" Ability { id: "632A", source: "Proto-Omega" } window 30,30 @@ -23,7 +23,7 @@ hideall "--sync--" 65.6 "Iron Kiss" Ability { id: "6327", source: "Mark II Guided Missile" } 73.0 "Electric Slide" Ability { id: "632A", source: "Proto-Omega" } 84.2 "Mustard Bomb" Ability { id: "632B", source: "Proto-Omega" } -96.4 "Side Cannons" Ability { id: "(6320|6321)", source: "Proto-Omega" } window 10,10 +96.4 "Side Cannons" Ability { id: ["6320", "6321"], source: "Proto-Omega" } window 10,10 104.6 "Guided Missile" Ability { id: "6326", source: "Proto-Omega" } 111.7 "Chemical Missile" Ability { id: "6328", source: "Proto-Omega" } 116.8 "Burn" Ability { id: "6329", source: "Proto-Omega" } @@ -88,13 +88,13 @@ hideall "--sync--" 2000.0 "--sync--" SystemLogMessage { id: "7DC", param1: "ED2" } window 2000,1 2010.0 "AI Takeover" Ability { id: "6429", source: "Stigma-4" } 2015.6 "Touchdown?" Ability { id: "68F9", source: "Hybrid Dragon" } -2024.7 "Proto-wave Cannon?" Ability { id: "(642A|642B)", source: "Omega Frame" } +2024.7 "Proto-wave Cannon?" Ability { id: ["642A", "642B"], source: "Omega Frame" } 2024.7 "Fire Breath?" Ability { id: "642E", source: "Hybrid Dragon" } 2031.3 "AI Takeover" Ability { id: "6429", source: "Stigma-4" } 2037.1 "Touchdown?" Ability { id: "68F9", source: "Hybrid Dragon" } 2044.5 "Self-Destruct?" # 14.7s cast time, cast seems to start 5.1s after Breath/Cannon 2046.2 "Fire Breath?" Ability { id: "642E", source: "Hybrid Dragon" } -2046.2 "Proto-wave Cannon?" Ability { id: "(642A|642B)", source: "Omega Frame" } +2046.2 "Proto-wave Cannon?" Ability { id: ["642A", "642B"], source: "Omega Frame" } 2052.6 "AI Takeover" Ability { id: "6429", source: "Stigma-4" } 2061.5 "Rush" Ability { id: "642D", source: "Proto-rocket Punch" } window 30,30 2066.0 "Self-Destruct?" @@ -103,25 +103,25 @@ hideall "--sync--" 2085.1 "--sync--" Ability { id: "6431", source: "Stigma-4" } 2095.1 "Electromagnetic Release" Ability { id: "6432", source: "Stigma-4" } 2108.2 "Mindhack" Ability { id: "6430", source: "Stigma-4" } window 30,30 -2113.4 "--sync--" Ability { id: "(6431|6433)", source: "Stigma-4" } -2123.4 "Electromagnetic Release" Ability { id: "(6432|6434)", source: "Stigma-4" } +2113.4 "--sync--" Ability { id: ["6431", "6433"], source: "Stigma-4" } +2123.4 "Electromagnetic Release" Ability { id: ["6432", "6434"], source: "Stigma-4" } 2132.5 "Atomic Ray" Ability { id: "6436", source: "Stigma-4" } 2142.7 "Multi-AI Takeover" Ability { id: "6C4B", source: "Stigma-4" } 2148.4 "Touchdown?" Ability { id: "68F9", source: "Hybrid Dragon" } 2151.6 "Rush" Ability { id: "642D", source: "Proto-rocket Punch" } window 30,30 2157.5 "Fire Breath?" Ability { id: "642E", source: "Hybrid Dragon" } -2157.5 "Proto-wave Cannon?" Ability { id: "(642A|642B)", source: "Omega Frame" } +2157.5 "Proto-wave Cannon?" Ability { id: ["642A", "642B"], source: "Omega Frame" } # TODO: Still not a loop, more data is needed 2168.1 "Mindhack" Ability { id: "6430", source: "Stigma-4" } window 30,30 -2172.2 "--sync--" Ability { id: "(6431|6433)", source: "Stigma-4" } +2172.2 "--sync--" Ability { id: ["6431", "6433"], source: "Stigma-4" } 2177.3 "Self-Destruct?" -2182.2 "Electromagnetic Release" Ability { id: "(6432|6434)", source: "Stigma-4" } +2182.2 "Electromagnetic Release" Ability { id: ["6432", "6434"], source: "Stigma-4" } 2192.3 "Multi-AI Takeover" Ability { id: "6C4B", source: "Stigma-4" } 2198.0 "Touchdown?" Ability { id: "68F9", source: "Hybrid Dragon" } 2201.1 "Rush" Ability { id: "642D", source: "Proto-rocket Punch" } window 30,30 2207.1 "Fire Breath?" Ability { id: "642E", source: "Hybrid Dragon" } -2207.1 "Proto-wave Cannon?" Ability { id: "(642A|642B)", source: "Omega Frame" } +2207.1 "Proto-wave Cannon?" Ability { id: ["642A", "642B"], source: "Omega Frame" } 2217.6 "Atomic Ray" Ability { id: "6436", source: "Stigma-4" } # ??? diff --git a/ui/raidboss/data/06-ew/dungeon/the_dead_ends.txt b/ui/raidboss/data/06-ew/dungeon/the_dead_ends.txt index 082328b59e..faa5dc78bc 100644 --- a/ui/raidboss/data/06-ew/dungeon/the_dead_ends.txt +++ b/ui/raidboss/data/06-ew/dungeon/the_dead_ends.txt @@ -116,7 +116,7 @@ hideall "Disengage Hatch" 3074.7 "Lamellar Light" Ability { id: "6556", source: "Golden Wings" } 3082.0 "Benevolence" Ability { id: "6559", source: "Ra-la" } -3095.2 "Loving Embrace" Ability { id: "(6557|6558)", source: "Ra-la" } +3095.2 "Loving Embrace" Ability { id: ["6557", "6558"], source: "Ra-la" } 3103.3 "Warm Glow" Ability { id: "655E", source: "Ra-la" } 3117.5 "Prance 1" Ability { id: "6551", source: "Ra-la" } 3119.4 "Prance 2" #Ability { id: "6552", source: "Ra-la" } @@ -131,7 +131,7 @@ hideall "Disengage Hatch" 3143.0 "--jump--" Ability { id: "6555", source: "Ra-la" } 3149.4 "Lifesbreath" Ability { id: "6554", source: "Ra-la" } 3156.4 "Lamellar Light" Ability { id: "6556", source: "Golden Wings" } -3160.6 "Loving Embrace" Ability { id: "(6557|6558)", source: "Ra-la" } +3160.6 "Loving Embrace" Ability { id: ["6557", "6558"], source: "Ra-la" } 3163.8 "--jump--" Ability { id: "6555", source: "Ra-la" } 3170.9 "Benevolence" Ability { id: "6559", source: "Ra-la" } 3183.1 "Warm Glow" Ability { id: "655E", source: "Ra-la" } @@ -150,7 +150,7 @@ hideall "Disengage Hatch" 3244.3 "--jump--" Ability { id: "6555", source: "Ra-la" } 3250.7 "Lifesbreath" Ability { id: "6554", source: "Ra-la" } window 50,50 jump 3149.4 3257.7 "Lamellar Light" #Ability { id: "6556", source: "Golden Wings" } -3261.9 "Loving Embrace" #Ability { id: "(6557|6558)", source: "Ra-la" } +3261.9 "Loving Embrace" #Ability { id: ["6557", "6558"], source: "Ra-la" } 3265.1 "--jump--" #Ability { id: "6555", source: "Ra-la" } 3272.2 "Benevolence" #Ability { id: "6559", source: "Ra-la" } 3284.4 "Warm Glow" #Ability { id: "655E", source: "Ra-la" } diff --git a/ui/raidboss/data/06-ew/dungeon/the_fell_court_of_troia.txt b/ui/raidboss/data/06-ew/dungeon/the_fell_court_of_troia.txt index 73d030490b..c57a54403d 100644 --- a/ui/raidboss/data/06-ew/dungeon/the_fell_court_of_troia.txt +++ b/ui/raidboss/data/06-ew/dungeon/the_fell_court_of_troia.txt @@ -126,9 +126,9 @@ hideall "--sync--" 3098.4 "--untargetable--" 3115.5 "Nox" Ability { id: "7621", source: "Scarmiglione" } # These seem to be adjusted slightly in time based on which order they come in. -3118.5 "Void Gravity/Void Vortex" #Ability { id: "(7622|7623)", source: "Scarmiglione" } +3118.5 "Void Gravity/Void Vortex" #Ability { id: ["7622", "7623"], source: "Scarmiglione" } 3142.1 "Nox" Ability { id: "7621", source: "Scarmiglione" } -3148.1 "Void Vortex/Void Gravity" #Ability { id: "(7623|7622)", source: "Scarmiglione" } +3148.1 "Void Vortex/Void Gravity" #Ability { id: ["7623", "7622"], source: "Scarmiglione" } # natural enrage, if add phase is failed 3191.8 "Corruptor's Pitch" Ability { id: "7625", source: "Scarmiglione" } duration 8 window 200,50 diff --git a/ui/raidboss/data/06-ew/dungeon/the_sildihn_subterrane.txt b/ui/raidboss/data/06-ew/dungeon/the_sildihn_subterrane.txt index 696fc44009..95f7a1c903 100644 --- a/ui/raidboss/data/06-ew/dungeon/the_sildihn_subterrane.txt +++ b/ui/raidboss/data/06-ew/dungeon/the_sildihn_subterrane.txt @@ -60,7 +60,7 @@ hideall "--sync--" 1405.5 "Explosion" Ability { id: "74D[45]", source: "Powder Keg" } 1410.1 "Exploding Catapult" Ability { id: "74C7", source: "Geryon the Steer" } 1413.2 "--sync--" Ability { id: "74C6", source: "Geryon the Steer" } -1421.5 "Colossal Launch / Colossal Swing" Ability { id: "(74C8|74D1)", source: "Geryon the Steer" } # only seen Launch +1421.5 "Colossal Launch / Colossal Swing" Ability { id: ["74C8", "74D1"], source: "Geryon the Steer" } # only seen Launch 1428.1 "Explosion" Ability { id: "74D[45]", source: "Powder Keg" } 1434.9 "Colossal Slam" Ability { id: "74D0", source: "Geryon the Steer" } 1445.3 "Colossal Strike" Ability { id: "74CF", source: "Geryon the Steer" } @@ -123,7 +123,7 @@ hideall "--sync--" 2180.6 "Shockwave" Ability { id: "74CE", source: "Geryon the Steer" } 2190.7 "Exploding Catapult" Ability { id: "74C7", source: "Geryon the Steer" } 2193.8 "--sync--" Ability { id: "74C6", source: "Geryon the Steer" } -2202.0 "Colossal Launch / Colossal Swing" Ability { id: "(74C8|74D1)", source: "Geryon the Steer" } +2202.0 "Colossal Launch / Colossal Swing" Ability { id: ["74C8", "74D1"], source: "Geryon the Steer" } 2208.7 "Explosion" Ability { id: "74D[45]", source: "Powder Keg" } 2215.3 "Colossal Slam" Ability { id: "74D0", source: "Geryon the Steer" } 2225.7 "Colossal Strike" Ability { id: "74CF", source: "Geryon the Steer" } @@ -197,7 +197,7 @@ hideall "--sync--" 3395.0 "Explosion" Ability { id: "74D[45]", source: "Powder Keg" } 3399.6 "Exploding Catapult" Ability { id: "74C7", source: "Geryon the Steer" } 3402.7 "--sync--" Ability { id: "74C6", source: "Geryon the Steer" } -3410.8 "Colossal Launch / Colossal Swing" Ability { id: "(74C8|74D1)", source: "Geryon the Steer" } # only seen Launch +3410.8 "Colossal Launch / Colossal Swing" Ability { id: ["74C8", "74D1"], source: "Geryon the Steer" } # only seen Launch 3417.5 "Explosion" Ability { id: "74D[45]", source: "Powder Keg" } 3424.3 "Colossal Slam" Ability { id: "74D0", source: "Geryon the Steer" } 3433.7 "Colossal Strike" Ability { id: "74CF", source: "Geryon the Steer" } @@ -251,7 +251,7 @@ hideall "--sync--" 4196.6 "Explosion" Ability { id: "74D[45]", source: "Powder Keg" } 4201.1 "Exploding Catapult" Ability { id: "74C7", source: "Geryon the Steer" } 4204.2 "--sync--" Ability { id: "74C6", source: "Geryon the Steer" } -4212.3 "Colossal Launch / Colossal Swing" Ability { id: "(74C8|74D1)", source: "Geryon the Steer" } # only seen Swing +4212.3 "Colossal Launch / Colossal Swing" Ability { id: ["74C8", "74D1"], source: "Geryon the Steer" } # only seen Swing 4218.0 "Explosion" Ability { id: "74D[45]", source: "Powder Keg" } 4224.7 "Colossal Slam" Ability { id: "74D0", source: "Geryon the Steer" } 4234.1 "Colossal Strike" Ability { id: "74CF", source: "Geryon the Steer" } @@ -328,7 +328,7 @@ hideall "--sync--" 5182.3 "Suddenly Sewage 2" #Ability { id: "74D8", source: "Geryon the Steer" } 5190.9 "Exploding Catapult" Ability { id: "74C7", source: "Geryon the Steer" } 5194.0 "--sync--" Ability { id: "74C6", source: "Geryon the Steer" } -5202.4 "Colossal Launch / Colossal Swing" Ability { id: "(74C8|74D1)", source: "Geryon the Steer" } +5202.4 "Colossal Launch / Colossal Swing" Ability { id: ["74C8", "74D1"], source: "Geryon the Steer" } 5209.1 "Explosion" Ability { id: "74D[45]", source: "Powder Keg" } 5215.8 "Colossal Slam" Ability { id: "74D0", source: "Geryon the Steer" } 5225.2 "Colossal Strike" Ability { id: "74CF", source: "Geryon the Steer" } @@ -386,7 +386,7 @@ hideall "--sync--" 6167.7 "Gigantomill 4" #Ability { id: "74CB", source: "Geryon the Steer" } 6176.4 "Exploding Catapult" Ability { id: "74C7", source: "Geryon the Steer" } 6179.5 "--sync--" Ability { id: "74C6", source: "Geryon the Steer" } -6187.7 "Colossal Launch / Colossal Swing" Ability { id: "(74C8|74D1)", source: "Geryon the Steer" } +6187.7 "Colossal Launch / Colossal Swing" Ability { id: ["74C8", "74D1"], source: "Geryon the Steer" } 6194.4 "Explosion" Ability { id: "74D[45]", source: "Powder Keg" } 6201.0 "Colossal Slam" Ability { id: "74D0", source: "Geryon the Steer" } 6210.4 "Colossal Strike" Ability { id: "74CF", source: "Geryon the Steer" } @@ -414,18 +414,18 @@ hideall "--sync--" 7000.0 "--sync--" SystemLogMessage { id: "7DC", param1: "1069" } window 100000,0 7009.3 "--sync--" StartsUsing { id: "772C", source: "Silkie" } window 10,10 7014.3 "Total Wash" Ability { id: "772C", source: "Silkie" } -7022.0 "Squeaky Left/Squeaky Right" Ability { id: "(772E|772D)", source: "Silkie" } +7022.0 "Squeaky Left/Squeaky Right" Ability { id: ["772E", "772D"], source: "Silkie" } 7040.9 "Carpet Beater" Ability { id: "772B", source: "Silkie" } -7051.6 "Squeaky Left/Squeaky Right" Ability { id: "(772E|772D)", source: "Silkie" } +7051.6 "Squeaky Left/Squeaky Right" Ability { id: ["772E", "772D"], source: "Silkie" } 7069.6 "Chilling Suds" Ability { id: "7736", source: "Silkie" } 7076.7 "Soap's Up" Ability { id: "7737", source: "Silkie" } 7077.7 "Chilling Duster" Ability { id: "7738", source: "Silkie" } 7086.8 "Bracing Suds" Ability { id: "7735", source: "Silkie" } 7093.9 "Soap's Up" Ability { id: "7737", source: "Silkie" } 7094.9 "Bracing Duster" Ability { id: "7739", source: "Silkie" } -7104.0 "Bracing Suds / Chilling Suds" Ability { id: "(7735|7736)", source: "Silkie" } +7104.0 "Bracing Suds / Chilling Suds" Ability { id: ["7735", "7736"], source: "Silkie" } 7112.8 "Slippery Soap" Ability { id: "773A", source: "Silkie" } -7116.2 "Bracing Duster / Chilling Duster" Ability { id: "(773B|773C)", source: "Silkie" } +7116.2 "Bracing Duster / Chilling Duster" Ability { id: ["773B", "773C"], source: "Silkie" } 7128.3 "Spot Remover" Ability { id: "7742", source: "Silkie" } 7137.4 "Dust Bluster" Ability { id: "7744", source: "Silkie" } 7148.5 "Total Wash" Ability { id: "772C", source: "Silkie" } @@ -484,31 +484,31 @@ hideall "--sync--" 7196.9 "--sync--" StartsUsing { id: "773D", source: "Silkie" } window 20,100 7200.9 "Fresh Puff" Ability { id: "773D", source: "Silkie" } 7210.3 "Chilling Suds" Ability { id: "7736", source: "Silkie" } -7217.0 "Squeaky Left/Squeaky Right" Ability { id: "(772E|772D)", source: "Silkie" } +7217.0 "Squeaky Left/Squeaky Right" Ability { id: ["772E", "772D"], source: "Silkie" } 7233.9 "Soaping Spree" Ability { id: "773E", source: "Silkie" } 7234.9 "Chilling Duster" Ability { id: "773F", source: "Silken Puff" } 7245.0 "Total Wash" Ability { id: "772C", source: "Silkie" } -7256.2 "Bracing Suds / Chilling Suds" Ability { id: "(7735|7736)", source: "Silkie" } +7256.2 "Bracing Suds / Chilling Suds" Ability { id: ["7735", "7736"], source: "Silkie" } 7264.0 "Slippery Soap" Ability { id: "773A", source: "Silkie" } -7267.6 "Bracing Duster / Chilling Duster" Ability { id: "(773B|773C)", source: "Silkie" } +7267.6 "Bracing Duster / Chilling Duster" Ability { id: ["773B", "773C"], source: "Silkie" } -7278.8 "Squeaky Left/Squeaky Right" Ability { id: "(772E|772D)", source: "Silkie" } +7278.8 "Squeaky Left/Squeaky Right" Ability { id: ["772E", "772D"], source: "Silkie" } 7298.7 "Carpet Beater" Ability { id: "772B", source: "Silkie" } 7306.4 "Spot Remover" Ability { id: "7742", source: "Silkie" } 7315.5 "Dust Bluster" Ability { id: "7744", source: "Silkie" } 7326.6 "Total Wash" Ability { id: "772C", source: "Silkie" } -7337.7 "Bracing Suds / Chilling Suds" Ability { id: "(7735|7736)", source: "Silkie" } +7337.7 "Bracing Suds / Chilling Suds" Ability { id: ["7735", "7736"], source: "Silkie" } 7345.4 "Slippery Soap" Ability { id: "773A", source: "Silkie" } -7348.8 "Bracing Duster / Chilling Duster" Ability { id: "(773B|773C)", source: "Silkie" } +7348.8 "Bracing Duster / Chilling Duster" Ability { id: ["773B", "773C"], source: "Silkie" } -7359.9 "Squeaky Left/Squeaky Right" Ability { id: "(772E|772D)", source: "Silkie" } window 20,20 jump 7278.8 +7359.9 "Squeaky Left/Squeaky Right" Ability { id: ["772E", "772D"], source: "Silkie" } window 20,20 jump 7278.8 7379.8 "Carpet Beater" #Ability { id: "772B", source: "Silkie" } 7387.5 "Spot Remover" #Ability { id: "7742", source: "Silkie" } 7396.6 "Dust Bluster" #Ability { id: "7744", source: "Silkie" } 7407.7 "Total Wash" #Ability { id: "772C", source: "Silkie" } -7418.8 "Bracing Suds / Chilling Suds" #Ability { id: "(7735|7736)", source: "Silkie" } +7418.8 "Bracing Suds / Chilling Suds" #Ability { id: ["7735", "7736"], source: "Silkie" } 7426.5 "Slippery Soap" #Ability { id: "773A", source: "Silkie" } -7429.9 "Bracing Duster / Chilling Duster" #Ability { id: "(773B|773C)", source: "Silkie" } +7429.9 "Bracing Duster / Chilling Duster" #Ability { id: ["773B", "773C"], source: "Silkie" } ### Gladiator of Sil'dih @@ -520,14 +520,14 @@ hideall "--sync--" 8007.0 "--sync--" StartsUsing { id: "7656", source: "Gladiator of Sil'dih" } window 20,20 8012.0 "Flash of Steel" Ability { id: "7656", source: "Gladiator of Sil'dih" } 8019.2 "--middle--" Ability { id: "7639", source: "Gladiator of Sil'dih" } -8031.4 "Ring of Might (out)" Ability { id: "(763F|7640|7641)", source: "Gladiator of Sil'dih" } +8031.4 "Ring of Might (out)" Ability { id: ["763F", "7640", "7641"], source: "Gladiator of Sil'dih" } 8031.4 "--sync--" Ability { id: "77BF", source: "Gladiator of Sil'dih" } -8033.4 "Ring of Might (in)" Ability { id: "(7642|7643|7644)", source: "Gladiator of Sil'dih" } +8033.4 "Ring of Might (in)" Ability { id: ["7642", "7643", "7644"], source: "Gladiator of Sil'dih" } 8044.6 "Sculptor's Passion" Ability { id: "764A", source: "Gladiator of Sil'dih" } 8050.8 "--middle--" Ability { id: "7639", source: "Gladiator of Sil'dih" } -8063.6 "Ring of Might (out)" Ability { id: "(763F|7640|7641)", source: "Gladiator of Sil'dih" } +8063.6 "Ring of Might (out)" Ability { id: ["763F", "7640", "7641"], source: "Gladiator of Sil'dih" } 8063.6 "--sync--" Ability { id: "77BF", source: "Gladiator of Sil'dih" } -8065.6 "Ring of Might (in)" Ability { id: "(7642|7643|7644)", source: "Gladiator of Sil'dih" } +8065.6 "Ring of Might (in)" Ability { id: ["7642", "7643", "7644"], source: "Gladiator of Sil'dih" } 8078.8 "Flash of Steel?" Ability { id: "764C", source: "Gladiator of Sil'dih" } # Bridge 08 @@ -591,9 +591,9 @@ hideall "--sync--" 8206.3 "Sundered Remains" Ability { id: "7648", source: "Gladiator of Sil'dih" } 8214.4 "--middle--" Ability { id: "7639", source: "Gladiator of Sil'dih" } 8218.4 "Sundered Remains (mid)" #Ability { id: "7649", source: "Gladiator of Sil'dih" } -8226.9 "Ring of Might (out)" Ability { id: "(763F|7640|7641)", source: "Gladiator of Sil'dih" } +8226.9 "Ring of Might (out)" Ability { id: ["763F", "7640", "7641"], source: "Gladiator of Sil'dih" } 8226.9 "--sync--" Ability { id: "77BF", source: "Gladiator of Sil'dih" } -8228.9 "Ring of Might (in)" Ability { id: "(7642|7643|7644)", source: "Gladiator of Sil'dih" } +8228.9 "Ring of Might (in)" Ability { id: ["7642", "7643", "7644"], source: "Gladiator of Sil'dih" } 8240.1 "Mighty Smite" Ability { id: "7657", source: "Gladiator of Sil'dih" } 8253.2 "Wrath of Ruin" Ability { id: "7645", source: "Gladiator of Sil'dih" } 8259.3 "--corner--" Ability { id: "7639", source: "Gladiator of Sil'dih" } @@ -606,9 +606,9 @@ hideall "--sync--" 8299.2 "Sundered Remains" #Ability { id: "7648", source: "Gladiator of Sil'dih" } 8307.3 "--middle--" #Ability { id: "7639", source: "Gladiator of Sil'dih" } 8311.3 "Sundered Remains (mid)" #Ability { id: "7649", source: "Gladiator of Sil'dih" } -8319.8 "Ring of Might (out)" #Ability { id: "(763F|7640|7641)", source: "Gladiator of Sil'dih" } +8319.8 "Ring of Might (out)" #Ability { id: ["763F", "7640", "7641"], source: "Gladiator of Sil'dih" } 8319.8 "--sync--" #Ability { id: "77BF", source: "Gladiator of Sil'dih" } -8321.8 "Ring of Might (in)" #Ability { id: "(7642|7643|7644)", source: "Gladiator of Sil'dih" } +8321.8 "Ring of Might (in)" #Ability { id: ["7642", "7643", "7644"], source: "Gladiator of Sil'dih" } ### Shadowcaster Zeless Gah # -p 74AE:9015.6 @@ -911,37 +911,37 @@ hideall "--sync--" 13000.0 "--sync--" SystemLogMessage { id: "7DC", param1: "1076" } window 100000,0 13011.8 "--sync--" StartsUsing { id: "70EB", source: "Thorne Knight" } 13016.8 "Cogwheel" Ability { id: "70EB", source: "Thorne Knight" } -13030.3 "Spring to Life" Ability { id: "(70ED|70EE)", source: "Thorne Knight" } +13030.3 "Spring to Life" Ability { id: ["70ED", "70EE"], source: "Thorne Knight" } 13031.1 "--sync--" Ability { id: "7126", source: "Magicked Puppet" } 13034.1 "Magic Cannon" Ability { id: "70F7", source: "Magicked Puppet" } 13034.7 "Amalj'aa Artillery" Ability { id: "70F8", source: "Amalj'aa Artillery Carriage" } 13037.1 "--sync--" Ability { id: "7127", source: "Magicked Puppet" } 13052.5 "Blistering Blow" Ability { id: "70EA", source: "Thorne Knight" } -13064.6 "Spring to Life" Ability { id: "(70ED|70EE)", source: "Thorne Knight" } +13064.6 "Spring to Life" Ability { id: ["70ED", "70EE"], source: "Thorne Knight" } 13065.4 "--sync--" Ability { id: "7126", source: "Magicked Puppet" } 13068.4 "Magic Cannon" Ability { id: "70F7", source: "Magicked Puppet" } 13069.1 "Amalj'aa Artillery" Ability { id: "70F8", source: "Amalj'aa Artillery Carriage" } 13071.5 "--sync--" Ability { id: "7127", source: "Magicked Puppet" } 13075.1 "Fore Honor" Ability { id: "70EC", source: "Thorne Knight" } -13090.8 "Slashburn" Ability { id: "(70EF|70F0|70F1|7102)", source: "Thorne Knight" } +13090.8 "Slashburn" Ability { id: ["70EF", "70F0", "70F1", "7102"], source: "Thorne Knight" } 13103.5 "--sync--" Ability { id: "70F5", source: "Thorne Knight" } 13105.0 "Signal Flare 1" #Ability { id: "70FB", source: "Thorne Knight" } 13106.6 "Signal Flare 2" #Ability { id: "70FB", source: "Thorne Knight" } 13108.2 "Signal Flare 3" #Ability { id: "70FB", source: "Thorne Knight" } 13114.1 "Blistering Blow" Ability { id: "70EA", source: "Thorne Knight" } -13131.1 "Slashburn" Ability { id: "(70EF|70F0|70F1|7102)", source: "Thorne Knight" } +13131.1 "Slashburn" Ability { id: ["70EF", "70F0", "70F1", "7102"], source: "Thorne Knight" } 13142.7 "Blaze of Glory" Ability { id: "70F4", source: "Thorne Knight" } -13152.6 "Spring to Life" Ability { id: "(70ED|70EE)", source: "Thorne Knight" } +13152.6 "Spring to Life" Ability { id: ["70ED", "70EE"], source: "Thorne Knight" } 13153.4 "--sync--" Ability { id: "7126", source: "Magicked Puppet" } 13156.3 "Magic Cannon" Ability { id: "70F7", source: "Magicked Puppet" } 13157.0 "Amalj'aa Artillery" Ability { id: "70F8", source: "Amalj'aa Artillery Carriage" } 13157.0 "Explosion" Ability { id: "70FD", source: "Ball of Fire" } 13159.4 "--sync--" Ability { id: "7127", source: "Magicked Puppet" } -13169.2 "Slashburn" Ability { id: "(70EF|70F0|70F1|7102)", source: "Thorne Knight" } +13169.2 "Slashburn" Ability { id: ["70EF", "70F0", "70F1", "7102"], source: "Thorne Knight" } 13178.7 "Blaze of Glory" Ability { id: "70F4", source: "Thorne Knight" } 13193.1 "Explosion" Ability { id: "70FD", source: "Ball of Fire" } -13193.1 "Slashburn" Ability { id: "(70EF|70F0|70F1|7102)", source: "Thorne Knight" } +13193.1 "Slashburn" Ability { id: ["70EF", "70F0", "70F1", "7102"], source: "Thorne Knight" } 13205.7 "--sync--" Ability { id: "70F5", source: "Thorne Knight" } 13207.3 "Signal Flare 1" #Ability { id: "70FB", source: "Thorne Knight" } 13208.9 "Signal Flare 2" #Ability { id: "70FB", source: "Thorne Knight" } @@ -950,7 +950,7 @@ hideall "--sync--" 13221.4 "Cogwheel" Ability { id: "70EB", source: "Thorne Knight" } 13234.1 "Blaze of Glory" Ability { id: "70F4", source: "Thorne Knight" } -13244.1 "Spring to Life" Ability { id: "(70ED|70EE)", source: "Thorne Knight" } +13244.1 "Spring to Life" Ability { id: ["70ED", "70EE"], source: "Thorne Knight" } 13244.9 "--sync--" Ability { id: "7126", source: "Magicked Puppet" } 13247.9 "Magic Cannon" Ability { id: "70F7", source: "Magicked Puppet" } 13248.5 "Amalj'aa Artillery" Ability { id: "70F8", source: "Amalj'aa Artillery Carriage" } @@ -959,7 +959,7 @@ hideall "--sync--" 13253.2 "Cogwheel" Ability { id: "70EB", source: "Thorne Knight" } 13265.8 "Blaze of Glory" Ability { id: "70F4", source: "Thorne Knight" } -13280.3 "Slashburn" Ability { id: "(70EF|70F0|70F1|7102)", source: "Thorne Knight" } +13280.3 "Slashburn" Ability { id: ["70EF", "70F0", "70F1", "7102"], source: "Thorne Knight" } 13280.3 "Explosion" Ability { id: "70FD", source: "Ball of Fire" } 13293.0 "--sync--" Ability { id: "70F5", source: "Thorne Knight" } 13294.6 "Signal Flare 1" #Ability { id: "70FB", source: "Thorne Knight" } @@ -969,7 +969,7 @@ hideall "--sync--" 13308.8 "Cogwheel" Ability { id: "70EB", source: "Thorne Knight" } window 40,40 jump 13221.4 13321.5 "Blaze of Glory" #Ability { id: "70F4", source: "Thorne Knight" } -13331.5 "Spring to Life" #Ability { id: "(70ED|70EE)", source: "Thorne Knight" } +13331.5 "Spring to Life" #Ability { id: ["70ED", "70EE"], source: "Thorne Knight" } 13332.3 "--sync--" #Ability { id: "7126", source: "Magicked Puppet" } 13335.3 "Magic Cannon" #Ability { id: "70F7", source: "Magicked Puppet" } 13335.9 "Amalj'aa Artillery" #Ability { id: "70F8", source: "Amalj'aa Artillery Carriage" } diff --git a/ui/raidboss/data/06-ew/dungeon/the_tower_of_babil.txt b/ui/raidboss/data/06-ew/dungeon/the_tower_of_babil.txt index 8e9c0e1f93..9200a5bdb4 100644 --- a/ui/raidboss/data/06-ew/dungeon/the_tower_of_babil.txt +++ b/ui/raidboss/data/06-ew/dungeon/the_tower_of_babil.txt @@ -25,8 +25,8 @@ hideall "--sync--" # is just offset enough to make it impractical to interleave the possibilities. # The Thundercall after the Pound/Scrapline blocks is the same # regardless of path taken. -33.8 "--sync--" StartsUsing { id: "(6246|62F0)", source: "Barnabas" } window 33.8,5 jump 193.3 -36.4 "--sync--" StartsUsing { id: "(6245|62EE)", source: "Barnabas" } window 36.4,5 jump 293.3 +33.8 "--sync--" StartsUsing { id: ["6246", "62F0"], source: "Barnabas" } window 33.8,5 jump 193.3 +36.4 "--sync--" StartsUsing { id: ["6245", "62EE"], source: "Barnabas" } window 36.4,5 jump 293.3 40.5 "Dynamic Scrapline?" 43.0 "Electromagnetic Release?" 43.1 "Dynamic Pound?" @@ -34,12 +34,12 @@ hideall "--sync--" 55.2 "Shocking Force" # Scrapline first -193.3 "--sync--" StartsUsing { id: "(6246|62F0)", source: "Barnabas" } -200.0 "Dynamic Scrapline" Ability { id: "(6246|62F0)", source: "Barnabas" } +193.3 "--sync--" StartsUsing { id: ["6246", "62F0"], source: "Barnabas" } +200.0 "Dynamic Scrapline" Ability { id: ["6246", "62F0"], source: "Barnabas" } 201.1 "--sync--" Ability { id: "61DD", source: "Barnabas" } 202.5 "Electromagnetic Release" Ability { id: "62F1", source: "Barnabas" } 214.7 "Shocking Force" Ability { id: "62EC", source: "Barnabas" } window 15,15 -231.7 "Dynamic Pound" Ability { id: "(6245|62EE)", source: "Barnabas" } +231.7 "Dynamic Pound" Ability { id: ["6245", "62EE"], source: "Barnabas" } 232.8 "--sync--" Ability { id: "6075", source: "Barnabas" } 234.2 "Electromagnetic Release" Ability { id: "62EF", source: "Barnabas" } @@ -51,12 +51,12 @@ hideall "--sync--" 276.4 "Ground and Pound 2" # Pound first -293.3 "--sync--" StartsUsing { id: "(6245|62EE)", source: "Barnabas" } -300.0 "Dynamic Pound" Ability { id: "(6245|62EE)", source: "Barnabas" } +293.3 "--sync--" StartsUsing { id: ["6245", "62EE"], source: "Barnabas" } +300.0 "Dynamic Pound" Ability { id: ["6245", "62EE"], source: "Barnabas" } 301.1 "--sync--" Ability { id: "6075", source: "Barnabas" } 302.5 "Electromagnetic Release" Ability { id: "62EF", source: "Barnabas" } 314.7 "Shocking Force" Ability { id: "62EC", source: "Barnabas" } window 15,15 -329.9 "Dynamic Scrapline" Ability { id: "(6246|62F0)", source: "Barnabas" } +329.9 "Dynamic Scrapline" Ability { id: ["6246", "62F0"], source: "Barnabas" } 331.0 "--sync--" Ability { id: "61DD", source: "Barnabas" } 332.4 "Electromagnetic Release" Ability { id: "62F1", source: "Barnabas" } @@ -76,8 +76,8 @@ hideall "--sync--" 431.6 "Ground and Pound 2" Ability { id: "62EA", source: "Barnabas" } 437.6 "Ground and Pound 3" Ability { id: "62EA", source: "Barnabas" } -446.5 "--sync--" StartsUsing { id: "(6246|62F0)", source: "Barnabas" } window 30,5 jump 193.3 -449.1 "--sync--" StartsUsing { id: "(6245|62EE)", source: "Barnabas" } window 30,5 jump 293.3 +446.5 "--sync--" StartsUsing { id: ["6246", "62F0"], source: "Barnabas" } window 30,5 jump 193.3 +449.1 "--sync--" StartsUsing { id: ["6245", "62EE"], source: "Barnabas" } window 30,5 jump 293.3 453.2 "Dynamic Scrapline?" 455.7 "Electromagnetic Release?" 455.8 "Dynamic Pound?" diff --git a/ui/raidboss/data/06-ew/dungeon/the_tower_of_zot.txt b/ui/raidboss/data/06-ew/dungeon/the_tower_of_zot.txt index 96b9c393ed..51564e2199 100644 --- a/ui/raidboss/data/06-ew/dungeon/the_tower_of_zot.txt +++ b/ui/raidboss/data/06-ew/dungeon/the_tower_of_zot.txt @@ -25,8 +25,8 @@ hideall "--sync--" 38.0 "Transmute Element III" Ability { id: "6(29A|31[BCD])", source: "Minduruva" } 38.9 "--sync--" Ability { id: "629B", source: "Minduruva" } 42.3 "Manusya Fire" Ability { id: "6463", source: "Minduruva" } -47.7 "Manusya Element III" #Ability { id: "(6295|6296|6297|6298)", source: "Minduruva" } -51.8 "Delayed Element III" #Ability { id: "(6295|6296|6297|6298)", source: "Minduruva" } +47.7 "Manusya Element III" #Ability { id: ["6295", "6296", "6297", "6298"], source: "Minduruva" } +51.8 "Delayed Element III" #Ability { id: ["6295", "6296", "6297", "6298"], source: "Minduruva" } 61.9 "Manusya Bio" Ability { id: "62A0", source: "Minduruva" } 69.0 "Dhrupad" Ability { id: "629C", source: "Minduruva" } window 30,30 @@ -39,9 +39,9 @@ hideall "--sync--" 80.8 "--sync--" Ability { id: "629B", source: "Minduruva" } 84.0 "Transmute Element III #2" Ability { id: "6(29A|31[BCD])", source: "Minduruva" } 84.9 "--sync--" Ability { id: "629B", source: "Minduruva" } -89.3 "Manusya Element III" #Ability { id: "(6295|6296|6297|6298)", source: "Minduruva" } -93.4 "Delayed Element III #1" #Ability { id: "(6295|6296|6297|6298)", source: "Minduruva" } -97.5 "Delayed Element III #2" #Ability { id: "(6295|6296|6297|6298)", source: "Minduruva" } +89.3 "Manusya Element III" #Ability { id: ["6295", "6296", "6297", "6298"], source: "Minduruva" } +93.4 "Delayed Element III #1" #Ability { id: ["6295", "6296", "6297", "6298"], source: "Minduruva" } +97.5 "Delayed Element III #2" #Ability { id: ["6295", "6296", "6297", "6298"], source: "Minduruva" } 107.6 "Dhrupad" Ability { id: "629C", source: "Minduruva" } window 30,30 # Rotation block with Bio @@ -54,9 +54,9 @@ hideall "--sync--" 132.4 "--sync--" Ability { id: "629B", source: "Minduruva" } 135.5 "Transmute Element III #2" Ability { id: "6(29A|31[BCD])", source: "Minduruva" } 136.4 "--sync--" Ability { id: "629B", source: "Minduruva" } -140.8 "Manusya Element III" #Ability { id: "(6295|6296|6297|6298)", source: "Minduruva" } -144.9 "Delayed Element III #1" #Ability { id: "(6295|6296|6297|6298)", source: "Minduruva" } -148.9 "Delayed Element III #2" #Ability { id: "(6295|6296|6297|6298)", source: "Minduruva" } +140.8 "Manusya Element III" #Ability { id: ["6295", "6296", "6297", "6298"], source: "Minduruva" } +144.9 "Delayed Element III #1" #Ability { id: ["6295", "6296", "6297", "6298"], source: "Minduruva" } +148.9 "Delayed Element III #2" #Ability { id: ["6295", "6296", "6297", "6298"], source: "Minduruva" } 159.0 "Dhrupad" Ability { id: "629C", source: "Minduruva" } window 30,30 160.1 "Manusya Fire" Ability { id: "629D", source: "Minduruva" } @@ -68,9 +68,9 @@ hideall "--sync--" 183.7 "--sync--" Ability { id: "629B", source: "Minduruva" } 186.8 "Transmute Element III #2" Ability { id: "6(29A|31[BCD])", source: "Minduruva" } 187.7 "--sync--" Ability { id: "629B", source: "Minduruva" } -192.1 "Manusya Element III" #Ability { id: "(6295|6296|6297|6298)", source: "Minduruva" } -196.2 "Delayed Element III #1" #Ability { id: "(6295|6296|6297|6298)", source: "Minduruva" } -200.2 "Delayed Element III #2" #Ability { id: "(6295|6296|6297|6298)", source: "Minduruva" } +192.1 "Manusya Element III" #Ability { id: ["6295", "6296", "6297", "6298"], source: "Minduruva" } +196.2 "Delayed Element III #1" #Ability { id: ["6295", "6296", "6297", "6298"], source: "Minduruva" } +200.2 "Delayed Element III #2" #Ability { id: ["6295", "6296", "6297", "6298"], source: "Minduruva" } 210.3 "Dhrupad" Ability { id: "629C", source: "Minduruva" } window 30,30 211.4 "Manusya Fire" Ability { id: "629D", source: "Minduruva" } jump 160.1 diff --git a/ui/raidboss/data/06-ew/raid/p10s.txt b/ui/raidboss/data/06-ew/raid/p10s.txt index 9f6f7453f1..11b25d979f 100644 --- a/ui/raidboss/data/06-ew/raid/p10s.txt +++ b/ui/raidboss/data/06-ew/raid/p10s.txt @@ -32,7 +32,7 @@ hideall "--sync--" 40.8 "Steel Web (cast)" Ability { id: "8723", source: "Pand\\u00e6monium" } 48.5 "Dividing Wings (cone)" Ability { id: "8298", source: "Pand\\u00e6monium" } 48.7 "Steel Web (share)" Ability { id: "827F", source: "Pand\\u00e6monium" } -58.7 "Pandaemon's Holy/Circles of Pandaemonium" Ability { id: "(82A6|82A7)", source: "Pand\\u00e6monium" } +58.7 "Pandaemon's Holy/Circles of Pandaemonium" Ability { id: ["82A6", "82A7"], source: "Pand\\u00e6monium" } 67.4 "--sync--" Ability { id: "8299", source: "Pand\\u00e6monium" } 68.5 "Wicked Step 1" Ability { id: "829A", source: "Pand\\u00e6monium" } 70.9 "Wicked Step 2" Ability { id: "829B", source: "Pand\\u00e6monium" } @@ -41,7 +41,7 @@ hideall "--sync--" 96.0 "Pandaemoniac Pillars" Ability { id: "8280", source: "Pand\\u00e6monium" } 97.3 "Bury" Ability { id: "8282", source: "Pand\\u00e6monium" } -102.9 "Pandaemon's Holy/Circles of Pandaemonium" Ability { id: "(82A6|82A7)", source: "Pand\\u00e6monium" } +102.9 "Pandaemon's Holy/Circles of Pandaemonium" Ability { id: ["82A6", "82A7"], source: "Pand\\u00e6monium" } 103.0 "Peal of Damnation" Ability { id: "87B0", source: "Pand\\u00e6moniac Pillar" } 108.4 "Silkspit (cast)" Ability { id: "827C", source: "Pand\\u00e6monium" } @@ -51,8 +51,8 @@ hideall "--sync--" 131.9 "Pandaemoniac Meltdown" Ability { id: "829D", source: "Pand\\u00e6monium" } 144.2 "Touchdown" Ability { id: "828D", source: "Pand\\u00e6monium" } -145.8 "Daemoniac Bonds 1" Ability { id: "(82A2|82A3|87AE)", source: "Pand\\u00e6monium" } -148.8 "Daemoniac Bonds 2" Ability { id: "(82A2|82A3|87AE)", source: "Pand\\u00e6monium" } +145.8 "Daemoniac Bonds 1" Ability { id: ["82A2", "82A3", "87AE"], source: "Pand\\u00e6monium" } +148.8 "Daemoniac Bonds 2" Ability { id: ["82A2", "82A3", "87AE"], source: "Pand\\u00e6monium" } 159.8 "Ultima" Ability { id: "82A5", source: "Pand\\u00e6monium" } 168.9 "Soul Grasp x4" Ability { id: "829F", source: "Pand\\u00e6monium" } duration 5.7 @@ -65,9 +65,9 @@ hideall "--sync--" 215.1 "Peal of Condemnation 3" Ability { id: "8288", source: "Pand\\u00e6moniac Pillar" } 219.7 "Peal of Condemnation 4" Ability { id: "8288", source: "Pand\\u00e6moniac Pillar" } -223.9 "Daemoniac Bonds 1" Ability { id: "(82A2|82A3|87AE)", source: "Pand\\u00e6monium" } -226.9 "Daemoniac Bonds 2" Ability { id: "(82A2|82A3|87AE)", source: "Pand\\u00e6monium" } -233.8 "Pandaemoniac Ray" Ability { id: "(8289|828B)", source: "Pand\\u00e6monium" } +223.9 "Daemoniac Bonds 1" Ability { id: ["82A2", "82A3", "87AE"], source: "Pand\\u00e6monium" } +226.9 "Daemoniac Bonds 2" Ability { id: ["82A2", "82A3", "87AE"], source: "Pand\\u00e6monium" } +233.8 "Pandaemoniac Ray" Ability { id: ["8289", "828B"], source: "Pand\\u00e6monium" } 237.6 "Jade Passage" Ability { id: "828C", source: "Arcane Sphere" } 249.3 "Ultima" Ability { id: "82A5", source: "Pand\\u00e6monium" } @@ -83,12 +83,12 @@ hideall "--sync--" 308.9 "Silkspit" Ability { id: "827D", source: "Pand\\u00e6monium" } 316.2 "Pandaemoniac Pillars" Ability { id: "8280", source: "Pand\\u00e6monium" } 317.5 "Bury" Ability { id: "8282", source: "Pand\\u00e6monium" } -323.1 "Pandaemon's Holy/Circles of Pandaemonium" Ability { id: "(82A6|82A7)", source: "Pand\\u00e6monium" } +323.1 "Pandaemon's Holy/Circles of Pandaemonium" Ability { id: ["82A6", "82A7"], source: "Pand\\u00e6monium" } 323.2 "Peal of Damnation" Ability { id: "87B0", source: "Pand\\u00e6moniac Pillar" } -329.9 "Daemoniac Bonds 1" Ability { id: "(82A2|82A3|87AE)", source: "Pand\\u00e6monium" } -330.6 "Pandaemoniac Ray" Ability { id: "(8289|828B)", source: "Pand\\u00e6monium" } -333.9 "Daemoniac Bonds 2" Ability { id: "(82A2|82A3|87AE)", source: "Pand\\u00e6monium" } +329.9 "Daemoniac Bonds 1" Ability { id: ["82A2", "82A3", "87AE"], source: "Pand\\u00e6monium" } +330.6 "Pandaemoniac Ray" Ability { id: ["8289", "828B"], source: "Pand\\u00e6monium" } +333.9 "Daemoniac Bonds 2" Ability { id: ["82A2", "82A3", "87AE"], source: "Pand\\u00e6monium" } 334.3 "Jade Passage" #Ability { id: "828C", source: "Arcane Sphere" } 338.6 "Dividing Wings" Ability { id: "8297", source: "Pand\\u00e6monium" } @@ -121,8 +121,8 @@ hideall "--sync--" 450.1 "Harrowing Hell 8" Ability { id: "86BC", source: "Pand\\u00e6monium" } 454.0 "Harrowing Hell (knockback)" Ability { id: "8294", source: "Pand\\u00e6monium" } -459.3 "Daemoniac Bonds 1" Ability { id: "(82A2|82A3|87AE)", source: "Pand\\u00e6monium" } -462.3 "Daemoniac Bonds 2" Ability { id: "(82A2|82A3|87AE)", source: "Pand\\u00e6monium" } +459.3 "Daemoniac Bonds 1" Ability { id: ["82A2", "82A3", "87AE"], source: "Pand\\u00e6monium" } +462.3 "Daemoniac Bonds 2" Ability { id: ["82A2", "82A3", "87AE"], source: "Pand\\u00e6monium" } 480.5 "Ultima" Ability { id: "82A5", source: "Pand\\u00e6monium" } 490.6 "Soul Grasp x4" Ability { id: "829F", source: "Pand\\u00e6monium" } duration 5.7 @@ -134,16 +134,16 @@ hideall "--sync--" 543.8 "Parted Plumes" Ability { id: "8295", source: "Pand\\u00e6monium" } duration 10 -555.9 "Pandaemoniac Ray" Ability { id: "(8289|828B)", source: "Pand\\u00e6monium" } +555.9 "Pandaemoniac Ray" Ability { id: ["8289", "828B"], source: "Pand\\u00e6monium" } 559.7 "Jade Passage" Ability { id: "828C", source: "Arcane Sphere" } -563.0 "Pandaemon's Holy/Circles of Pandaemonium" Ability { id: "(82A6|82A7)", source: "Pand\\u00e6monium" } +563.0 "Pandaemon's Holy/Circles of Pandaemonium" Ability { id: ["82A6", "82A7"], source: "Pand\\u00e6monium" } 569.1 "Silkspit (cast)" Ability { id: "827C", source: "Pand\\u00e6monium" } 579.1 "Silkspit" Ability { id: "827D", source: "Pand\\u00e6monium" } 586.4 "Pandaemoniac Pillars" Ability { id: "8280", source: "Pand\\u00e6monium" } 587.3 "Bury" Ability { id: "8281", source: "Pand\\u00e6moniac Pillar" } -593.3 "Pandaemon's Holy/Circles of Pandaemonium" Ability { id: "(82A6|82A7)", source: "Pand\\u00e6monium" } +593.3 "Pandaemon's Holy/Circles of Pandaemonium" Ability { id: ["82A6", "82A7"], source: "Pand\\u00e6monium" } 593.4 "Peal of Damnation" Ability { id: "87B0", source: "Pand\\u00e6moniac Pillar" } 595.8 "--sync--" Ability { id: "6854", source: "Pand\\u00e6monium" } diff --git a/ui/raidboss/data/06-ew/raid/p11n.txt b/ui/raidboss/data/06-ew/raid/p11n.txt index 594c6464e8..ec23ebcf19 100644 --- a/ui/raidboss/data/06-ew/raid/p11n.txt +++ b/ui/raidboss/data/06-ew/raid/p11n.txt @@ -32,11 +32,11 @@ hideall "--sync--" # Divisive Ruling Intro 16.2 "--center--" Ability { id: "8235", source: "Themis" } 25.5 "Divisive Ruling (in)" Ability { id: "81B5", source: "Themis" } -28.2 "Ripples of Gloom" Ability { id: "(81B7|81B8)", source: "Themis" } +28.2 "Ripples of Gloom" Ability { id: ["81B7", "81B8"], source: "Themis" } 37.8 "Divisive Ruling (out)" Ability { id: "81B5", source: "Themis" } 40.4 "Divine Ruination" Ability { id: "81B6", source: "Themis" } 50.1 "Divisive Ruling (random)" Ability { id: "81B5", source: "Themis" } -52.7 "Divine Ruination/Ripples of Gloom" Ability { id: "(81B6|81B7|81B8)", source: "Themis" } +52.7 "Divine Ruination/Ripples of Gloom" Ability { id: ["81B6", "81B7", "81B8"], source: "Themis" } 60.9 "Eunomia" Ability { id: "81E2", source: "Themis" } # Dark and Light Intro @@ -57,8 +57,8 @@ hideall "--sync--" 138.0 "--center--" Ability { id: "8235", source: "Themis" } 144.1 "Dark and Light" Ability { id: "81C3", source: "Themis" } 151.2 "Sigils of Discord" Ability { id: "81C4", source: "Themis" } -164.3 "Dismissal Ruling (random)" Ability { id: "(81FA|81FB)", source: "Themis" } -167.9 "Inner Light/Outer Dark" Ability { id: "(86F3|86F4)", source: "Themis" } +164.3 "Dismissal Ruling (random)" Ability { id: ["81FA", "81FB"], source: "Themis" } +167.9 "Inner Light/Outer Dark" Ability { id: ["86F3", "86F4"], source: "Themis" } 174.0 "Emissary's Will" Ability { id: "81C7", source: "Themis" } 186.4 "Upheld Ruling (cleave -> dynamo)" Ability { id: "81BA", source: "Themis" } window 186.4,10 193.0 "Dark Perimeter" Ability { id: "81BE", source: "Themis" } @@ -71,9 +71,9 @@ hideall "--sync--" 235.3 "Dark and Light" Ability { id: "81C3", source: "Themis" } 242.4 "Sigils of Discord" Ability { id: "81C4", source: "Themis" } 256.5 "Divisive Ruling (in/out)" Ability { id: "81B5", source: "Themis" } -259.1 "Divine Ruination/Ripples of Gloom" Ability { id: "(81B6|81B7|81B8)", source: "Themis" } -271.3 "Dismissal Ruling (random)" Ability { id: "(81FA|81FB)", source: "Themis" } -274.9 "Inner Light/Outer Dark" Ability { id: "(86F3|86F4)", source: "Themis" } +259.1 "Divine Ruination/Ripples of Gloom" Ability { id: ["81B6", "81B7", "81B8"], source: "Themis" } +271.3 "Dismissal Ruling (random)" Ability { id: ["81FA", "81FB"], source: "Themis" } +274.9 "Inner Light/Outer Dark" Ability { id: ["86F3", "86F4"], source: "Themis" } 281.0 "Emissary's Will" Ability { id: "81C7", source: "Themis" } 290.1 "Dike" Ability { id: "81E3", source: "Themis" } 297.3 "--center--" Ability { id: "8235", source: "Themis" } window 30,30 @@ -81,9 +81,9 @@ hideall "--sync--" 306.3 "Dineis (puddle 1)" #Ability { id: "8726", source: "Themis" } 308.3 "Dineis (puddle 2)" #Ability { id: "8726", source: "Themis" } 311.7 "Divisive Ruling (in/out)" Ability { id: "81B5", source: "Themis" } -314.3 "Divine Ruination/Ripples of Gloom" Ability { id: "(81B6|81B7|81B8)", source: "Themis" } -322.7 "Upheld Ruling (random)" Ability { id: "(81B9|81BA)", source: "Themis" } -329.3 "Dark Perimeter/Lightburst" Ability { id: "(81BE|81BD)", source: "Themis" } +314.3 "Divine Ruination/Ripples of Gloom" Ability { id: ["81B6", "81B7", "81B8"], source: "Themis" } +322.7 "Upheld Ruling (random)" Ability { id: ["81B9", "81BA"], source: "Themis" } +329.3 "Dark Perimeter/Lightburst" Ability { id: ["81BE", "81BD"], source: "Themis" } 336.9 "Eunomia" Ability { id: "81E2", source: "Themis" } 346.1 "Shadowed Messengers" Ability { id: "81D4", source: "Themis" } @@ -91,11 +91,11 @@ hideall "--sync--" 356.8 "--center--" Ability { id: "8235", source: "Themis" } window 15,15 357.6 "Divisive Ruling" Ability { id: "81D7", source: "Illusory Themis" } 360.7 "Divine Ruination" Ability { id: "81D8", source: "Illusory Themis" } -360.7 "Ripples of Gloom" Ability { id: "(81D9|81DA)", source: "Illusory Themis" } +360.7 "Ripples of Gloom" Ability { id: ["81D9", "81DA"], source: "Illusory Themis" } 361.8 "--sync--" Ability { id: "81E0", source: "Themis" } window 361.8,10 # Blinding Light cast 367.0 "Blinding Light" Ability { id: "81E1", source: "Themis" } -372.0 "Dismissal Ruling (random)" Ability { id: "(81FA|81FB)", source: "Themis" } -375.6 "Inner Light/Outer Dark" Ability { id: "(86F3|86F4)", source: "Themis" } +372.0 "Dismissal Ruling (random)" Ability { id: ["81FA", "81FB"], source: "Themis" } +375.6 "Inner Light/Outer Dark" Ability { id: ["86F3", "86F4"], source: "Themis" } 380.7 "Styx x5" Ability { id: "81DB", source: "Themis" } duration 5 # Loop until death (208.2) @@ -104,17 +104,17 @@ hideall "--sync--" 400.4 "Dineis (puddle 1)" #Ability { id: "8726", source: "Themis" } 402.4 "Dineis (puddle 2)" #Ability { id: "8726", source: "Themis" } 406.0 "Divisive Ruling (in/out)" Ability { id: "81B5", source: "Themis" } -408.6 "Divine Ruination/Ripples of Gloom" Ability { id: "(81B6|81B7|81B8)", source: "Themis" } -417.3 "Upheld Ruling (random)" Ability { id: "(81B9|81BA)", source: "Themis" } -423.0 "Dark Perimeter/Lightburst" Ability { id: "(81BE|81BD)", source: "Themis" } +408.6 "Divine Ruination/Ripples of Gloom" Ability { id: ["81B6", "81B7", "81B8"], source: "Themis" } +417.3 "Upheld Ruling (random)" Ability { id: ["81B9", "81BA"], source: "Themis" } +423.0 "Dark Perimeter/Lightburst" Ability { id: ["81BE", "81BD"], source: "Themis" } 431.6 "Eunomia" Ability { id: "81E2", source: "Themis" } 436.8 "--center--" Ability { id: "8235", source: "Themis" } window 30,30 444.0 "Dark and Light" Ability { id: "81C3", source: "Themis" } 451.1 "Sigils of Discord" Ability { id: "81C4", source: "Themis" } 465.1 "Divisive Ruling (in/out)" Ability { id: "81B5", source: "Themis" } -467.7 "Divine Ruination/Ripples of Gloom" Ability { id: "(81B6|81B7|81B8)", source: "Themis" } -479.9 "Dismissal Ruling (random)" Ability { id: "(81FA|81FB)", source: "Themis" } -483.5 "Inner Light/Outer Dark" Ability { id: "(86F3|86F4)", source: "Themis" } +467.7 "Divine Ruination/Ripples of Gloom" Ability { id: ["81B6", "81B7", "81B8"], source: "Themis" } +479.9 "Dismissal Ruling (random)" Ability { id: ["81FA", "81FB"], source: "Themis" } +483.5 "Inner Light/Outer Dark" Ability { id: ["86F3", "86F4"], source: "Themis" } 489.6 "Emissary's Will" Ability { id: "81C7", source: "Themis" } 498.7 "Dike" Ability { id: "81E3", source: "Themis" } 505.9 "--center--" Ability { id: "8235", source: "Themis" } window 30,30 @@ -122,19 +122,19 @@ hideall "--sync--" 514.9 "Dineis" #Ability { id: "8726", source: "Themis" } 516.9 "Dineis" #Ability { id: "8726", source: "Themis" } 520.3 "Divisive Ruling (in/out)" Ability { id: "81B5", source: "Themis" } -522.9 "Divine Ruination/Ripples of Gloom" Ability { id: "(81B6|81B7|81B8)", source: "Themis" } -531.5 "Upheld Ruling (random)" Ability { id: "(81B9|81BA)", source: "Themis" } -537.2 "Dark Perimeter/Lightburst" Ability { id: "(81BE|81BD)", source: "Themis" } +522.9 "Divine Ruination/Ripples of Gloom" Ability { id: ["81B6", "81B7", "81B8"], source: "Themis" } +531.5 "Upheld Ruling (random)" Ability { id: ["81B9", "81BA"], source: "Themis" } +537.2 "Dark Perimeter/Lightburst" Ability { id: ["81BE", "81BD"], source: "Themis" } 545.6 "Eunomia" Ability { id: "81E2", source: "Themis" } 554.7 "Shadowed Messengers" Ability { id: "81D4", source: "Themis" } 565.4 "--center--" Ability { id: "8235", source: "Themis" } 566.1 "Divisive Ruling" Ability { id: "81D7", source: "Illusory Themis" } 569.2 "Divine Ruination" Ability { id: "81D8", source: "Illusory Themis" } -569.2 "Ripples of Gloom" Ability { id: "(81D9|81DA)", source: "Illusory Themis" } +569.2 "Ripples of Gloom" Ability { id: ["81D9", "81DA"], source: "Illusory Themis" } 570.3 "--sync--" Ability { id: "81E0", source: "Themis" } # Blinding Light cast 575.5 "Blinding Light" Ability { id: "81E1", source: "Themis" } -580.5 "Dismissal Ruling (random)" Ability { id: "(81FA|81FB)", source: "Themis" } -584.1 "Inner Light/Outer Dark" Ability { id: "(86F3|86F4)", source: "Themis" } +580.5 "Dismissal Ruling (random)" Ability { id: ["81FA", "81FB"], source: "Themis" } +584.1 "Inner Light/Outer Dark" Ability { id: ["86F3", "86F4"], source: "Themis" } 589.2 "Styx x5" Ability { id: "81DB", source: "Themis" } duration 5 diff --git a/ui/raidboss/data/06-ew/raid/p11s.txt b/ui/raidboss/data/06-ew/raid/p11s.txt index f1fdd43a43..855952388d 100644 --- a/ui/raidboss/data/06-ew/raid/p11s.txt +++ b/ui/raidboss/data/06-ew/raid/p11s.txt @@ -12,35 +12,35 @@ hideall "--sync--" 26.1 "Dike 1" Ability { id: "822D", source: "Themis" } 29.2 "Dike 2" Ability { id: "822E", source: "Themis" } -42.3 "Jury Overruling" Ability { id: "(81E6|81E7)", source: "Themis" } -48.3 "Inevitable Law/Inevitable Sentence" Ability { id: "(81FC|81FD)", source: "Themis" } +42.3 "Jury Overruling" Ability { id: ["81E6", "81E7"], source: "Themis" } +48.3 "Inevitable Law/Inevitable Sentence" Ability { id: ["81FC", "81FD"], source: "Themis" } -61.7 "Upheld Overruling" Ability { id: "(87D3|87D4)", source: "Themis" } -66.3 "Inevitable Law/Inevitable Sentence" Ability { id: "(81FC|81FD)", source: "Themis" } +61.7 "Upheld Overruling" Ability { id: ["87D3", "87D4"], source: "Themis" } +66.3 "Inevitable Law/Inevitable Sentence" Ability { id: ["81FC", "81FD"], source: "Themis" } 70.3 "--middle--" Ability { id: "867F", source: "Themis" } -79.9 "Divisive Overruling" Ability { id: "(81EC|81ED)", source: "Themis" } -84.5 "Inevitable Law/Inevitable Sentence" Ability { id: "(81FC|81FD)", source: "Themis" } +79.9 "Divisive Overruling" Ability { id: ["81EC", "81ED"], source: "Themis" } +84.5 "Inevitable Law/Inevitable Sentence" Ability { id: ["81FC", "81FD"], source: "Themis" } 93.7 "Styx x5" Ability { id: "8217", source: "Themis" } duration 4.4 105.2 "--middle--" Ability { id: "867F", source: "Themis" } -113.3 "Arcane Revelation" Ability { id: "(820D|820E)", source: "Themis" } -120.4 "Dismissal Overruling" Ability { id: "(8784|8785)", source: "Themis" } -122.8 "Arche" Ability { id: "(8213|8214)", source: "Arcane Sphere" } -125.8 "Inevitable Law/Inevitable Sentence" Ability { id: "(81FC|81FD)", source: "Themis" } +113.3 "Arcane Revelation" Ability { id: ["820D", "820E"], source: "Themis" } +120.4 "Dismissal Overruling" Ability { id: ["8784", "8785"], source: "Themis" } +122.8 "Arche" Ability { id: ["8213", "8214"], source: "Arcane Sphere" } +125.8 "Inevitable Law/Inevitable Sentence" Ability { id: ["81FC", "81FD"], source: "Themis" } 145.5 "--middle--" Ability { id: "867F", source: "Themis" } 152.6 "Shadowed Messengers" Ability { id: "8219", source: "Themis" } 166.9 "Divisive Ruling" Ability { id: "821C", source: "Illusory Themis" } -169.6 "Divisive Overruling" Ability { id: "(87B3|87B4)", source: "Themis" } -174.1 "Inevitable Law/Inevitable Sentence" Ability { id: "(81FC|81FD)", source: "Themis" } +169.6 "Divisive Overruling" Ability { id: ["87B3", "87B4"], source: "Themis" } +174.1 "Inevitable Law/Inevitable Sentence" Ability { id: ["81FC", "81FD"], source: "Themis" } 179.5 "Upheld Ruling" Ability { id: "8221", source: "Illusory Themis" } 183.5 "Lightburst" Ability { id: "8224", source: "Illusory Themis" } 183.5 "Dark Perimeter" Ability { id: "8225", source: "Illusory Themis" } -189.2 "Jury Overruling" Ability { id: "(81E6|81E7)", source: "Themis" } -195.2 "Inevitable Law/Inevitable Sentence" Ability { id: "(81FC|81FD)", source: "Themis" } +189.2 "Jury Overruling" Ability { id: ["81E6", "81E7"], source: "Themis" } +195.2 "Inevitable Law/Inevitable Sentence" Ability { id: ["81FC", "81FD"], source: "Themis" } 203.3 "Styx x6" Ability { id: "8217", source: "Themis" } duration 5.5 @@ -48,21 +48,21 @@ hideall "--sync--" 230.6 "--sync--" Ability { id: "867F", source: "Themis" } 233.2 "Lightstream x7" Ability { id: "8207", source: "Arcane Cylinder" } duration 6.1 -240.1 "Divisive Overruling" Ability { id: "(81EC|81ED)", source: "Themis" } -244.7 "Inevitable Law/Inevitable Sentence" Ability { id: "(81FC|81FD)", source: "Themis" } +240.1 "Divisive Overruling" Ability { id: ["81EC", "81ED"], source: "Themis" } +244.7 "Inevitable Law/Inevitable Sentence" Ability { id: ["81FC", "81FD"], source: "Themis" } 256.8 "Eunomia" Ability { id: "822B", source: "Themis" } -271.2 "Upheld Overruling" Ability { id: "(87D3|87D4)", source: "Themis" } -275.6 "Inevitable Law/Inevitable Sentence" Ability { id: "(81FC|81FD)", source: "Themis" } +271.2 "Upheld Overruling" Ability { id: ["87D3", "87D4"], source: "Themis" } +275.6 "Inevitable Law/Inevitable Sentence" Ability { id: ["81FC", "81FD"], source: "Themis" } 286.6 "--middle--" Ability { id: "867F", source: "Themis" } 293.9 "Dark and Light" Ability { id: "81FE", source: "Themis" } -307.0 "Arcane Revelation" Ability { id: "(820F|8210)", source: "Themis" } -316.7 "Unlucky Lot" Ability { id: "(8215|8216)", source: "Arcane Sphere" } -323.1 "Jury Overruling" Ability { id: "(81E6|81E7)", source: "Themis" } -329.1 "Inevitable Law/Inevitable Sentence" Ability { id: "(81FC|81FD)", source: "Themis" } -341.5 "Divisive Overruling" Ability { id: "(81EC|81ED)", source: "Themis" } -346.1 "Inevitable Law/Inevitable Sentence" Ability { id: "(81FC|81FD)", source: "Themis" } +307.0 "Arcane Revelation" Ability { id: ["820F", "8210"], source: "Themis" } +316.7 "Unlucky Lot" Ability { id: ["8215", "8216"], source: "Arcane Sphere" } +323.1 "Jury Overruling" Ability { id: ["81E6", "81E7"], source: "Themis" } +329.1 "Inevitable Law/Inevitable Sentence" Ability { id: ["81FC", "81FD"], source: "Themis" } +341.5 "Divisive Overruling" Ability { id: ["81EC", "81ED"], source: "Themis" } +346.1 "Inevitable Law/Inevitable Sentence" Ability { id: ["81FC", "81FD"], source: "Themis" } 353.2 "Emissary's Will" Ability { id: "8202", source: "Themis" } 361.4 "Styx x7" Ability { id: "8217", source: "Themis" } duration 6.6 @@ -75,30 +75,30 @@ hideall "--sync--" 410.6 "Dark Current x8" duration 7 Ability { id: "8209", source: "Themis" } 412.5 "Blinding Light" Ability { id: "8229", source: "Themis" } -426.6 "Jury Overruling" Ability { id: "(81E6|81E7)", source: "Themis" } -432.6 "Inevitable Law/Inevitable Sentence" Ability { id: "(81FC|81FD)", source: "Themis" } -446.0 "Upheld Overruling" Ability { id: "(87D3|87D4)", source: "Themis" } -450.4 "Inevitable Law/Inevitable Sentence" Ability { id: "(81FC|81FD)", source: "Themis" } +426.6 "Jury Overruling" Ability { id: ["81E6", "81E7"], source: "Themis" } +432.6 "Inevitable Law/Inevitable Sentence" Ability { id: ["81FC", "81FD"], source: "Themis" } +446.0 "Upheld Overruling" Ability { id: ["87D3", "87D4"], source: "Themis" } +450.4 "Inevitable Law/Inevitable Sentence" Ability { id: ["81FC", "81FD"], source: "Themis" } 456.4 "--middle--" Ability { id: "867F", source: "Themis" } -466.2 "Divisive Overruling" Ability { id: "(81EC|81ED)", source: "Themis" } -470.8 "Inevitable Law/Inevitable Sentence" Ability { id: "(81FC|81FD)", source: "Themis" } +466.2 "Divisive Overruling" Ability { id: ["81EC", "81ED"], source: "Themis" } +470.8 "Inevitable Law/Inevitable Sentence" Ability { id: ["81FC", "81FD"], source: "Themis" } 483.9 "Eunomia" Ability { id: "822B", source: "Themis" } 503.1 "--middle--" Ability { id: "867F", source: "Themis" } 510.2 "Letter of the Law" Ability { id: "87D2", source: "Themis" } -517.3 "Twofold Revelation" Ability { id: "(8211|8212)", source: "Themis" } +517.3 "Twofold Revelation" Ability { id: ["8211", "8212"], source: "Themis" } 526.4 "Heart of Judgment" Ability { id: "8226", source: "Themis" } -527.0 "Arche" Ability { id: "(8213|8214)", source: "Arcane Sphere" } -527.0 "Unlucky Lot" Ability { id: "(8215|8216)", source: "Arcane Sphere" } +527.0 "Arche" Ability { id: ["8213", "8214"], source: "Arcane Sphere" } +527.0 "Unlucky Lot" Ability { id: ["8215", "8216"], source: "Arcane Sphere" } 529.5 "Upheld Ruling" Ability { id: "8221", source: "Illusory Themis" } 533.5 "Lightburst" Ability { id: "8224", source: "Illusory Themis" } 533.5 "Dark Perimeter" Ability { id: "8225", source: "Illusory Themis" } 538.4 "Explosion" Ability { id: "8227", source: "Themis" } 541.8 "Divisive Ruling" Ability { id: "821C", source: "Illusory Themis" } -547.4 "Dismissal Overruling" Ability { id: "(8784|8785)", source: "Themis" } -553.0 "Inevitable Law/Inevitable Sentence" Ability { id: "(81FC|81FD)", source: "Themis" } +547.4 "Dismissal Overruling" Ability { id: ["8784", "8785"], source: "Themis" } +553.0 "Inevitable Law/Inevitable Sentence" Ability { id: ["81FC", "81FD"], source: "Themis" } 561.6 "Styx x8" Ability { id: "8217", source: "Themis" } duration 7.7 @@ -106,14 +106,14 @@ hideall "--sync--" 589.5 "--sync--" Ability { id: "867F", source: "Themis" } 592.6 "Lightstream x7" Ability { id: "8207", source: "Arcane Cylinder" } duration 6.1 -598.9 "Divisive Overruling" Ability { id: "(81EC|81ED)", source: "Themis" } -603.4 "Inevitable Law/Inevitable Sentence" Ability { id: "(81FC|81FD)", source: "Themis" } +598.9 "Divisive Overruling" Ability { id: ["81EC", "81ED"], source: "Themis" } +603.4 "Inevitable Law/Inevitable Sentence" Ability { id: ["81FC", "81FD"], source: "Themis" } 619.5 "Dike 1" Ability { id: "822D", source: "Themis" } 622.6 "Dike 2" Ability { id: "822E", source: "Themis" } -638.7 "Jury Overruling" Ability { id: "(81E6|81E7)", source: "Themis" } -644.7 "Inevitable Law/Inevitable Sentence" Ability { id: "(81FC|81FD)", source: "Themis" } +638.7 "Jury Overruling" Ability { id: ["81E6", "81E7"], source: "Themis" } +644.7 "Inevitable Law/Inevitable Sentence" Ability { id: ["81FC", "81FD"], source: "Themis" } 655.8 "Eunomia" Ability { id: "822B", source: "Themis" } 662.5 "--sync--" StartsUsing { id: "822C", source: "Themis" } window 30,10 diff --git a/ui/raidboss/data/06-ew/raid/p12s.txt b/ui/raidboss/data/06-ew/raid/p12s.txt index a7dc89034b..acec3199ea 100644 --- a/ui/raidboss/data/06-ew/raid/p12s.txt +++ b/ui/raidboss/data/06-ew/raid/p12s.txt @@ -15,11 +15,11 @@ hideall "--sync--" 11.1 "On the Soul" Ability { id: "8304", source: "Athena" } window 20,20 21.2 "Paradeigma 1" Ability { id: "82ED", source: "Athena" } 24.3 "--middle--" Ability { id: "8315", source: "Athena" } -36.7 "Trinity of Souls 1" Ability { id: "(82E7|82E8)", source: "Athena" } +36.7 "Trinity of Souls 1" Ability { id: ["82E7", "82E8"], source: "Athena" } 36.7 "White Flame" Ability { id: "82EF", source: "Anthropos" } -39.3 "Trinity of Souls 2" Ability { id: "(82E9|82EA)", source: "Athena" } +39.3 "Trinity of Souls 2" Ability { id: ["82E9", "82EA"], source: "Athena" } 41.7 "White Flame" Ability { id: "82EF", source: "Anthropos" } -41.9 "Trinity of Souls 3" Ability { id: "(82EB|82EC)", source: "Athena" } +41.9 "Trinity of Souls 3" Ability { id: ["82EB", "82EC"], source: "Athena" } 57.3 "Paradeigma 2" Ability { id: "82ED", source: "Athena" } 65.0 "Engravement of Souls" Ability { id: "8305", source: "Athena" } @@ -44,9 +44,9 @@ hideall "--sync--" 145.2 "Theos's Holy" Ability { id: "8306", source: "Athena" } 146.4 "Astral Advance/Umbral Advance" Ability { id: "830[FE]", source: "Anthropos" } -157.4 "Trinity of Souls 1" Ability { id: "(82E7|82E8|82E1|82E2)", source: "Athena" } -160.1 "Trinity of Souls 2" Ability { id: "(82E9|82EA)", source: "Athena" } -162.7 "Trinity of Souls 3" Ability { id: "(82EB|82EC|82E5|82E6)", source: "Athena" } +157.4 "Trinity of Souls 1" Ability { id: ["82E7", "82E8", "82E1", "82E2"], source: "Athena" } +160.1 "Trinity of Souls 2" Ability { id: ["82E9", "82EA"], source: "Athena" } +162.7 "Trinity of Souls 3" Ability { id: ["82EB", "82EC", "82E5", "82E6"], source: "Athena" } 171.1 "Apodialogos/Peridialogos" Ability { id: "830[01]", source: "Athena" } 172.1 "Dialogos" Ability { id: "8302", source: "Athena" } @@ -85,9 +85,9 @@ hideall "--sync--" 324.4 "--targetable--" 333.2 "Theos's Ultima" Ability { id: "82FA", source: "Athena" } 352.6 "Superchain Theory IIA" Ability { id: "86FA", source: "Athena" } -365.7 "Trinity of Souls 1" Ability { id: "(82E7|82E8|82E1|82E2)", source: "Athena" } -368.3 "Trinity of Souls 2" Ability { id: "(82E9|82EA)", source: "Athena" } -370.7 "Trinity of Souls 3" Ability { id: "(82EB|82EC|82E5|82E6)", source: "Athena" } +365.7 "Trinity of Souls 1" Ability { id: ["82E7", "82E8", "82E1", "82E2"], source: "Athena" } +368.3 "Trinity of Souls 2" Ability { id: ["82E9", "82EA"], source: "Athena" } +370.7 "Trinity of Souls 3" Ability { id: ["82EB", "82EC", "82E5", "82E6"], source: "Athena" } 374.0 "Superchain Coil/Superchain Burst" Ability { id: "82D[BC]", source: "Athena" } 380.2 "Apodialogos/Peridialogos" Ability { id: "830[01]", source: "Athena" } diff --git a/ui/raidboss/data/06-ew/raid/p1n.txt b/ui/raidboss/data/06-ew/raid/p1n.txt index 22937bede9..1d37ca598e 100644 --- a/ui/raidboss/data/06-ew/raid/p1n.txt +++ b/ui/raidboss/data/06-ew/raid/p1n.txt @@ -14,55 +14,55 @@ hideall "--sync--" 0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1 ## First Gaoler's Flail -8.7 "--sync--" StartsUsing { id: "(6DA3|6DA2)", source: "Erichthonios" } window 10,9 -17.4 "Gaoler's Flail Left/Gaoler's Flail Right" Ability { id: "(6DA3|6DA2)", source: "Erichthonios" } -28.5 "Gaoler's Flail Right/Gaoler's Flail Left" Ability { id: "(6DA2|6DA3)", source: "Erichthonios" } +8.7 "--sync--" StartsUsing { id: ["6DA3", "6DA2"], source: "Erichthonios" } window 10,9 +17.4 "Gaoler's Flail Left/Gaoler's Flail Right" Ability { id: ["6DA3", "6DA2"], source: "Erichthonios" } +28.5 "Gaoler's Flail Right/Gaoler's Flail Left" Ability { id: ["6DA2", "6DA3"], source: "Erichthonios" } 39.0 "Warder's Wrath" Ability { id: "65F4", source: "Erichthonios" } 46.2 "--knockback stack--" Ability { id: "6D15", source: "Erichthonios" } 51.5 "Pitiless Flail" Ability { id: "65E5", source: "Erichthonios" } 58.6 "True Holy" Ability { id: "65E7", source: "Erichthonios" } ## Third Gaoler's Flail -70.5 "Gaoler's Flail Left/Gaoler's Flail Right" Ability { id: "(6DA3|6DA2)", source: "Erichthonios" } +70.5 "Gaoler's Flail Left/Gaoler's Flail Right" Ability { id: ["6DA3", "6DA2"], source: "Erichthonios" } 81.1 "Heavy Hand" Ability { id: "65F3", source: "Erichthonios" } 93.2 "Intemperance" Ability { id: "65EE", source: "Erichthonios" } 97.3 "--middle--" Ability { id: "65F5", source: "Erichthonios" } 105.1 "Intemperate Torment" Ability { id: "65EF", source: "Erichthonios" } -107.7 "Hot Spell/Cold Spell 1" Ability { id: "(65F0|54F1)", source: "Erichthonios" } -116.7 "Hot Spell/Cold Spell 2" Ability { id: "(6CC5|6CC6)", source: "Erichthonios" } -125.7 "Hot Spell/Cold Spell 3" Ability { id: "(6CC5|6CC6)", source: "Erichthonios" } +107.7 "Hot Spell/Cold Spell 1" Ability { id: ["65F0", "54F1"], source: "Erichthonios" } +116.7 "Hot Spell/Cold Spell 2" Ability { id: ["6CC5", "6CC6"], source: "Erichthonios" } +125.7 "Hot Spell/Cold Spell 3" Ability { id: ["6CC5", "6CC6"], source: "Erichthonios" } 135.3 "Warder's Wrath" Ability { id: "65F4", source: "Erichthonios" } 147.6 "Heavy Hand" Ability { id: "65F3", source: "Erichthonios" } 162.7 "Shining Cells" Ability { id: "65E9", source: "Erichthonios" } 174.9 "Aetherchain" Ability { id: "65EB", source: "Erichthonios" } -175.8 "Powerful Fire/Powerful Light" Ability { id: "(65EC|65ED)", source: "Erichthonios" } +175.8 "Powerful Fire/Powerful Light" Ability { id: ["65EC", "65ED"], source: "Erichthonios" } 183.1 "Aetherchain" Ability { id: "65EB", source: "Erichthonios" } -184.0 "Powerful Fire/Powerful Light" Ability { id: "(65EC|65ED)", source: "Erichthonios" } +184.0 "Powerful Fire/Powerful Light" Ability { id: ["65EC", "65ED"], source: "Erichthonios" } ## Beginning of Loop 188.3 "--middle--" Ability { id: "65F5", source: "Erichthonios" } # Fourth Gaoler's Flail -198.7 "Aetherflail Left/Aetherflail Right" Ability { id: "(6DA3|6DA2)", source: "Erichthonios" } -198.8 "Powerful Fire/Powerful Light" Ability { id: "(65EC|65ED)", source: "Erichthonios" } -209.8 "Aetherflail Right/Aetherflail Left" Ability { id: "(6DA2|6DA3)", source: "Erichthonios" } -209.9 "Powerful Fire/Powerful Light" Ability { id: "(65EC|65ED)", source: "Erichthonios" } +198.7 "Aetherflail Left/Aetherflail Right" Ability { id: ["6DA3", "6DA2"], source: "Erichthonios" } +198.8 "Powerful Fire/Powerful Light" Ability { id: ["65EC", "65ED"], source: "Erichthonios" } +209.8 "Aetherflail Right/Aetherflail Left" Ability { id: ["6DA2", "6DA3"], source: "Erichthonios" } +209.9 "Powerful Fire/Powerful Light" Ability { id: ["65EC", "65ED"], source: "Erichthonios" } 214.3 "--knockback stack--" Ability { id: "6D15", source: "Erichthonios" } 219.6 "Pitiless Flail" Ability { id: "65E5", source: "Erichthonios" } 226.7 "True Holy" Ability { id: "65E7", source: "Erichthonios" } 232.9 "--middle--" Ability { id: "65F5", source: "Erichthonios" } # Sixth Gaoler's Flail -243.3 "Aetherflail Left/Aetherflail Right" Ability { id: "(6DA3|6DA2)", source: "Erichthonios" } -243.4 "Powerful Fire/Powerful Light" Ability { id: "(65EC|65ED)", source: "Erichthonios" } +243.3 "Aetherflail Left/Aetherflail Right" Ability { id: ["6DA3", "6DA2"], source: "Erichthonios" } +243.4 "Powerful Fire/Powerful Light" Ability { id: ["65EC", "65ED"], source: "Erichthonios" } 260.8 "Slam Shut" Ability { id: "65EA", source: "Erichthonios" } 270.0 "Intemperance" Ability { id: "65EE", source: "Erichthonios" } 274.1 "--middle--" Ability { id: "65F5", source: "Erichthonios" } 281.7 "Intemperate Torment" Ability { id: "65EF", source: "Erichthonios" } -284.3 "Hot Spell/Cold Spell 1" Ability { id: "(65F0|54F1)", source: "Erichthonios" } -293.3 "Hot Spell/Cold Spell 2" Ability { id: "(6CC5|6CC6)", source: "Erichthonios" } -302.3 "Hot Spell/Cold Spell 3" Ability { id: "(6CC5|6CC6)", source: "Erichthonios" } -305.6 "Gaoler's Flail Right/Gaoler's Flail Left" Ability { id: "(6DA2|6DA3)", source: "Erichthonios" } +284.3 "Hot Spell/Cold Spell 1" Ability { id: ["65F0", "54F1"], source: "Erichthonios" } +293.3 "Hot Spell/Cold Spell 2" Ability { id: ["6CC5", "6CC6"], source: "Erichthonios" } +302.3 "Hot Spell/Cold Spell 3" Ability { id: ["6CC5", "6CC6"], source: "Erichthonios" } +305.6 "Gaoler's Flail Right/Gaoler's Flail Left" Ability { id: ["6DA2", "6DA3"], source: "Erichthonios" } 316.1 "Warder's Wrath" Ability { id: "65F4", source: "Erichthonios" } 327.3 "Warder's Wrath" Ability { id: "65F4", source: "Erichthonios" } 336.6 "Heavy Hand" Ability { id: "65F3", source: "Erichthonios" } @@ -70,10 +70,10 @@ hideall "--sync--" # Repeat 360.0 "--middle--" Ability { id: "65F5", source: "Erichthonios" } window 50,50 jump 188.3 -370.3 "Aetherflail Left/Aetherflail Right" #Ability { id: "(6DA3|6DA2)", source: "Erichthonios" } -370.4 "Powerful Fire/Powerful Light" #Ability { id: "(65EC|65ED)", source: "Erichthonios" } -381.4 "Aetherflail Right/Aetherflail Left" #Ability { id: "(6DA2|6DA3)", source: "Erichthonios" } -381.5 "Powerful Fire/Powerful Light" #Ability { id: "(65EC|65ED)", source: "Erichthonios" } +370.3 "Aetherflail Left/Aetherflail Right" #Ability { id: ["6DA3", "6DA2"], source: "Erichthonios" } +370.4 "Powerful Fire/Powerful Light" #Ability { id: ["65EC", "65ED"], source: "Erichthonios" } +381.4 "Aetherflail Right/Aetherflail Left" #Ability { id: ["6DA2", "6DA3"], source: "Erichthonios" } +381.5 "Powerful Fire/Powerful Light" #Ability { id: ["65EC", "65ED"], source: "Erichthonios" } 385.9 "--knockback stack--" #Ability { id: "6D15", source: "Erichthonios" } 391.2 "Pitiless Flail" #Ability { id: "65E5", source: "Erichthonios" } 398.3 "True Holy" #Ability { id: "65E7", source: "Erichthonios" } diff --git a/ui/raidboss/data/06-ew/raid/p1s.txt b/ui/raidboss/data/06-ew/raid/p1s.txt index 76fe3ef0cd..38719251d7 100644 --- a/ui/raidboss/data/06-ew/raid/p1s.txt +++ b/ui/raidboss/data/06-ew/raid/p1s.txt @@ -42,7 +42,7 @@ hideall "--sync--" # Tiles 1 118.5 "Intemperance" Ability { id: "661E", source: "Erichthonios" } 122.6 "--sync--" Ability { id: "65F5", source: "Erichthonios" } -134.4 "Intemperate Torment" Ability { id: "(661F|6620)", source: "Erichthonios" } +134.4 "Intemperate Torment" Ability { id: ["661F", "6620"], source: "Erichthonios" } 135.3 "First Element" Ability { id: "6621", source: "Erichthonios" } 141.4 "Warder's Wrath" Ability { id: "662A", source: "Erichthonios" } 146.4 "Second Element" Ability { id: "6621", source: "Erichthonios" } @@ -84,7 +84,7 @@ hideall "--sync--" # Tiles 2 341.6 "Intemperance" Ability { id: "661E", source: "Erichthonios" } 345.7 "--sync--" Ability { id: "65F5", source: "Erichthonios" } -357.4 "Intemperate Torment" Ability { id: "(661F|6620)", source: "Erichthonios" } +357.4 "Intemperate Torment" Ability { id: ["661F", "6620"], source: "Erichthonios" } 358.6 "First Element" Ability { id: "6621", source: "Erichthonios" } 369.6 "Second Element" Ability { id: "6621", source: "Erichthonios" } 374.0 "Gaoler's Flail In/Out" Ability { id: "6DA[2-9A-D]", source: "Erichthonios" } window 3,2 diff --git a/ui/raidboss/data/06-ew/raid/p2n.txt b/ui/raidboss/data/06-ew/raid/p2n.txt index e2dcf5d3a8..584e6f91c5 100644 --- a/ui/raidboss/data/06-ew/raid/p2n.txt +++ b/ui/raidboss/data/06-ew/raid/p2n.txt @@ -12,8 +12,8 @@ hideall "--sync--" 14.3 "Murky Depths" Ability { id: "680F", source: "Hippokampos" } 26.6 "Doubled Impact" Ability { id: "680E", source: "Hippokampos" } 32.8 "--middle--" Ability { id: "6835", source: "Hippokampos" } -43.6 "Spoken Cataract" Ability { id: "(67F7|67F8|67F9|67FD)", source: "Hippokampos" } -58.3 "Spoken Cataract" Ability { id: "(67F7|67F8|67F9|67FD)", source: "Hippokampos" } +43.6 "Spoken Cataract" Ability { id: ["67F7", "67F8", "67F9", "67FD"], source: "Hippokampos" } +58.3 "Spoken Cataract" Ability { id: ["67F7", "67F8", "67F9", "67FD"], source: "Hippokampos" } 72.0 "Murky Depths" Ability { id: "680F", source: "Hippokampos" } 77.2 "--middle--" Ability { id: "6835", source: "Hippokampos" } 84.6 "Sewage Deluge" Ability { id: "67F6", source: "Hippokampos" } @@ -32,11 +32,11 @@ hideall "--sync--" 201.0 "--middle--" Ability { id: "6835", source: "Hippokampos" } 208.6 "Sewage Deluge" Ability { id: "67F6", source: "Hippokampos" } 227.1 "Tainted Flood" Ability { id: "6809", source: "Hippokampos" } -235.0 "Spoken Cataract" Ability { id: "(67F7|67F8|67F9|67FD)", source: "Hippokampos" } +235.0 "Spoken Cataract" Ability { id: ["67F7", "67F8", "67F9", "67FD"], source: "Hippokampos" } 250.7 "Sewage Eruption 1" #Ability { id: "680D", source: "Hippokampos" } 252.2 "Sewage Eruption 2" #Ability { id: "680D", source: "Hippokampos" } 253.7 "Sewage Eruption 3" #Ability { id: "680D", source: "Hippokampos" } -259.5 "Spoken Cataract" Ability { id: "(67F7|67F8|67F9|67FD)", source: "Hippokampos" } +259.5 "Spoken Cataract" Ability { id: ["67F7", "67F8", "67F9", "67FD"], source: "Hippokampos" } 273.4 "Tainted Flood" Ability { id: "6809", source: "Hippokampos" } 279.8 "Predatory Sight" Ability { id: "680B", source: "Hippokampos" } 287.0 "Murky Depths" Ability { id: "680F", source: "Hippokampos" } @@ -62,5 +62,5 @@ hideall "--sync--" 392.3 "--middle--" Ability { id: "6835", source: "Hippokampos" } window 50,50 jump 201.0 399.7 "Sewage Deluge" #Ability { id: "67F6", source: "Hippokampos" } 418.2 "Tainted Flood" #Ability { id: "6809", source: "Hippokampos" } -426.1 "Spoken Cataract" #Ability { id: "(67F7|67F8|67F9|67FD)", source: "Hippokampos" } +426.1 "Spoken Cataract" #Ability { id: ["67F7", "67F8", "67F9", "67FD"], source: "Hippokampos" } 441.8 "Sewage Eruption 1" #Ability { id: "680D", source: "Hippokampos" } diff --git a/ui/raidboss/data/06-ew/raid/p2s.txt b/ui/raidboss/data/06-ew/raid/p2s.txt index fedb96f01d..221081f38d 100644 --- a/ui/raidboss/data/06-ew/raid/p2s.txt +++ b/ui/raidboss/data/06-ew/raid/p2s.txt @@ -15,7 +15,7 @@ hideall "--sync--" 31.5 "--middle--" Ability { id: "6836", source: "Hippokampos" } 38.8 "Sewage Deluge" Ability { id: "6810", source: "Hippokampos" } 48.0 "--middle--" Ability { id: "6836", source: "Hippokampos" } -61.8 "Spoken Cataract/Winged Cataract" Ability { id: "(6811|6812|6813|6814|6815|6816|6817|6818)", source: "Hippokampos" } +61.8 "Spoken Cataract/Winged Cataract" Ability { id: ["6811", "6812", "6813", "6814", "6815", "6816", "6817", "6818"], source: "Hippokampos" } 81.9 "Coherence" Ability { id: "681B", source: "Hippokampos" } 82.6 "Coherence Flare" Ability { id: "681A", source: "Hippokampos" } 85.1 "Coherence Line" Ability { id: "681C", source: "Hippokampos" } @@ -28,11 +28,11 @@ hideall "--sync--" # Predatory Avarice and Channeling Flow 128.1 "--middle--" Ability { id: "6836", source: "Hippokampos" } 134.5 "Predatory Avarice" Ability { id: "6827", source: "Hippokampos" } -152.2 "Winged Cataract/Spoken Cataract" Ability { id: "(6811|6812|6813|6814|6815|6816|6817|6818)", source: "Hippokampos" } +152.2 "Winged Cataract/Spoken Cataract" Ability { id: ["6811", "6812", "6813", "6814", "6815", "6816", "6817", "6818"], source: "Hippokampos" } 158.5 "Hard Water" Ability { id: "6828", source: "Hippokampos" } 158.5 "Deadly Current" #sync Ability { id: "6829", source: "Hippokampos" } 171.9 "Channeling Flow" Ability { id: "681E", source: "Hippokampos" } -187.2 "Great Typhoon" Ability { id: "(6820|6822)", source: "Hippokampos" } +187.2 "Great Typhoon" Ability { id: ["6820", "6822"], source: "Hippokampos" } 187.7 "Crash" #Ability { id: "6821", source: "Hippokampos" } 202.2 "Doubled Impact" Ability { id: "6832", source: "Hippokampos" } 212.3 "Murky Depths" Ability { id: "6833", source: "Hippokampos" } @@ -58,13 +58,13 @@ hideall "--sync--" 304.4 "Channeling Overflow" Ability { id: "6DC2", source: "Hippokampos" } 311.6 "--sync--" Ability { id: "6837", source: "Hippokampos" } 318.7 "Tainted Flood" Ability { id: "6838", source: "Hippokampos" } -319.7 "Great Typhoon (short)" Ability { id: "(6820|6822)", source: "Hippokampos" } +319.7 "Great Typhoon (short)" Ability { id: ["6820", "6822"], source: "Hippokampos" } 320.2 "Crash" #Ability { id: "6821", source: "Hippokampos" } 327.0 "--sync--" Ability { id: "6837", source: "Hippokampos" } 334.1 "Tainted Flood" Ability { id: "6838", source: "Hippokampos" } -334.7 "Great Typhoon (long)" Ability { id: "(6820|6822)", source: "Hippokampos" } +334.7 "Great Typhoon (long)" Ability { id: ["6820", "6822"], source: "Hippokampos" } 335.2 "Crash" #Ability { id: "6821", source: "Hippokampos" } -345.2 "Spoken Cataract/Winged Cataract" Ability { id: "(6811|6812|6813|6814|6815|6816|6817|6818)", source: "Hippokampos" } +345.2 "Spoken Cataract/Winged Cataract" Ability { id: ["6811", "6812", "6813", "6814", "6815", "6816", "6817", "6818"], source: "Hippokampos" } # Dissociation and Sewage Eruption 1 357.9 "--middle--" Ability { id: "6836", source: "Hippokampos" } @@ -74,7 +74,7 @@ hideall "--sync--" 388.5 "Hard Water" Ability { id: "6828", source: "Hippokampos" } 388.5 "Deadly Current" #Ability { id: "6829", source: "Hippokampos" } 388.9 "Dissociation Dive" #Ability { id: "682E", source: "Hippokampos" } -388.9 "Winged Cataract/Spoken Cataract" #Ability { id: "(6811|6812|6813|6814|6815|6816|6817|6818)", source: "Hippokampos" } +388.9 "Winged Cataract/Spoken Cataract" #Ability { id: ["6811", "6812", "6813", "6814", "6815", "6816", "6817", "6818"], source: "Hippokampos" } 402.6 "Dissociation" Ability { id: "682C", source: "Hippokampos" } 407.7 "--sync--" Ability { id: "682D", source: "Hippokampos" } 415.8 "Sewage Eruption" Ability { id: "6830", source: "Hippokampos" } @@ -96,13 +96,13 @@ hideall "--sync--" 479.2 "Sewage Deluge" Ability { id: "6810", source: "Hippokampos" } 488.4 "--middle--" Ability { id: "6836", source: "Hippokampos" } 496.1 "Channeling Overflow" Ability { id: "6DC2", source: "Hippokampos" } -511.3 "Great Typhoon (short)" Ability { id: "(6820|6822)", source: "Hippokampos" } +511.3 "Great Typhoon (short)" Ability { id: ["6820", "6822"], source: "Hippokampos" } 511.8 "Crash" #Ability { id: "6821", source: "Hippokampos" } 513.5 "Coherence" Ability { id: "681B", source: "Hippokampos" } 514.2 "Coherence Flare" Ability { id: "681A", source: "Hippokampos" } 516.6 "Coherence Line" Ability { id: "681C", source: "Hippokampos" } 518.6 "--sync--" Ability { id: "681D", source: "Hippokampos" } -526.2 "Great Typhoon (long)" Ability { id: "(6820|6822)", source: "Hippokampos" } +526.2 "Great Typhoon (long)" Ability { id: ["6820", "6822"], source: "Hippokampos" } 526.7 "Crash" #Ability { id: "6821", source: "Hippokampos" } # Dissociation and Sewage Eruption 2 diff --git a/ui/raidboss/data/06-ew/raid/p3n.txt b/ui/raidboss/data/06-ew/raid/p3n.txt index d186c872d3..c6b0001d21 100644 --- a/ui/raidboss/data/06-ew/raid/p3n.txt +++ b/ui/raidboss/data/06-ew/raid/p3n.txt @@ -11,11 +11,11 @@ hideall "--sync--" # -p 66AD:118 66A3: 200 0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1 -9.1 "--sync--" StartsUsing { id: "(6696|6698)", source: "Phoinix" } window 9.1,5 -13.8 "Experimental Fireplume" Ability { id: "(6696|6698)", source: "Phoinix" } window 13.8,5 -19.0 "--giant fireplume?--" #Ability { id: "(6697|6699)", source: "Phoinix" } -31.0 "Experimental Fireplume" Ability { id: "(6696|6698)", source: "Phoinix" } -37.1 "--giant fireplume?--" #Ability { id: "(6697|6699)", source: "Phoinix" } +9.1 "--sync--" StartsUsing { id: ["6696", "6698"], source: "Phoinix" } window 9.1,5 +13.8 "Experimental Fireplume" Ability { id: ["6696", "6698"], source: "Phoinix" } window 13.8,5 +19.0 "--giant fireplume?--" #Ability { id: ["6697", "6699"], source: "Phoinix" } +31.0 "Experimental Fireplume" Ability { id: ["6696", "6698"], source: "Phoinix" } +37.1 "--giant fireplume?--" #Ability { id: ["6697", "6699"], source: "Phoinix" } 49.2 "Scorched Exaltation" Ability { id: "66B8", source: "Phoinix" } 61.4 "Heat of Condemnation" Ability { id: "66B2", source: "Phoinix" } window 61.4,10 75.6 "Darkened Fire" Ability { id: "6EDA", source: "Phoinix" } @@ -24,7 +24,7 @@ hideall "--sync--" 87.2 "Brightened Fire #2" #Ability { id: "6EDD", source: "Phoinix" } 88.4 "Brightened Fire #3" #Ability { id: "6EDD", source: "Phoinix" } 89.5 "Brightened Fire #4" #Ability { id: "6EDD", source: "Phoinix" } -105.6 "Left Cinderwing/Right Cinderwing" Ability { id: "(66B4|66B5)", source: "Phoinix" } +105.6 "Left Cinderwing/Right Cinderwing" Ability { id: ["66B4", "66B5"], source: "Phoinix" } # There might be an enrage here? More data will be needed. 110.7 "--untargetable--" @@ -48,7 +48,7 @@ hideall "--sync--" 206.2 "Joint Pyre" Ability { id: "66A5", source: "Sparkfledged" } 209.1 "--sync--" Ability { id: "66AC", source: "Phoinix" } 221.2 "Dead Rebirth" Ability { id: "66A9", source: "Phoinix" } window 221.2,60 -231.4 "Left Cinderwing/Right Cinderwing" Ability { id: "(66B4|66B5)", source: "Phoinix" } +231.4 "Left Cinderwing/Right Cinderwing" Ability { id: ["66B4", "66B5"], source: "Phoinix" } 239.6 "Fledgling Flight" Ability { id: "66AA", source: "Phoinix" } 253.8 "Ashen Eye #1" #Ability { id: "66AB", source: "Sparkfledged" } 255.7 "Ashen Eye #2" #Ability { id: "66AB", source: "Sparkfledged" } @@ -66,8 +66,8 @@ hideall "--sync--" 316.8 "Scorched Exaltation" Ability { id: "66B8", source: "Phoinix" } 326.0 "Experimental Charplume" Ability { id: "669C", source: "Phoinix" } 331.1 "Charplume" Ability { id: "669D", source: "Phoinix" } -335.1 "Experimental Fireplume" Ability { id: "(6696|6698)", source: "Phoinix" } window 30,30 -341.2 "--giant fireplume?--" #Ability { id: "(6697|6699)", source: "Phoinix" } +335.1 "Experimental Fireplume" Ability { id: ["6696", "6698"], source: "Phoinix" } window 30,30 +341.2 "--giant fireplume?--" #Ability { id: ["6697", "6699"], source: "Phoinix" } 349.2 "--untargetable--" 356.5 "Trail of Condemnation" Ability { id: "66AD", source: "Phoinix" } 361.2 "--targetable--" @@ -79,8 +79,8 @@ hideall "--sync--" 394.3 "Ashen Eye #2" #Ability { id: "66AB", source: "Sparkfledged" } 396.3 "Ashen Eye #3" #Ability { id: "66AB", source: "Sparkfledged" } 398.3 "Ashen Eye #4" #Ability { id: "66AB", source: "Sparkfledged" } -399.7 "Experimental Fireplume" Ability { id: "(6696|6698)", source: "Phoinix" } -405.8 "--giant fireplume?--" #Ability { id: "(6697|6699)", source: "Phoinix" } +399.7 "Experimental Fireplume" Ability { id: ["6696", "6698"], source: "Phoinix" } +405.8 "--giant fireplume?--" #Ability { id: ["6697", "6699"], source: "Phoinix" } 405.9 "--sync--" Ability { id: "66AC", source: "Phoinix" } 417.0 "--sync--" Ability { id: "66B6", source: "Phoinix" } 420.1 "Searing Breeze x3" #Ability { id: "66B7", source: "Phoinix" } @@ -92,12 +92,12 @@ hideall "--sync--" 445.2 "Brightened Fire #2" #Ability { id: "6EDD", source: "Phoinix" } 446.3 "Brightened Fire #3" #Ability { id: "6EDD", source: "Phoinix" } 447.5 "Brightened Fire #4" #Ability { id: "6EDD", source: "Phoinix" } -463.6 "Left Cinderwing/Right Cinderwing" Ability { id: "(66B4|66B5)", source: "Phoinix" } window 30,30 +463.6 "Left Cinderwing/Right Cinderwing" Ability { id: ["66B4", "66B5"], source: "Phoinix" } window 30,30 474.7 "Scorched Exaltation" Ability { id: "66B8", source: "Phoinix" } 484.9 "Experimental Charplume" Ability { id: "669C", source: "Phoinix" } 490.0 "Charplume" Ability { id: "669D", source: "Phoinix" } -494.0 "Experimental Fireplume" Ability { id: "(6696|6698)", source: "Phoinix" } window 30,30 -500.1 "--giant fireplume?--" #Ability { id: "(6697|6699)", source: "Phoinix" } +494.0 "Experimental Fireplume" Ability { id: ["6696", "6698"], source: "Phoinix" } window 30,30 +500.1 "--giant fireplume?--" #Ability { id: ["6697", "6699"], source: "Phoinix" } 508.1 "--untargetable--" 515.4 "Trail of Condemnation" Ability { id: "66AD", source: "Phoinix" } 518.9 "Flare of Condemnation" Ability { id: "66B0", source: "Phoinix" } diff --git a/ui/raidboss/data/06-ew/raid/p3s.txt b/ui/raidboss/data/06-ew/raid/p3s.txt index 67f4692707..8b46a863de 100644 --- a/ui/raidboss/data/06-ew/raid/p3s.txt +++ b/ui/raidboss/data/06-ew/raid/p3s.txt @@ -15,26 +15,26 @@ hideall "--sync--" 13.7 "Scorched Exaltation" Ability { id: "6706", source: "Phoinix" } 22.8 "Heat of Condemnation" Ability { id: "6700", source: "Phoinix" } -34.0 "Experimental Fireplume" Ability { id: "(66BE|66C0)", source: "Phoinix" } +34.0 "Experimental Fireplume" Ability { id: ["66BE", "66C0"], source: "Phoinix" } 40.1 "--giant fireplume?--" #Ability { id: "66BF", source: "Phoinix" } -44.6 "Left Cinderwing/Right Cinderwing" Ability { id: "(6702|6703)", source: "Phoinix" } +44.6 "Left Cinderwing/Right Cinderwing" Ability { id: ["6702", "6703"], source: "Phoinix" } 58.8 "Darkened Fire" Ability { id: "66B9", source: "Phoinix" } 69.0 "Brightened Fire x8" Ability { id: "66BC", source: "Phoinix" } duration 8.7 96.5 "Heat of Condemnation" Ability { id: "6700", source: "Phoinix" } 104.7 "Scorched Exaltation" Ability { id: "6706", source: "Phoinix" } 114.9 "Devouring Brand" Ability { id: "66CE", source: "Phoinix" } -122.0 "Experimental Fireplume" Ability { id: "(66BE|66C0)", source: "Phoinix" } +122.0 "Experimental Fireplume" Ability { id: ["66BE", "66C0"], source: "Phoinix" } 128.2 "--giant fireplume?--" #Ability { id: "66BF", source: "Phoinix" } 131.9 "--fire expands--" Ability { id: "6D83", source: "Phoinix" } 132.2 "Searing Breeze" Ability { id: "6704", source: "Phoinix" } -140.4 "Left Cinderwing/Right Cinderwing" Ability { id: "(6702|6703)", source: "Phoinix" } +140.4 "Left Cinderwing/Right Cinderwing" Ability { id: ["6702", "6703"], source: "Phoinix" } 149.5 "Heat of Condemnation" Ability { id: "6700", source: "Phoinix" } -157.6 "Experimental Fireplume" Ability { id: "(66BE|66C0)", source: "Phoinix" } +157.6 "Experimental Fireplume" Ability { id: ["66BE", "66C0"], source: "Phoinix" } 163.7 "--giant fireplume?--" #Ability { id: "66BF", source: "Phoinix" } 162.2 "--untargetable--" -172.0 "Trail of Condemnation" Ability { id: "(66FB|66FC)", source: "Phoinix" } -173.6 "Flare of Condemnation/Sparks of Condemnation" Ability { id: "(66FE|66FF)", source: "Phoinix" } +172.0 "Trail of Condemnation" Ability { id: ["66FB", "66FC"], source: "Phoinix" } +173.6 "Flare of Condemnation/Sparks of Condemnation" Ability { id: ["66FE", "66FF"], source: "Phoinix" } # Adds Phase 1 180.8 "--adds targetable--" @@ -77,8 +77,8 @@ hideall "--sync--" 564.8 "--sync--" Ability { id: "66AC", source: "Phoinix" } 574.9 "Experimental Gloryplume" Ability { id: "66CA", source: "Phoinix" } -577.5 "--sync--" Ability { id: "(66CC|66C8)", source: "Phoinix" } -588.1 "Gloryplume" Ability { id: "(66CD|66C9)", source: "Phoinix" } +577.5 "--sync--" Ability { id: ["66CC", "66C8"], source: "Phoinix" } +588.1 "Gloryplume" Ability { id: ["66CD", "66C9"], source: "Phoinix" } 606.1 "Fountain of Fire" Ability { id: "66E7", source: "Phoinix" } 614.2 "Sun's Pinion" Ability { id: "66EA", source: "Phoinix" } 614.2 "Sun's Pinion 1" Ability { id: "66EB", source: "Phoinix" } @@ -97,12 +97,12 @@ hideall "--sync--" 676.5 "Flames of Asphodelos" Ability { id: "66F1", source: "Phoinix" } 681.7 "Blazing Rain" Ability { id: "66D2", source: "Phoinix" } -683.7 "Experimental Ashplume" Ability { id: "(66C2|66C4)", source: "Phoinix" } +683.7 "Experimental Ashplume" Ability { id: ["66C2", "66C4"], source: "Phoinix" } 684.5 "Flames of Asphodelos 1" Ability { id: "66F2", source: "Phoinix" } 685.5 "Flames of Asphodelos 2" Ability { id: "66F3", source: "Phoinix" } 686.5 "Flames of Asphodelos 3" Ability { id: "66F4", source: "Phoinix" } 687.8 "Blazing Rain" Ability { id: "66D2", source: "Phoinix" } -689.8 "Ashplume" Ability { id: "(66C3|66C5)", source: "Phoinix" } +689.8 "Ashplume" Ability { id: ["66C3", "66C5"], source: "Phoinix" } 694.8 "Flames of Asphodelos" Ability { id: "66F1", source: "Phoinix" } 696.9 "Blazing Rain" Ability { id: "66D2", source: "Phoinix" } @@ -119,11 +119,11 @@ hideall "--sync--" 726.1 "Searing Breeze" Ability { id: "6704", source: "Phoinix" } 728.1 "Blazing Rain" Ability { id: "66D2", source: "Phoinix" } -735.2 "Experimental Ashplume" Ability { id: "(66C2|66C4)", source: "Phoinix" } +735.2 "Experimental Ashplume" Ability { id: ["66C2", "66C4"], source: "Phoinix" } 736.2 "Blazing Rain" Ability { id: "66D2", source: "Phoinix" } 738.0 "Dark Twister" Ability { id: "66F9", source: "Darkblaze Twister" } 740.0 "Burning Twister" Ability { id: "66FA", source: "Darkblaze Twister" } -742.3 "Ashplume" Ability { id: "(66C3|66C5)", source: "Phoinix" } +742.3 "Ashplume" Ability { id: ["66C3", "66C5"], source: "Phoinix" } 749.3 "Scorched Exaltation" Ability { id: "6706", source: "Phoinix" } 762.5 "Death's Toll" Ability { id: "66ED", source: "Phoinix" } @@ -134,17 +134,17 @@ hideall "--sync--" 798.1 "--sync--" Ability { id: "66AC", source: "Phoinix" } 807.2 "Experimental Gloryplume" Ability { id: "66C6", source: "Phoinix" } -809.8 "--sync--" Ability { id: "(66CC|66C8)", source: "Phoinix" } -814.4 "Gloryplume" Ability { id: "(66CD|66C9)", source: "Phoinix" } +809.8 "--sync--" Ability { id: ["66CC", "66C8"], source: "Phoinix" } +814.4 "Gloryplume" Ability { id: ["66CD", "66C9"], source: "Phoinix" } 817.3 "--untargetable--" -827.1 "Trail of Condemnation" Ability { id: "(66FB|66FC)", source: "Phoinix" } -828.7 "Flare of Condemnation/Sparks of Condemnation" Ability { id: "(66FE|66FF)", source: "Phoinix" } +827.1 "Trail of Condemnation" Ability { id: ["66FB", "66FC"], source: "Phoinix" } +828.7 "Flare of Condemnation/Sparks of Condemnation" Ability { id: ["66FE", "66FF"], source: "Phoinix" } 831.8 "--targetable--" 839.9 "Devouring Brand" Ability { id: "66CE", source: "Phoinix" } 847.0 "Experimental Fireplume" Ability { id: "66BE", source: "Phoinix" } 856.9 "Devouring Brand" Ability { id: "6D83", source: "Phoinix" } 857.2 "Searing Breeze" Ability { id: "6704", source: "Phoinix" } -865.4 "Left Cinderwing/Right Cinderwing" Ability { id: "(6702|6703)", source: "Phoinix" } +865.4 "Left Cinderwing/Right Cinderwing" Ability { id: ["6702", "6703"], source: "Phoinix" } 876.5 "Scorched Exaltation" Ability { id: "6706", source: "Phoinix" } 883.6 "Scorched Exaltation" Ability { id: "6706", source: "Phoinix" } diff --git a/ui/raidboss/data/06-ew/raid/p4n.txt b/ui/raidboss/data/06-ew/raid/p4n.txt index c7dd394fd8..432c7a6575 100644 --- a/ui/raidboss/data/06-ew/raid/p4n.txt +++ b/ui/raidboss/data/06-ew/raid/p4n.txt @@ -39,10 +39,10 @@ hideall "--sync--" 132.5 "Setting the Scene 3" Ability { id: "69CB", source: "Hesperos" } 144.7 "Pinax" Ability { id: "69CF", source: "Hesperos" } -154.8 "Well Pinax/Levinstrike Pinax" Ability { id: "(6A3E|6A3F)", source: "Hesperos" } +154.8 "Well Pinax/Levinstrike Pinax" Ability { id: ["6A3E", "6A3F"], source: "Hesperos" } 162.0 "Hell Skewer" Ability { id: "6A4F", source: "Hesperos" } 165.7 "Acid Pinax" Ability { id: "6A3C", source: "Hesperos" } -176.7 "Levinstrike Pinax/Well Pinax" Ability { id: "(6A3E|6A3F)", source: "Hesperos" } +176.7 "Levinstrike Pinax/Well Pinax" Ability { id: ["6A3E", "6A3F"], source: "Hesperos" } 184.1 "Hell Skewer" Ability { id: "6A4F", source: "Hesperos" } 199.3 "Bloodrake" Ability { id: "6A40", source: "Hesperos" } 208.4 "Belone Coils" Ability { id: "69DD", source: "Hesperos" } @@ -51,14 +51,14 @@ hideall "--sync--" 232.5 "Decollation" Ability { id: "6A51", source: "Hesperos" } 239.7 "--middle--" Ability { id: "69CE", source: "Hesperos" } -248.4 "Directional Shift" Ability { id: "(6A4A|6A4B|6A4C|6A4D)", source: "Hesperos" } +248.4 "Directional Shift" Ability { id: ["6A4A", "6A4B", "6A4C", "6A4D"], source: "Hesperos" } 249.9 "Shifting Strike (cleave)" Ability { id: "6A4E", source: "Hesperos" } 257.6 "--middle--" Ability { id: "69CE", source: "Hesperos" } -266.2 "Directional Shift" Ability { id: "(6DAE|6DAF|6DB0|6DB1)", source: "Hesperos" } +266.2 "Directional Shift" Ability { id: ["6DAE", "6DAF", "6DB0", "6DB1"], source: "Hesperos" } 267.9 "Shifting Strike (knockback)" Ability { id: "6DB2", source: "Hesperos" } 269.4 "--middle--" Ability { id: "69CE", source: "Hesperos" } -278.4 "Directional Shift" Ability { id: "(6A4A|6A4B|6A4C|6A4D|6DAE|6DAF|6DB0|6DB1)", source: "Hesperos" } -279.9 "Shifting Strike" Ability { id: "(6DB2|6A4E)", source: "Hesperos" } +278.4 "Directional Shift" Ability { id: ["6A4A", "6A4B", "6A4C", "6A4D", "6DAE", "6DAF", "6DB0", "6DB1"], source: "Hesperos" } +279.9 "Shifting Strike" Ability { id: ["6DB2", "6A4E"], source: "Hesperos" } 285.6 "--middle--" Ability { id: "69CE", source: "Hesperos" } 292.3 "Bloodrake" Ability { id: "6A40", source: "Hesperos" } @@ -69,17 +69,17 @@ hideall "--sync--" 335.9 "Setting the Scene" Ability { id: "69CB", source: "Hesperos" } 349.1 "Bloodrake" Ability { id: "6A40", source: "Hesperos" } 358.3 "Pinax" Ability { id: "69CF", source: "Hesperos" } -368.4 "Pinax 1" Ability { id: "(6A3C|6A3D|6A3E|6A3F)", source: "Hesperos" } +368.4 "Pinax 1" Ability { id: ["6A3C", "6A3D", "6A3E", "6A3F"], source: "Hesperos" } 371.5 "Hell Skewer" Ability { id: "6A4F", source: "Hesperos" } -379.4 "Pinax 2" Ability { id: "(6A3C|6A3D|6A3E|6A3F)", source: "Hesperos" } +379.4 "Pinax 2" Ability { id: ["6A3C", "6A3D", "6A3E", "6A3F"], source: "Hesperos" } 380.7 "--sync--" Ability { id: "69CE", source: "Hesperos" } 386.3 "Belone Coils" Ability { id: "69DD", source: "Hesperos" } -390.4 "Pinax 3" Ability { id: "(6A3C|6A3D|6A3E|6A3F)", source: "Hesperos" } +390.4 "Pinax 3" Ability { id: ["6A3C", "6A3D", "6A3E", "6A3F"], source: "Hesperos" } 397.1 "Burst" Ability { id: "6A4[456]", source: "Hesperos" } -403.4 "Pinax 4" Ability { id: "(6A3C|6A3D|6A3E|6A3F)", source: "Hesperos" } +403.4 "Pinax 4" Ability { id: ["6A3C", "6A3D", "6A3E", "6A3F"], source: "Hesperos" } 404.5 "--middle--" Ability { id: "69CE", source: "Hesperos" } -413.5 "Directional Shift" Ability { id: "(6A4A|6A4B|6A4C|6A4D|6DAE|6DAF|6DB0|6DB1)", source: "Hesperos" } -415.0 "Shifting Strike" Ability { id: "(6DB2|6A4E)", source: "Hesperos" } +413.5 "Directional Shift" Ability { id: ["6A4A", "6A4B", "6A4C", "6A4D", "6DAE", "6DAF", "6DB0", "6DB1"], source: "Hesperos" } +415.0 "Shifting Strike" Ability { id: ["6DB2", "6A4E"], source: "Hesperos" } 428.9 "Decollation" Ability { id: "6A51", source: "Hesperos" } 438.1 "Bloodrake" Ability { id: "6A40", source: "Hesperos" } @@ -94,6 +94,6 @@ hideall "--sync--" 502.7 "Setting the Scene" Ability { id: "69CB", source: "Hesperos" } window 50,50 jump 335.9 515.9 "Bloodrake" #Ability { id: "6A40", source: "Hesperos" } 525.1 "Pinax" #Ability { id: "69CF", source: "Hesperos" } -535.2 "Pinax 1" #Ability { id: "(6A3C|6A3D|6A3E|6A3F)", source: "Hesperos" } +535.2 "Pinax 1" #Ability { id: ["6A3C", "6A3D", "6A3E", "6A3F"], source: "Hesperos" } 538.3 "Hell Skewer" #Ability { id: "6A4F", source: "Hesperos" } -546.2 "Pinax 2" #Ability { id: "(6A3C|6A3D|6A3E|6A3F)", source: "Hesperos" } +546.2 "Pinax 2" #Ability { id: ["6A3C", "6A3D", "6A3E", "6A3F"], source: "Hesperos" } diff --git a/ui/raidboss/data/06-ew/raid/p4s.txt b/ui/raidboss/data/06-ew/raid/p4s.txt index 8b1ce55ec6..bb9fa4bfc8 100644 --- a/ui/raidboss/data/06-ew/raid/p4s.txt +++ b/ui/raidboss/data/06-ew/raid/p4s.txt @@ -35,8 +35,8 @@ hideall "--sync--" 47.7 "Director's Belone" Ability { id: "69E6", source: "Hesperos" } 48.5 "--debuffs--" Ability { id: "69E7", source: "Hesperos" } 63.9 "Inversive Chlamys" Ability { id: "69ED", source: "Hesperos" } -64.1 "Cursed Casting" Ability { id: "(69E8|69E9)", source: "Hesperos" } -64.7 "Inversive Chlamys" Ability { id: "(69EE|69EF)", source: "Hesperos" } +64.1 "Cursed Casting" Ability { id: ["69E8", "69E9"], source: "Hesperos" } +64.7 "Inversive Chlamys" Ability { id: ["69EE", "69EF"], source: "Hesperos" } 73.1 "Decollation" Ability { id: "6A09", source: "Hesperos" } 82.3 "Elegant Evisceration 1" Ability { id: "6A08", source: "Hesperos" } 85.5 "Elegant Evisceration 2" Ability { id: "6819", source: "Hesperos" } @@ -45,13 +45,13 @@ hideall "--sync--" # Scene 1 100.7 "Setting the Scene" Ability { id: "69CB", source: "Hesperos" } 113.8 "Pinax" Ability { id: "69CF", source: "Hesperos" } -123.9 "Well Pinax/Levinstrike Pinax" Ability { id: "(69D6|69D7)", source: "Hesperos" } -126.8 "Acid Pinax/Lava Pinax" Ability { id: "(69D4|69D5)", source: "Hesperos" } +123.9 "Well Pinax/Levinstrike Pinax" Ability { id: ["69D6", "69D7"], source: "Hesperos" } +126.8 "Acid Pinax/Lava Pinax" Ability { id: ["69D4", "69D5"], source: "Hesperos" } 128.9 "--middle--" Ability { id: "69CE", source: "Hesperos" } -136.8 "Levinstrike Pinax/Well Pinax" Ability { id: "(69D7|69D6)", source: "Hesperos" } -138.4 "Directional Shift" Ability { id: "(69FD|69FE|69FF|6A00|6A02|6A03|6A04|6A05)", source: "Hesperos" } -140.1 "Shifting Strike" Ability { id: "(6A01|6A06)", source: "Hesperos" } -147.7 "Lava Pinax/Acid Pinax" Ability { id: "(69D5|69D4)", source: "Hesperos" } +136.8 "Levinstrike Pinax/Well Pinax" Ability { id: ["69D7", "69D6"], source: "Hesperos" } +138.4 "Directional Shift" Ability { id: ["69FD", "69FE", "69FF", "6A00", "6A02", "6A03", "6A04", "6A05"], source: "Hesperos" } +140.1 "Shifting Strike" Ability { id: ["6A01", "6A06"], source: "Hesperos" } +147.7 "Lava Pinax/Acid Pinax" Ability { id: ["69D5", "69D4"], source: "Hesperos" } 156.5 "Elegant Evisceration 1" Ability { id: "6A08", source: "Hesperos" } 159.7 "Elegant Evisceration 2" Ability { id: "6819", source: "Hesperos" } @@ -66,26 +66,26 @@ hideall "--sync--" 207.5 "Bloodrake" Ability { id: "69D8", source: "Hesperos" } 216.7 "Belone Bursts" Ability { id: "69D9", source: "Hesperos" } 230.8 "Periaktoi" Ability { id: "69F4", source: "Hesperos" } -230.8 "Acid Pinax" #Ability { id: "(69F5|69F9)", source: "Hesperos" } -230.8 "Well Pinax" #Ability { id: "(69F7|69FB)", source: "Hesperos" } -230.8 "Lava Pinax" #Ability { id: "(69F6|69FA)", source: "Hesperos" } -230.8 "Levinstrike Pinax" #Ability { id: "(69F8|69FC)", source: "Hesperos" } +230.8 "Acid Pinax" #Ability { id: ["69F5", "69F9"], source: "Hesperos" } +230.8 "Well Pinax" #Ability { id: ["69F7", "69FB"], source: "Hesperos" } +230.8 "Lava Pinax" #Ability { id: ["69F6", "69FA"], source: "Hesperos" } +230.8 "Levinstrike Pinax" #Ability { id: ["69F8", "69FC"], source: "Hesperos" } # Towers 243.0 "Bloodrake" Ability { id: "69D8", source: "Hesperos" } 250.1 "Belone Coils" Ability { id: "69DD", source: "Hesperos" } 260.3 "Inversive Chlamys" Ability { id: "69ED", source: "Hesperos" } -260.9 "Burst" Ability { id: "(69DE|69DF|69E0|69E1)", source: "Hesperos" } +260.9 "Burst" Ability { id: ["69DE", "69DF", "69E0", "69E1"], source: "Hesperos" } 261.1 "Inversive Chlamys" #Ability { id: "6F15", source: "Hesperos" } 267.4 "Aetheric Chlamys" Ability { id: "69EC", source: "Hesperos" } 275.6 "Bloodrake" Ability { id: "69D8", source: "Hesperos" } 283.7 "Belone Coils" Ability { id: "69DD", source: "Hesperos" } -294.5 "Burst" Ability { id: "(69DE|69DF|69E0|69E1)", source: "Hesperos" } +294.5 "Burst" Ability { id: ["69DE", "69DF", "69E0", "69E1"], source: "Hesperos" } 297.9 "Director's Belone" Ability { id: "69E6", source: "Hesperos" } 298.7 "--debuffs--" Ability { id: "69E7", source: "Hesperos" } 314.1 "Inversive Chlamys" Ability { id: "69ED", source: "Hesperos" } -314.3 "Cursed Casting" #Ability { id: "(69E8|69E9)", source: "Hesperos" } -314.9 "Inversive Chlamys" Ability { id: "(69EE|69EF)", source: "Hesperos" } +314.3 "Cursed Casting" #Ability { id: ["69E8", "69E9"], source: "Hesperos" } +314.9 "Inversive Chlamys" Ability { id: ["69EE", "69EF"], source: "Hesperos" } 323.3 "Decollation" Ability { id: "6A09", source: "Hesperos" } 332.5 "Elegant Evisceration 1" Ability { id: "6A08", source: "Hesperos" } 335.7 "Elegant Evisceration 2" Ability { id: "6819", source: "Hesperos" } @@ -94,13 +94,13 @@ hideall "--sync--" # Scene 3 350.9 "Setting the Scene" Ability { id: "69CB", source: "Hesperos" } 364.1 "Pinax" Ability { id: "69CF", source: "Hesperos" } -374.2 "Well Pinax/Levinstrike Pinax" Ability { id: "(69D6|69D7)", source: "Hesperos" } -377.1 "Acid Pinax/Lava Pinax" Ability { id: "(69D4|69D5)", source: "Hesperos" } +374.2 "Well Pinax/Levinstrike Pinax" Ability { id: ["69D6", "69D7"], source: "Hesperos" } +377.1 "Acid Pinax/Lava Pinax" Ability { id: ["69D4", "69D5"], source: "Hesperos" } 379.2 "--middle--" Ability { id: "69CE", source: "Hesperos" } -387.1 "Levinstrike Pinax/Well Pinax" Ability { id: "(69D7|69D6)", source: "Hesperos" } -389.1 "Directional Shift" Ability { id: "(69FD|69FE|69FF|6A00|6A02|6A03|6A04|6A05)", source: "Hesperos" } -390.6 "Shifting Strike" Ability { id: "(6A01|6A06)", source: "Hesperos" } -398.1 "Lava Pinax/Acid Pinax" Ability { id: "(69D5|69D4)", source: "Hesperos" } +387.1 "Levinstrike Pinax/Well Pinax" Ability { id: ["69D7", "69D6"], source: "Hesperos" } +389.1 "Directional Shift" Ability { id: ["69FD", "69FE", "69FF", "6A00", "6A02", "6A03", "6A04", "6A05"], source: "Hesperos" } +390.6 "Shifting Strike" Ability { id: ["6A01", "6A06"], source: "Hesperos" } +398.1 "Lava Pinax/Acid Pinax" Ability { id: ["69D5", "69D4"], source: "Hesperos" } 403.2 "Decollation" Ability { id: "6A09", source: "Hesperos" } 412.4 "Decollation" Ability { id: "6A09", source: "Hesperos" } 421.6 "Decollation" Ability { id: "6A09", source: "Hesperos" } @@ -130,7 +130,7 @@ hideall "--sync--" 1057.7 "Hemitheos's Fire IV" Ability { id: "6A0D", source: "Hesperos" } 1060.7 "Hemitheos's Thunder III" Ability { id: "6A0E", source: "Hesperos" } 1063.7 "Hemitheos's Fire IV" Ability { id: "6A0D", source: "Hesperos" } -1070.9 "Nearsight/Farsight" Ability { id: "(6A28|6DDB)", source: "Hesperos" } +1070.9 "Nearsight/Farsight" Ability { id: ["6A28", "6DDB"], source: "Hesperos" } # Act 2 - Thorns 2 with Red/Purple/Green Colors 1083.0 "Akanthai: Act 2" Ability { id: "6EB4", source: "Hesperos" } @@ -138,10 +138,10 @@ hideall "--sync--" 1102.4 "Wreath of Thorns 2" Ability { id: "6A30", source: "Hesperos" } 1110.4 "Hemitheos's Dark IV" #Ability { id: "6A16", source: "Hesperos" } 1113.7 "Dark Design" Ability { id: "6A2A", source: "Hesperos" } -1115.5 "Hemitheos's Fire IV" Ability { id: "(6A0D|6A0E)", source: "Hesperos" } +1115.5 "Hemitheos's Fire IV" Ability { id: ["6A0D", "6A0E"], source: "Hesperos" } 1115.5 "Hemitheos's Thunder III x2" #Ability { id: "6A0E", source: "Hesperos" } 1115.9 "Hemitheos's Fire III x2" #Ability { id: "6A18", source: "Hesperos" } -1122.5 "Hemitheos's Thunder III x2" Ability { id: "(6A0D|6A0E)", source: "Hesperos" } +1122.5 "Hemitheos's Thunder III x2" Ability { id: ["6A0D", "6A0E"], source: "Hesperos" } 1122.5 "Hemitheos's Fire IV" #Ability { id: "6A0D", source: "Hesperos" } 1123.2 "Hemitheos's Fire III x2" #Ability { id: "6A18", source: "Hesperos" } 1124.2 "Hemitheos's Aero III" #Ability { id: "6A1B", source: "Hesperos" } @@ -157,7 +157,7 @@ hideall "--sync--" 1173.5 "Kothornos Kick 2" Ability { id: "6A23", source: "Hesperos" } 1174.2 "Hemitheos's Thunder III 2" Ability { id: "6A0E", source: "Hesperos" } 1177.5 "Kothornos Quake 2" Ability { id: "6A24", source: "Hesperos" } -1187.7 "Nearsight/Farsight" Ability { id: "(6A28|6DDB)", source: "Hesperos" } +1187.7 "Nearsight/Farsight" Ability { id: ["6A28", "6DDB"], source: "Hesperos" } 1201.8 "Heart Stake" Ability { id: "6A2B", source: "Hesperos" } 1205.0 "Heart Stake OT" Ability { id: "6E77", source: "Hesperos" } @@ -177,7 +177,7 @@ hideall "--sync--" 1327.3 "Hemitheos's Aero III" Ability { id: "6A1B", source: "Hesperos" } 1336.0 "Wreath of Thorns 6" Ability { id: "6A35", source: "Hesperos" } 1339.1 "Hemitheos's Thunder III x8" #Ability { id: "6A0E", source: "Hesperos" } duration 8.4 -1353.3 "Nearsight/Farsight" Ability { id: "(6A28|6DDB)", source: "Hesperos" } +1353.3 "Nearsight/Farsight" Ability { id: ["6A28", "6DDB"], source: "Hesperos" } 1365.4 "Searing Stream" Ability { id: "6A2D", source: "Hesperos" } 1374.5 "Demigod Double" Ability { id: "6E78", source: "Hesperos" } diff --git a/ui/raidboss/data/06-ew/raid/p5s.txt b/ui/raidboss/data/06-ew/raid/p5s.txt index 614d2d285c..8cff9d241d 100644 --- a/ui/raidboss/data/06-ew/raid/p5s.txt +++ b/ui/raidboss/data/06-ew/raid/p5s.txt @@ -54,11 +54,11 @@ hideall "--sync--" 193.1 "Venomous Mass" Ability { id: "771D", source: "Proto-Carbuncle" } 200.2 "Toxic Crunch" Ability { id: "784A", source: "Proto-Carbuncle" } -211.6 "Venom Squall/Venom Surge" Ability { id: "(7716|7717)", source: "Proto-Carbuncle" } -215.5 "Venom Rain/Venom Pool" Ability { id: "(7718|771A)", source: "Proto-Carbuncle" } +211.6 "Venom Squall/Venom Surge" Ability { id: ["7716", "7717"], source: "Proto-Carbuncle" } +215.5 "Venom Rain/Venom Pool" Ability { id: ["7718", "771A"], source: "Proto-Carbuncle" } 221.5 "Venom Drops" Ability { id: "7719", source: "Proto-Carbuncle" } -224.5 "Venom Pool/Venom Rain" Ability { id: "(771A|7718)", source: "Proto-Carbuncle" } -232.8 "Claw to Tail/Tail to Claw" Ability { id: "(770E|7712)", source: "Proto-Carbuncle" } +224.5 "Venom Pool/Venom Rain" Ability { id: ["771A", "7718"], source: "Proto-Carbuncle" } +232.8 "Claw to Tail/Tail to Claw" Ability { id: ["770E", "7712"], source: "Proto-Carbuncle" } #232.8 "Raging Claw x7" Ability { id: "770F", source: "Proto-Carbuncle" } duration 2.2 #236.7 "Raging Tail" Ability { id: "7711", source: "Proto-Carbuncle" } @@ -93,7 +93,7 @@ hideall "--sync--" 311.1 "--sync--" Ability { id: "76F5", source: "Proto-Carbuncle" } 312.3 "Topaz Ray" Ability { id: "79FE", source: "Proto-Carbuncle" } 312.9 "Ruby Reflection" Ability { id: "76F8", source: "Proto-Carbuncle" } -318.0 "Raging Claw x7 / Searing Ray?" #Ability { id: "(76FA|76F7)", source: "Proto-Carbuncle" } +318.0 "Raging Claw x7 / Searing Ray?" #Ability { id: ["76FA", "76F7"], source: "Proto-Carbuncle" } 318.8 "Ruby Reflection?" #Ability { id: "76F8", source: "Proto-Carbuncle" } # Light party splits @@ -110,7 +110,7 @@ hideall "--sync--" 386.8 "Venom Pool" Ability { id: "771A", source: "Proto-Carbuncle" } 390.0 "--towers--" duration 10 # guessing -404.8 "Claw to Tail/Tail to Claw" Ability { id: "(770E|7712)", source: "Proto-Carbuncle" } +404.8 "Claw to Tail/Tail to Claw" Ability { id: ["770E", "7712"], source: "Proto-Carbuncle" } #414.9 "Raging Tail" Ability { id: "7A0C", source: "Proto-Carbuncle" } #416.8 "Raging Claw" Ability { id: "7713", source: "Proto-Carbuncle" } duration 2.2 417.0 "Venomous Mass" Ability { id: "771D", source: "Proto-Carbuncle" } @@ -135,12 +135,12 @@ hideall "--sync--" 489.8 "Toxic Crunch" Ability { id: "784A", source: "Proto-Carbuncle" } 503.2 "Sonic Howl" Ability { id: "7720", source: "Proto-Carbuncle" } -511.4 "Venom Squall/Venom Surge" Ability { id: "(7716|7717)", source: "Proto-Carbuncle" } -515.3 "Venom Rain/Venom Pool" Ability { id: "(7718|771A)", source: "Proto-Carbuncle" } +511.4 "Venom Squall/Venom Surge" Ability { id: ["7716", "7717"], source: "Proto-Carbuncle" } +515.3 "Venom Rain/Venom Pool" Ability { id: ["7718", "771A"], source: "Proto-Carbuncle" } 521.3 "Venom Drops" Ability { id: "7719", source: "Proto-Carbuncle" } -524.3 "Venom Pool/Venom Rain" Ability { id: "(771A|7718)", source: "Proto-Carbuncle" } +524.3 "Venom Pool/Venom Rain" Ability { id: ["771A", "7718"], source: "Proto-Carbuncle" } -530.7 "Claw to Tail/Tail to Claw" Ability { id: "(770E|7712)", source: "Proto-Carbuncle" } +530.7 "Claw to Tail/Tail to Claw" Ability { id: ["770E", "7712"], source: "Proto-Carbuncle" } 544.1 "Venomous Mass" Ability { id: "771D", source: "Proto-Carbuncle" } 551.2 "Toxic Crunch" Ability { id: "784A", source: "Proto-Carbuncle" } diff --git a/ui/raidboss/data/06-ew/raid/p6n.txt b/ui/raidboss/data/06-ew/raid/p6n.txt index 09c1ebe03b..a37961e50f 100644 --- a/ui/raidboss/data/06-ew/raid/p6n.txt +++ b/ui/raidboss/data/06-ew/raid/p6n.txt @@ -11,9 +11,9 @@ hideall "--sync--" 10.1 "--sync--" Ability { id: "7854", source: "Hegemone" } 20.0 "Polyominous Dark IV" Ability { id: "7855", source: "Hegemone" } 23.8 "--sync--" Ability { id: "784C", source: "Hegemone" } -30.9 "Choros Ixou 1" Ability { id: "(7857|7858)", source: "Hegemone" } -41.0 "Choros Ixou 2" Ability { id: "(7857|7858)", source: "Hegemone" } -51.1 "Choros Ixou 3" Ability { id: "(7857|7858)", source: "Hegemone" } +30.9 "Choros Ixou 1" Ability { id: ["7857", "7858"], source: "Hegemone" } +41.0 "Choros Ixou 2" Ability { id: ["7857", "7858"], source: "Hegemone" } +51.1 "Choros Ixou 3" Ability { id: ["7857", "7858"], source: "Hegemone" } 62.6 "Hemitheos's Dark IV" Ability { id: "784E", source: "Hegemone" } window 65,10 74.3 "Transmission 1" Ability { id: "784F", source: "Hegemone" } 84.0 "Transmission 2" Ability { id: "784F", source: "Hegemone" } @@ -23,7 +23,7 @@ hideall "--sync--" 121.8 "Aetheric Polyominoid" Ability { id: "7853", source: "Hegemone" } 121.8 "--sync--" Ability { id: "7854", source: "Hegemone" } 127.5 "--sync--" Ability { id: "784C", source: "Hegemone" } -134.7 "Choros Ixou" Ability { id: "(7857|7858)", source: "Hegemone" } +134.7 "Choros Ixou" Ability { id: ["7857", "7858"], source: "Hegemone" } 135.9 "Polyominous Dark IV" Ability { id: "7855", source: "Hegemone" } 141.3 "--sync--" Ability { id: "784C", source: "Hegemone" } 149.1 "Strophe Ixou x8" Ability { id: "7A11", source: "Hegemone" } @@ -70,7 +70,7 @@ hideall "--sync--" 414.1 "Polyominoid Sigma" Ability { id: "7856", source: "Hegemone" } 414.1 "--sync--" Ability { id: "7854", source: "Hegemone" } 419.2 "--sync--" Ability { id: "784C", source: "Hegemone" } -426.4 "Choros Ixou" Ability { id: "(7857|7858)", source: "Hegemone" } +426.4 "Choros Ixou" Ability { id: ["7857", "7858"], source: "Hegemone" } 427.1 "Polyominous Dark IV" Ability { id: "7855", source: "Hegemone" } 437.2 "Synergy" Ability { id: "785B", source: "Hegemone" } @@ -102,6 +102,6 @@ hideall "--sync--" 597.8 "Polyominoid Sigma" #Ability { id: "7856", source: "Hegemone" } 597.8 "--sync--" #Ability { id: "7854", source: "Hegemone" } 602.9 "--sync--" #Ability { id: "784C", source: "Hegemone" } -610.1 "Choros Ixou" #Ability { id: "(7857|7858)", source: "Hegemone" } +610.1 "Choros Ixou" #Ability { id: ["7857", "7858"], source: "Hegemone" } 610.8 "Polyominous Dark IV" #Ability { id: "7855", source: "Hegemone" } 620.9 "Synergy" #Ability { id: "785B", source: "Hegemone" } diff --git a/ui/raidboss/data/06-ew/raid/p6s.txt b/ui/raidboss/data/06-ew/raid/p6s.txt index 0f25e11741..efb7a91d0d 100644 --- a/ui/raidboss/data/06-ew/raid/p6s.txt +++ b/ui/raidboss/data/06-ew/raid/p6s.txt @@ -10,15 +10,15 @@ hideall "--sync--" 0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1 9.5 "--sync--" StartsUsing { id: "7860", source: "Hegemone" } window 10,5 14.2 "Hemitheos's Dark IV" Ability { id: "7860", source: "Hegemone" } -28.0 "Synergy" Ability { id: "(7887|788A)", source: "Hegemone" } +28.0 "Synergy" Ability { id: ["7887", "788A"], source: "Hegemone" } 35.1 "--sync--" Ability { id: "784C", source: "Hegemone" } 42.0 "Aetheric Polyominoid" Ability { id: "7866", source: "Hegemone" } window 15,15 42.0 "--sync--" Ability { id: "7854", source: "Hegemone" } -48.6 "Unholy Darkness" Ability { id: "(786D|786E|7891)", source: "Hegemone" } +48.6 "Unholy Darkness" Ability { id: ["786D", "786E", "7891"], source: "Hegemone" } 54.6 "Polyominous Dark IV" Ability { id: "7867", source: "Hegemone" } -54.7 "Exocleaver 1" Ability { id: "(7869|786B)", source: "Hegemone" } window 2,2 +54.7 "Exocleaver 1" Ability { id: ["7869", "786B"], source: "Hegemone" } window 2,2 56.8 "Unholy Darkness" Ability { id: "7892", source: "Hegemone" } -57.2 "Exocleaver 2" Ability { id: "(7869|786B)", source: "Hegemone" } window 2,2 +57.2 "Exocleaver 2" Ability { id: ["7869", "786B"], source: "Hegemone" } window 2,2 71.2 "--sync--" Ability { id: "7864", source: "Hegemone" } 71.7 "#1 Pathogenic Cells" #Ability { id: "7865", source: "Hegemone" } 73.6 "#2 Pathogenic Cells" #Ability { id: "7865", source: "Hegemone" } @@ -32,16 +32,16 @@ hideall "--sync--" 91.9 "--sync--" Ability { id: "784C", source: "Hegemone" } 97.7 "Aetherial Exchange" Ability { id: "784D", source: "Hegemone" } window 100,30 104.4 "Exchange Of Agonies" Ability { id: "786C", source: "Hegemone" } -111.6 "Choros Ixou 1" Ability { id: "(7881|7882|7883|7884)", source: "Hegemone" } -112.3 "Unholy Darkness" Ability { id: "(786D|786E|7891)", source: "Hegemone" } -114.7 "Choros Ixou 2" Ability { id: "(7881|7882|7883|7884)", source: "Hegemone" } -128.5 "Synergy" Ability { id: "(7887|788A)", source: "Hegemone" } +111.6 "Choros Ixou 1" Ability { id: ["7881", "7882", "7883", "7884"], source: "Hegemone" } +112.3 "Unholy Darkness" Ability { id: ["786D", "786E", "7891"], source: "Hegemone" } +114.7 "Choros Ixou 2" Ability { id: ["7881", "7882", "7883", "7884"], source: "Hegemone" } +128.5 "Synergy" Ability { id: ["7887", "788A"], source: "Hegemone" } 141.4 "Hemitheos's Dark IV" Ability { id: "7860", source: "Hegemone" } window 30,30 153.2 "Transmission" Ability { id: "7861", source: "Hegemone" } 159.0 "--sync--" Ability { id: "784C", source: "Hegemone" } -166.1 "Choros Ixou 1" Ability { id: "(7881|7882|7883|7884)", source: "Hegemone" } -168.0 "Chelic Claw/Reek Havoc" Ability { id: "(79EE|79EF)", source: "Parasitos" } -169.2 "Choros Ixou 2" Ability { id: "(7881|7882|7883|7884)", source: "Hegemone" } +166.1 "Choros Ixou 1" Ability { id: ["7881", "7882", "7883", "7884"], source: "Hegemone" } +168.0 "Chelic Claw/Reek Havoc" Ability { id: ["79EE", "79EF"], source: "Parasitos" } +169.2 "Choros Ixou 2" Ability { id: ["7881", "7882", "7883", "7884"], source: "Hegemone" } 179.0 "Aetherial Exchange" Ability { id: "784D", source: "Hegemone" } 185.7 "Polyominoid Sigma" Ability { id: "7868", source: "Hegemone" } window 30,30 185.7 "--sync--" Ability { id: "7854", source: "Hegemone" } @@ -51,10 +51,10 @@ hideall "--sync--" 204.0 "--sync--" Ability { id: "784C", source: "Hegemone" } 209.8 "Aetherial Exchange" Ability { id: "784D", source: "Hegemone" } 216.5 "Exchange Of Agonies" Ability { id: "786C", source: "Hegemone" } window 30,30 -224.4 "Exocleaver 1" Ability { id: "(7869|786B)", source: "Hegemone" } window 2,2 +224.4 "Exocleaver 1" Ability { id: ["7869", "786B"], source: "Hegemone" } window 2,2 224.4 "Unholy Darkness" Ability { id: "7A0F", source: "Hegemone" } -227.0 "Exocleaver 2" Ability { id: "(7869|786B)", source: "Hegemone" } window 2,2 -239.3 "Synergy" Ability { id: "(7887|788A)", source: "Hegemone" } +227.0 "Exocleaver 2" Ability { id: ["7869", "786B"], source: "Hegemone" } window 2,2 +239.3 "Synergy" Ability { id: ["7887", "788A"], source: "Hegemone" } 252.2 "Hemitheos's Dark IV" Ability { id: "7860", source: "Hegemone" } window 30,30 262.0 "Aetherial Exchange" Ability { id: "784D", source: "Hegemone" } 268.7 "Polyominoid Sigma" Ability { id: "7868", source: "Hegemone" } @@ -63,22 +63,22 @@ hideall "--sync--" 282.3 "Polyominous Dark IV" Ability { id: "7867", source: "Hegemone" } window 30,30 287.3 "--sync--" Ability { id: "784C", source: "Hegemone" } 294.0 "Dark Ashes" Ability { id: "788D", source: "Hegemone" } -302.0 "Choros Ixou 1" Ability { id: "(7881|7882|7883|7884)", source: "Hegemone" } +302.0 "Choros Ixou 1" Ability { id: ["7881", "7882", "7883", "7884"], source: "Hegemone" } 303.0 "Dark Ashes" Ability { id: "788E", source: "Hegemone" } -305.1 "Choros Ixou 2" Ability { id: "(7881|7882|7883|7884)", source: "Hegemone" } +305.1 "Choros Ixou 2" Ability { id: ["7881", "7882", "7883", "7884"], source: "Hegemone" } 311.8 "--sync--" Ability { id: "784C", source: "Hegemone" } 317.6 "Cachexia" Ability { id: "7876", source: "Hegemone" } window 30,30 326.6 "Aetheronecrosis 1" #Ability { id: "7877", source: "Hegemone" } 330.6 "Aetheronecrosis 2" #Ability { id: "7877", source: "Hegemone" } 334.6 "Aetheronecrosis 3" #Ability { id: "7877", source: "Hegemone" } 334.8 "Dual Predation" Ability { id: "7878", source: "Hegemone" } -335.8 "Predation 1" Ability { id: "(787A|787B)", source: "Hegemone" } +335.8 "Predation 1" Ability { id: ["787A", "787B"], source: "Hegemone" } 338.7 "Aetheronecrosis 4" #Ability { id: "7877", source: "Hegemone" } -339.9 "Predation 2" Ability { id: "(787A|787B)", source: "Hegemone" } -343.9 "Predation 3" Ability { id: "(787A|787B)", source: "Hegemone" } -347.9 "Predation 4" Ability { id: "(787A|787B)", source: "Hegemone" } +339.9 "Predation 2" Ability { id: ["787A", "787B"], source: "Hegemone" } +343.9 "Predation 3" Ability { id: ["787A", "787B"], source: "Hegemone" } +347.9 "Predation 4" Ability { id: ["787A", "787B"], source: "Hegemone" } 356.9 "Ptera Ixou" Ability { id: "787C", source: "Hegemone" } -372.2 "Synergy" Ability { id: "(7887|788A)", source: "Hegemone" } +372.2 "Synergy" Ability { id: ["7887", "788A"], source: "Hegemone" } 384.3 "Hemitheos's Dark IV" Ability { id: "7860", source: "Hegemone" } window 30,30 395.0 "Aetheric Polyominoid" Ability { id: "7866", source: "Hegemone" } 395.0 "--sync--" Ability { id: "7854", source: "Hegemone" } @@ -89,17 +89,17 @@ hideall "--sync--" 417.5 "--sync--" Ability { id: "784C", source: "Hegemone" } window 30,30 423.4 "Aetherial Exchange" Ability { id: "784D", source: "Hegemone" } 430.1 "Exchange Of Agonies" Ability { id: "786C", source: "Hegemone" } -437.3 "Choros Ixou 1" Ability { id: "(7881|7882|7883|7884)", source: "Hegemone" } -437.8 "Unholy Darkness" Ability { id: "(786D|786E|7891)", source: "Hegemone" } -440.2 "Choros Ixou 2" Ability { id: "(7881|7882|7883|7884)", source: "Hegemone" } +437.3 "Choros Ixou 1" Ability { id: ["7881", "7882", "7883", "7884"], source: "Hegemone" } +437.8 "Unholy Darkness" Ability { id: ["786D", "786E", "7891"], source: "Hegemone" } +440.2 "Choros Ixou 2" Ability { id: ["7881", "7882", "7883", "7884"], source: "Hegemone" } 449.9 "Aetherial Exchange" Ability { id: "784D", source: "Hegemone" } 456.6 "Polyominoid Sigma" Ability { id: "7868", source: "Hegemone" } 456.6 "--sync--" Ability { id: "7854", source: "Hegemone" } 461.2 "--sync--" Ability { id: "784C", source: "Hegemone" } -468.3 "Choros Ixou 1" Ability { id: "(7881|7882|7883|7884)", source: "Hegemone" } +468.3 "Choros Ixou 1" Ability { id: ["7881", "7882", "7883", "7884"], source: "Hegemone" } 469.2 "Polyominous Dark IV" Ability { id: "7867", source: "Hegemone" } -471.4 "Choros Ixou 2" Ability { id: "(7881|7882|7883|7884)", source: "Hegemone" } -485.0 "Synergy" Ability { id: "(7887|788A)", source: "Hegemone" } +471.4 "Choros Ixou 2" Ability { id: ["7881", "7882", "7883", "7884"], source: "Hegemone" } +485.0 "Synergy" Ability { id: ["7887", "788A"], source: "Hegemone" } 497.1 "Hemitheos's Dark IV" Ability { id: "7860", source: "Hegemone" } 503.9 "--sync--" Ability { id: "784C", source: "Hegemone" } 509.7 "Cachexia" Ability { id: "7876", source: "Hegemone" } @@ -112,7 +112,7 @@ hideall "--sync--" 545.4 "Dark Sphere" Ability { id: "7880", source: "Hegemone" } 545.4 "Ptera Ixou" Ability { id: "787C", source: "Hegemone" } window 30,30 545.4 "Unholy Darkness" Ability { id: "787F", source: "Hegemone" } -546.4 "Chelic Claw/Reek Havoc" Ability { id: "(79EE|79EF)", source: "Parasitos" } +546.4 "Chelic Claw/Reek Havoc" Ability { id: ["79EE", "79EF"], source: "Parasitos" } 551.6 "--sync--" Ability { id: "7A19", source: "Hegemone" } 558.7 "Aetheric Polyominoid" Ability { id: "7866", source: "Hegemone" } 558.7 "--sync--" Ability { id: "7854", source: "Hegemone" } @@ -122,10 +122,10 @@ hideall "--sync--" 577.0 "--sync--" Ability { id: "784C", source: "Hegemone" } 583.7 "Aetheric Polyominoid" Ability { id: "7866", source: "Hegemone" } 583.7 "--sync--" Ability { id: "7854", source: "Hegemone" } -592.8 "Choros Ixou 1" Ability { id: "(7881|7882|7883|7884)", source: "Hegemone" } +592.8 "Choros Ixou 1" Ability { id: ["7881", "7882", "7883", "7884"], source: "Hegemone" } 593.5 "Polyominous Dark IV" Ability { id: "7867", source: "Hegemone" } -595.9 "Choros Ixou 2" Ability { id: "(7881|7882|7883|7884)", source: "Hegemone" } -608.9 "Synergy" Ability { id: "(7887|788A)", source: "Hegemone" } +595.9 "Choros Ixou 2" Ability { id: ["7881", "7882", "7883", "7884"], source: "Hegemone" } +608.9 "Synergy" Ability { id: ["7887", "788A"], source: "Hegemone" } 621.8 "Hemitheos's Dark IV" Ability { id: "7860", source: "Hegemone" } # Enrage diff --git a/ui/raidboss/data/06-ew/raid/p7n.txt b/ui/raidboss/data/06-ew/raid/p7n.txt index 76cfd4ba33..4d2b883371 100644 --- a/ui/raidboss/data/06-ew/raid/p7n.txt +++ b/ui/raidboss/data/06-ew/raid/p7n.txt @@ -11,15 +11,15 @@ hideall "--sync--" 0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1 3.0 "--sync--" Ability { id: "78E3", source: "Agdistis" } window 3,0 15.8 "Bough of Attis (out)" Ability { id: "77F9", source: "Agdistis" } window 16,5 -23.4 "Bough of Attis (left/right)" Ability { id: "(77FB|77FC)", source: "Agdistis" } +23.4 "Bough of Attis (left/right)" Ability { id: ["77FB", "77FC"], source: "Agdistis" } 37.6 "Hemitheos's Holy" Ability { id: "7808", source: "Agdistis" } 44.0 "Hemitheos's Glare III" Ability { id: "77F8", source: "Agdistis" } 54.1 "Bough of Attis (in)" Ability { id: "77FE", source: "Agdistis" } 64.5 "Bough of Attis (out)" Ability { id: "77F9", source: "Agdistis" } -72.1 "Bough of Attis (left/right)" Ability { id: "(77FB|77FC)", source: "Agdistis" } +72.1 "Bough of Attis (left/right)" Ability { id: ["77FB", "77FC"], source: "Agdistis" } 81.9 "Immortal's Obol" Ability { id: "77F5", source: "Agdistis" } 102.0 "Bough of Attis (out)" Ability { id: "77F9", source: "Agdistis" } -109.6 "Bough of Attis (left/right)" Ability { id: "(77FB|77FC)", source: "Agdistis" } +109.6 "Bough of Attis (left/right)" Ability { id: ["77FB", "77FC"], source: "Agdistis" } 119.7 "Hemitheos's Aero II" Ability { id: "7809", source: "Agdistis" } window 215,10 128.9 "Spark of Life" Ability { id: "780B", source: "Agdistis" } 143.2 "Forbidden Fruit" Ability { id: "7801", source: "Agdistis" } @@ -58,10 +58,10 @@ hideall "--sync--" 475.9 "Hemitheos's Aero II" Ability { id: "7809", source: "Agdistis" } window 30,30 489.2 "Forbidden Fruit" Ability { id: "7801", source: "Agdistis" } 492.3 "Shadow of Attis" Ability { id: "783C", source: "Agdistis" } -500.7 "Static Moon/Stymphalian Strike" Ability { id: "(7802|7803)", source: ["Immature Io", "Immature Stymphalide"] } +500.7 "Static Moon/Stymphalian Strike" Ability { id: ["7802", "7803"], source: ["Immature Io", "Immature Stymphalide"] } 505.4 "Burst" Ability { id: "783D", source: "Agdistis" } 513.6 "Bough of Attis (out)" Ability { id: "77F9", source: "Agdistis" } -521.2 "Bough of Attis (left/right)" Ability { id: "(77FB|77FC)", source: "Agdistis" } +521.2 "Bough of Attis (left/right)" Ability { id: ["77FB", "77FC"], source: "Agdistis" } 530.4 "Spark of Life" Ability { id: "780B", source: "Agdistis" } 539.5 "Spark of Life" Ability { id: "780B", source: "Agdistis" } 548.6 "Spark of Life" Ability { id: "780B", source: "Agdistis" } @@ -76,7 +76,7 @@ hideall "--sync--" 636.1 "Hemitheos's Glare III" Ability { id: "79FA", source: "Agdistis" } window 30,30 643.7 "Blades of Attis (triangle)" Ability { id: "7805", source: "Agdistis" } 658.0 "Bough of Attis (out)" Ability { id: "77F9", source: "Agdistis" } -665.6 "Bough of Attis (left/right)" Ability { id: "(77FB|77FC)", source: "Agdistis" } +665.6 "Bough of Attis (left/right)" Ability { id: ["77FB", "77FC"], source: "Agdistis" } 669.1 "--sync--" StartsUsing { id: "7800", source: "Agdistis" } window 30,30 jump 400 670.2 "--sync--" StartsUsing { id: "7807", source: "Agdistis" } window 30,30 jump 1000 @@ -96,10 +96,10 @@ hideall "--sync--" 1016.2 "Hemitheos's Glare III" Ability { id: "77F8", source: "Agdistis" } window 30,30 1026.3 "Bough of Attis (in)" Ability { id: "77FE", source: "Agdistis" } 1036.7 "Bough of Attis (out)" Ability { id: "77F9", source: "Agdistis" } -1044.3 "Bough of Attis (left/right)" Ability { id: "(77FB|77FC)", source: "Agdistis" } +1044.3 "Bough of Attis (left/right)" Ability { id: ["77FB", "77FC"], source: "Agdistis" } 1054.1 "Immortal's Obol" Ability { id: "77F5", source: "Agdistis" } window 30,30 1074.2 "Bough of Attis (out)" Ability { id: "77F9", source: "Agdistis" } -1081.8 "Bough of Attis (left/right)" Ability { id: "(77FB|77FC)", source: "Agdistis" } +1081.8 "Bough of Attis (left/right)" Ability { id: ["77FB", "77FC"], source: "Agdistis" } 1091.9 "Hemitheos's Aero II" Ability { id: "7809", source: "Agdistis" } window 30,30 1101.1 "Spark of Life" Ability { id: "780B", source: "Agdistis" } 1115.5 "Forbidden Fruit" Ability { id: "7801", source: "Agdistis" } @@ -110,7 +110,7 @@ hideall "--sync--" 1189.8 "Hemitheos's Glare III" Ability { id: "79FA", source: "Agdistis" } window 30,30 1197.4 "Blades of Attis" Ability { id: "7805", source: "Agdistis" } 1211.7 "Bough of Attis (out)" Ability { id: "77F9", source: "Agdistis" } -1219.3 "Bough of Attis (left/right)" Ability { id: "(77FB|77FC)", source: "Agdistis" } +1219.3 "Bough of Attis (left/right)" Ability { id: ["77FB", "77FC"], source: "Agdistis" } 1222.5 "--sync--" StartsUsing { id: "7800", source: "Agdistis" } window 30,30 jump 400 1223.6 "--sync--" StartsUsing { id: "7807", source: "Agdistis" } window 30,30 jump 1000 diff --git a/ui/raidboss/data/06-ew/raid/p7s.txt b/ui/raidboss/data/06-ew/raid/p7s.txt index 9975f328e0..72081cc718 100644 --- a/ui/raidboss/data/06-ew/raid/p7s.txt +++ b/ui/raidboss/data/06-ew/raid/p7s.txt @@ -9,7 +9,7 @@ hideall "--sync--" 0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1 13.0 "Spark of Life" Ability { id: "7839", source: "Agdistis" } window 50,50 -26.3 "Condensed Aero II/Dispersed Aero II" Ability { id: "(7836|7835)", source: "Agdistis" } +26.3 "Condensed Aero II/Dispersed Aero II" Ability { id: ["7836", "7835"], source: "Agdistis" } 34.1 "--sync--" Ability { id: "782E", source: "Agdistis" } 42.7 "Immortal's Obol" Ability { id: "780C", source: "Agdistis" } 44.6 "Blades of Attis" Ability { id: "782F", source: "Agdistis" } duration 14 @@ -21,7 +21,7 @@ hideall "--sync--" 79.8 "Hemitheos's Holy III" Ability { id: "783B", source: "Agdistis" } 80.0 "Bough of Attis (far)" Ability { id: "7826", source: "Agdistis" } 80.3 "Stymphalian Strike" Ability { id: "7815", source: "Immature Stymphalide" } -91.7 "Condensed Aero II/Dispersed Aero II" Ability { id: "(7836|7835)", source: "Agdistis" } +91.7 "Condensed Aero II/Dispersed Aero II" Ability { id: ["7836", "7835"], source: "Agdistis" } 102.5 "Spark of Life" Ability { id: "7839", source: "Agdistis" } # Inviolate Bonds: Spread/Stack @@ -29,11 +29,11 @@ hideall "--sync--" 121.8 "Bough of Attis (close)" Ability { id: "7821", source: "Agdistis" } 121.9 "Hemitheos's Aero III" Ability { id: "781B", source: "Agdistis" } 121.9 "Hemitheos's Holy III" Ability { id: "781C", source: "Agdistis" } -129.4 "Bough of Attis (arrow)" Ability { id: "(7823|7824)", source: "Agdistis" } +129.4 "Bough of Attis (arrow)" Ability { id: ["7823", "7824"], source: "Agdistis" } 132.9 "Hemitheos's Aero III" Ability { id: "781B", source: "Agdistis" } 132.9 "Hemitheos's Holy III" Ability { id: "781C", source: "Agdistis" } 138.6 "Roots of Attis" Ability { id: "780E", source: "Agdistis" } -157.1 "Condensed Aero II/Dispersed Aero II" Ability { id: "(7836|7835)", source: "Agdistis" } +157.1 "Condensed Aero II/Dispersed Aero II" Ability { id: ["7836", "7835"], source: "Agdistis" } # Forbidden Fruit: Birds + Knockback 165.8 "Forbidden Fruit" Ability { id: "7810", source: "Agdistis" } @@ -51,8 +51,8 @@ hideall "--sync--" 223.4 "Hemitheos's Holy III" Ability { id: "783B", source: "Agdistis" } 240.6 "Bough of Attis (close)" Ability { id: "7821", source: "Agdistis" } -248.2 "Bough of Attis (arrow)" Ability { id: "(7823|7824)", source: "Agdistis" } -258.3 "Condensed Aero II/Dispersed Aero II" Ability { id: "(7836|7835)", source: "Agdistis" } +248.2 "Bough of Attis (arrow)" Ability { id: ["7823", "7824"], source: "Agdistis" } +258.3 "Condensed Aero II/Dispersed Aero II" Ability { id: ["7836", "7835"], source: "Agdistis" } # Forbidden Fruit: 3 Minos, 2 Bulls 266.0 "Forbidden Fruit" Ability { id: "7810", source: "Agdistis" } @@ -67,7 +67,7 @@ hideall "--sync--" 305.3 "Blades of Attis" Ability { id: "782F", source: "Agdistis" } duration 14 307.0 "Hemitheos's Aero IV" Ability { id: "7834", source: "Agdistis" } 309.7 "Hemitheos's Holy III" Ability { id: "783B", source: "Agdistis" } -324.2 "Condensed Aero II/Dispersed Aero II" Ability { id: "(7836|7835)", source: "Agdistis" } +324.2 "Condensed Aero II/Dispersed Aero II" Ability { id: ["7836", "7835"], source: "Agdistis" } # Forbidden Fruit: Towers and Birds 333.9 "Forbidden Fruit" Ability { id: "7810", source: "Agdistis" } @@ -135,7 +135,7 @@ hideall "--sync--" 617.3 "--sync--" Ability { id: "783A", source: "Agdistis" } 626.3 "Bough of Attis (close)" Ability { id: "7821", source: "Agdistis" } 627.5 "Hemitheos's Holy III" Ability { id: "783B", source: "Agdistis" } -633.9 "Bough of Attis (arrow)" Ability { id: "(7823|7824)", source: "Agdistis" } +633.9 "Bough of Attis (arrow)" Ability { id: ["7823", "7824"], source: "Agdistis" } 643.1 "Spark of Life" Ability { id: "7839", source: "Agdistis" } 656.3 "Spark of Life" Ability { id: "7839", source: "Agdistis" } diff --git a/ui/raidboss/data/06-ew/raid/p8n.txt b/ui/raidboss/data/06-ew/raid/p8n.txt index 44c843f37a..d512a6ea54 100644 --- a/ui/raidboss/data/06-ew/raid/p8n.txt +++ b/ui/raidboss/data/06-ew/raid/p8n.txt @@ -30,8 +30,8 @@ hideall "--sync--" 27.4 "Scorching Fang" Ability { id: "78EE", source: "Hephaistos" } 36.6 "Sunforge" Ability { id: "78ED", source: "Hephaistos" } 37.6 "Sun's Pinion" Ability { id: "78EF", source: "Hephaistos" } -46.8 "Sunforge" Ability { id: "(78EC|78ED)", source: "Hephaistos" } -47.8 "Scorching Fang/Sun's Pinion" Ability { id: "(78EE|78EF)", source: "Hephaistos" } +46.8 "Sunforge" Ability { id: ["78EC", "78ED"], source: "Hephaistos" } +47.8 "Scorching Fang/Sun's Pinion" Ability { id: ["78EE", "78EF"], source: "Hephaistos" } 56.1 "Flameviper" Ability { id: "7908", source: "Hephaistos" } # jump to Quadruped v1 or Gorgon v1 @@ -72,8 +72,8 @@ hideall "--sync--" 241.8 "Cthonic Vent 1" Ability { id: "78F5", source: "Suneater" } 249.8 "Cthonic Vent 2" Ability { id: "794D", source: "Suneater" } 257.8 "Cthonic Vent 3" Ability { id: "78F6", source: "Suneater" } -264.2 "Sunforge" Ability { id: "(78EC|78ED)", source: "Hephaistos" } -265.2 "Scorching Fang/Sun's Pinion" Ability { id: "(78EE|78EF)", source: "Hephaistos" } +264.2 "Sunforge" Ability { id: ["78EC", "78ED"], source: "Hephaistos" } +265.2 "Scorching Fang/Sun's Pinion" Ability { id: ["78EE", "78EF"], source: "Hephaistos" } 272.3 "Genesis of Flame" Ability { id: "7905", source: "Hephaistos" } # Gorgon v1 (Quadruped branch) @@ -96,8 +96,8 @@ hideall "--sync--" 374.9 "Hemitheos's Flare" #Ability { id: "7906", source: "Hephaistos" } 380.8 "Torch Flame" #Ability { id: "78F8", source: "Hephaistos" } 380.9 "Hemitheos's Flare" #Ability { id: "7907", source: "Hephaistos" } -388.1 "Sunforge" #Ability { id: "(78EC|78ED)", source: "Hephaistos" } -389.1 "Scorching Fang/Sun's Pinion" #Ability { id: "(78EE|78EF)", source: "Hephaistos" } +388.1 "Sunforge" #Ability { id: ["78EC", "78ED"], source: "Hephaistos" } +389.1 "Scorching Fang/Sun's Pinion" #Ability { id: ["78EE", "78EF"], source: "Hephaistos" } 396.2 "Genesis of Flame" #Ability { id: "7905", source: "Hephaistos" } 404.4 "Flameviper" #Ability { id: "7908", source: "Hephaistos" } @@ -120,8 +120,8 @@ hideall "--sync--" 542.2 "Cthonic Vent 1" Ability { id: "78F5", source: "Suneater" } 550.2 "Cthonic Vent 2" Ability { id: "794D", source: "Suneater" } 558.2 "Cthonic Vent 3" Ability { id: "78F6", source: "Suneater" } -564.6 "Sunforge" Ability { id: "(78EC|78ED)", source: "Hephaistos" } -565.6 "Scorching Fang/Sun's Pinion" Ability { id: "(78EE|78EF)", source: "Hephaistos" } +564.6 "Sunforge" Ability { id: ["78EC", "78ED"], source: "Hephaistos" } +565.6 "Scorching Fang/Sun's Pinion" Ability { id: ["78EE", "78EF"], source: "Hephaistos" } 572.7 "Genesis of Flame" Ability { id: "7905", source: "Hephaistos" } # Quadruped v1 (Gorgon branch) @@ -146,8 +146,8 @@ hideall "--sync--" 669.9 "Hemitheos's Flare" Ability { id: "7906", source: "Hephaistos" } 675.8 "Torch Flame" Ability { id: "78F8", source: "Hephaistos" } 675.9 "Hemitheos's Flare" Ability { id: "7907", source: "Hephaistos" } -683.1 "Sunforge" Ability { id: "(78EC|78ED)", source: "Hephaistos" } -684.1 "Scorching Fang/Sun's Pinion" Ability { id: "(78EE|78EF)", source: "Hephaistos" } +683.1 "Sunforge" Ability { id: ["78EC", "78ED"], source: "Hephaistos" } +684.1 "Scorching Fang/Sun's Pinion" Ability { id: ["78EE", "78EF"], source: "Hephaistos" } 691.2 "Genesis of Flame" Ability { id: "7905", source: "Hephaistos" } 699.4 "Flameviper" Ability { id: "7908", source: "Hephaistos" } # jump to Quadruped v2 or Gorgon v2 @@ -195,8 +195,8 @@ hideall "--sync--" 909.5 "--sync--" Ability { id: "7906", source: "Hephaistos" } 910.4 "Torch Flame" Ability { id: "78F8", source: "Hephaistos" } 915.5 "Hemitheos's Flare" Ability { id: "7907", source: "Hephaistos" } -919.7 "Sunforge" Ability { id: "(78EC|78ED)", source: "Hephaistos" } -920.7 "Scorching Fang/Sun's Pinion" Ability { id: "(78EE|78EF)", source: "Hephaistos" } +919.7 "Sunforge" Ability { id: ["78EC", "78ED"], source: "Hephaistos" } +920.7 "Scorching Fang/Sun's Pinion" Ability { id: ["78EE", "78EF"], source: "Hephaistos" } 927.8 "Genesis of Flame" Ability { id: "7905", source: "Hephaistos" } 935.9 "Genesis of Flame" Ability { id: "7905", source: "Hephaistos" } 944.1 "Flameviper" Ability { id: "7908", source: "Hephaistos" } @@ -217,12 +217,12 @@ hideall "--sync--" # -> Sunforge v2 (both branches) 1008.7 "--sync--" Ability { id: "7108", source: "Hephaistos" } -1017.9 "Sunforge" Ability { id: "(78EC|78ED)", source: "Hephaistos" } window 50,50 jump 1317.9 -1018.9 "Scorching Fang/Sun\'s Pinion" #Ability { id: "(78EE|78EF)", source: "Hephaistos" } +1017.9 "Sunforge" Ability { id: ["78EC", "78ED"], source: "Hephaistos" } window 50,50 jump 1317.9 +1018.9 "Scorching Fang/Sun\'s Pinion" #Ability { id: ["78EE", "78EF"], source: "Hephaistos" } 1029.1 "Genesis of Flame" #Ability { id: "7905", source: "Hephaistos" } 1037.4 "Flameviper" #Ability { id: "7908", source: "Hephaistos" } 1052.6 "Sunforge" #Ability { id: "78EC", source: "Hephaistos" } -1053.6 "Scorching Fang/Sun\'s Pinion" #Ability { id: "(78EE|78EF)", source: "Hephaistos" } +1053.6 "Scorching Fang/Sun\'s Pinion" #Ability { id: ["78EE", "78EF"], source: "Hephaistos" } @@ -252,8 +252,8 @@ hideall "--sync--" 1201.4 "--sync--" Ability { id: "7906", source: "Hephaistos" } 1202.3 "Torch Flame" Ability { id: "78F8", source: "Hephaistos" } 1207.4 "Hemitheos's Flare" Ability { id: "7907", source: "Hephaistos" } -1211.6 "Sunforge" Ability { id: "(78EC|78ED)", source: "Hephaistos" } -1212.6 "Scorching Fang/Sun's Pinion" Ability { id: "(78EE|78EF)", source: "Hephaistos" } +1211.6 "Sunforge" Ability { id: ["78EC", "78ED"], source: "Hephaistos" } +1212.6 "Scorching Fang/Sun's Pinion" Ability { id: ["78EE", "78EF"], source: "Hephaistos" } 1219.7 "Genesis of Flame" Ability { id: "7905", source: "Hephaistos" } 1227.8 "Genesis of Flame" Ability { id: "7905", source: "Hephaistos" } 1236.0 "Flameviper" Ability { id: "7908", source: "Hephaistos" } @@ -274,12 +274,12 @@ hideall "--sync--" # Sunforge v2 (both branches) 1308.7 "--sync--" Ability { id: "7108", source: "Hephaistos" } -1317.9 "Sunforge" Ability { id: "(78EC|78ED)", source: "Hephaistos" } -1318.9 "Scorching Fang/Sun\'s Pinion" Ability { id: "(78EE|78EF)", source: "Hephaistos" } +1317.9 "Sunforge" Ability { id: ["78EC", "78ED"], source: "Hephaistos" } +1318.9 "Scorching Fang/Sun\'s Pinion" Ability { id: ["78EE", "78EF"], source: "Hephaistos" } 1329.1 "Genesis of Flame" Ability { id: "7905", source: "Hephaistos" } 1337.4 "Flameviper" Ability { id: "7908", source: "Hephaistos" } 1352.6 "Sunforge" Ability { id: "78EC", source: "Hephaistos" } -1353.6 "Scorching Fang/Sun\'s Pinion" Ability { id: "(78EE|78EF)", source: "Hephaistos" } +1353.6 "Scorching Fang/Sun\'s Pinion" Ability { id: ["78EE", "78EF"], source: "Hephaistos" } # jump to Quadruped v2 or Gorgon v2 # -> Quadruped v2 branch diff --git a/ui/raidboss/data/06-ew/raid/p8s.txt b/ui/raidboss/data/06-ew/raid/p8s.txt index d3c4088a71..62c69da7ae 100644 --- a/ui/raidboss/data/06-ew/raid/p8s.txt +++ b/ui/raidboss/data/06-ew/raid/p8s.txt @@ -19,15 +19,15 @@ hideall "--sync--" 0.0 "--sync--" Ability { id: "7947", source: "Hephaistos" } window 1,0 7.1 "--sync--" StartsUsing { id: "7944", source: "Hephaistos" } window 20,20 12.1 "Genesis of Flame" Ability { id: "7944", source: "Hephaistos" } -18.2 "Conceptual Octaflare/Conceptual Tetraflare" Ability { id: "(7914|7915)", source: "Hephaistos" } +18.2 "Conceptual Octaflare/Conceptual Tetraflare" Ability { id: ["7914", "7915"], source: "Hephaistos" } 24.4 "Volcanic Torches" Ability { id: "78F7", source: "Hephaistos" } 30.6 "--sync--" Ability { id: "7108", source: "Hephaistos" } 38.5 "Torch Flame" Ability { id: "7927", source: "Hephaistos" } # Human 1 39.9 "Sunforge" Ability { id: "7911", source: "Hephaistos" } -40.9 "Scorching Fang/Sun's Pinion" Ability { id: "(7912|7913)", source: "Hephaistos" } -41.1 "Emergent Octaflare/Emergent Tetraflare" Ability { id: "(7918|7919)", source: "Hephaistos" } +40.9 "Scorching Fang/Sun's Pinion" Ability { id: ["7912", "7913"], source: "Hephaistos" } +41.1 "Emergent Octaflare/Emergent Tetraflare" Ability { id: ["7918", "7919"], source: "Hephaistos" } 48.3 "Flameviper 1" Ability { id: "7945", source: "Hephaistos" } 51.5 "Flameviper 2" Ability { id: "7946", source: "Hephaistos" } @@ -79,10 +79,10 @@ hideall "--sync--" 255.3 "Hemitheos's Flare" Ability { id: "72CE", source: "Hephaistos" } 258.7 "Manifold Flames" Ability { id: "7922", source: "Hephaistos" } 259.5 "Nest of Flamevipers" Ability { id: "7920", source: "Hephaistos" } -266.2 "Sunforge" Ability { id: "(7950|7951)", source: "Illusory Hephaistos" } -266.8 "Tetraflare/Nest of Flamevipers" Ability { id: "(791E|791F)", source: "Hephaistos" } -267.2 "Scorching Fang/Scorched Pinion" Ability { id: "(7952|7953)", source: "Illusory Hephaistos" } -267.6 "Emergent Octaflare/Emergent Tetraflare" Ability { id: "(7918|7919)", source: "Hephaistos" } +266.2 "Sunforge" Ability { id: ["7950", "7951"], source: "Illusory Hephaistos" } +266.8 "Tetraflare/Nest of Flamevipers" Ability { id: ["791E", "791F"], source: "Hephaistos" } +267.2 "Scorching Fang/Scorched Pinion" Ability { id: ["7952", "7953"], source: "Illusory Hephaistos" } +267.6 "Emergent Octaflare/Emergent Tetraflare" Ability { id: ["7918", "7919"], source: "Hephaistos" } 279.8 "Torch Flame" Ability { id: "7927", source: "Hephaistos" } 283.9 "Genesis of Flame" Ability { id: "7944", source: "Hephaistos" } @@ -101,18 +101,18 @@ hideall "--sync--" 329.3 "Stomp Dead 4" #Ability { id: "7937", source: "Hephaistos" } # Human 3 (Snake first) -346.7 "Conceptual Octaflare/Conceptual Tetraflare" Ability { id: "(7914|7915)", source: "Hephaistos" } +346.7 "Conceptual Octaflare/Conceptual Tetraflare" Ability { id: ["7914", "7915"], source: "Hephaistos" } 352.8 "Fourfold Fires" Ability { id: "78F2", source: "Hephaistos" } window 300,10 358.6 "Abyssal Fires" Ability { id: "7954", source: "Hephaistos" } 362.0 "--sync--" Ability { id: "78F0", source: "Hephaistos" } 367.9 "Cthonic Vent 1" Ability { id: "7925", source: "Suneater" } 376.9 "Cthonic Vent 2" Ability { id: "794E", source: "Suneater" } -377.2 "Tetraflare/Octaflare" Ability { id: "(791E|791D)", source: "Hephaistos" } +377.2 "Tetraflare/Octaflare" Ability { id: ["791E", "791D"], source: "Hephaistos" } 381.4 "--sync--" Ability { id: "7108", source: "Hephaistos" } 385.9 "Cthonic Vent 3" Ability { id: "7926", source: "Suneater" } -390.6 "Sunforge" Ability { id: "(7910|7911)", source: "Hephaistos" } -391.6 "Scorching Fang/Sun's Pinion" Ability { id: "(7912|7913)", source: "Hephaistos" } -391.8 "Emergent Octaflare/Emergent Tetraflare" Ability { id: "(7918|7919)", source: "Hephaistos" } +390.6 "Sunforge" Ability { id: ["7910", "7911"], source: "Hephaistos" } +391.6 "Scorching Fang/Sun's Pinion" Ability { id: ["7912", "7913"], source: "Hephaistos" } +391.8 "Emergent Octaflare/Emergent Tetraflare" Ability { id: ["7918", "7919"], source: "Hephaistos" } 399.0 "Flameviper 1" Ability { id: "7945", source: "Hephaistos" } 402.2 "Flameviper 2" Ability { id: "7946", source: "Hephaistos" } @@ -140,8 +140,8 @@ hideall "--sync--" 491.4 "--sync--" Ability { id: "7108", source: "Hephaistos" } 496.6 "Reforged Reflection" Ability { id: "794B", source: "Hephaistos" } 503.1 "Footprint" Ability { id: "7109", source: "Hephaistos" } -509.4 "Quadrupedal Impact/Quadrupedal Crush" Ability { id: "(7A04|7A05)", source: "Hephaistos" } -515.8 "Conceptual Diflare/Conceptual Tetraflare" Ability { id: "(7917|7916)", source: "Hephaistos" } +509.4 "Quadrupedal Impact/Quadrupedal Crush" Ability { id: ["7A04", "7A05"], source: "Hephaistos" } +515.8 "Conceptual Diflare/Conceptual Tetraflare" Ability { id: ["7917", "7916"], source: "Hephaistos" } 522.0 "--sync--" Ability { id: "793B", source: "Hephaistos" } 524.2 "--sync--" Ability { id: "793D", source: "Hephaistos" } 526.4 "--sync--" Ability { id: "793B", source: "Hephaistos" } @@ -149,7 +149,7 @@ hideall "--sync--" 531.0 "--untargetable--" 531.0 "Blazing Footfalls" Ability { id: "7938", source: "Hephaistos" } 531.6 "Trailblaze 1" Ability { id: "793E", source: "Hephaistos" } -532.8 "Emergent Diflare/Emergent Tetraflare" Ability { id: "(791B|7919)", source: "Hephaistos" } +532.8 "Emergent Diflare/Emergent Tetraflare" Ability { id: ["791B", "7919"], source: "Hephaistos" } 535.7 "--sync--" Ability { id: "793F", source: "Hephaistos" } 536.6 "Quadrupedal Impact/Quadrupedal Crush" Ability { id: "7107", source: "Hephaistos" } 539.5 "--sync--" Ability { id: "7939", source: "Hephaistos" } @@ -190,10 +190,10 @@ hideall "--sync--" 1229.2 "Hemitheos's Flare" Ability { id: "72CE", source: "Hephaistos" } 1232.6 "Manifold Flames" Ability { id: "7922", source: "Hephaistos" } 1233.4 "Nest of Flamevipers" Ability { id: "7920", source: "Hephaistos" } -1240.1 "Sunforge" Ability { id: "(7950|7951)", source: "Illusory Hephaistos" } -1240.7 "Tetraflare/Nest of Flamevipers" Ability { id: "(791E|791F)", source: "Hephaistos" } -1241.1 "Scorching Fang/Scorched Pinion" Ability { id: "(7952|7953)", source: "Illusory Hephaistos" } -1241.5 "Emergent Octaflare/Emergent Tetraflare" Ability { id: "(7918|7919)", source: "Hephaistos" } +1240.1 "Sunforge" Ability { id: ["7950", "7951"], source: "Illusory Hephaistos" } +1240.7 "Tetraflare/Nest of Flamevipers" Ability { id: ["791E", "791F"], source: "Hephaistos" } +1241.1 "Scorching Fang/Scorched Pinion" Ability { id: ["7952", "7953"], source: "Illusory Hephaistos" } +1241.5 "Emergent Octaflare/Emergent Tetraflare" Ability { id: ["7918", "7919"], source: "Hephaistos" } 1253.7 "Torch Flame" Ability { id: "7927", source: "Hephaistos" } 1257.8 "Genesis of Flame" Ability { id: "7944", source: "Hephaistos" } @@ -216,18 +216,18 @@ hideall "--sync--" # Human 3 (Beast first) 1331.1 "--sync--" Ability { id: "7949", source: "Hephaistos" } -1346.5 "Conceptual Octaflare/Conceptual Tetraflare" Ability { id: "(7914|7915)", source: "Hephaistos" } +1346.5 "Conceptual Octaflare/Conceptual Tetraflare" Ability { id: ["7914", "7915"], source: "Hephaistos" } 1352.6 "Fourfold Fires" Ability { id: "78F2", source: "Hephaistos" } window 300,10 1358.4 "Abyssal Fires" Ability { id: "7954", source: "Hephaistos" } 1361.8 "--sync--" Ability { id: "78F0", source: "Hephaistos" } 1367.7 "Cthonic Vent 1" Ability { id: "7925", source: "Suneater" } 1376.7 "Cthonic Vent 2" Ability { id: "794E", source: "Suneater" } -1377.0 "Tetraflare/Octaflare" Ability { id: "(791E|791D)", source: "Hephaistos" } +1377.0 "Tetraflare/Octaflare" Ability { id: ["791E", "791D"], source: "Hephaistos" } 1381.2 "--sync--" Ability { id: "7108", source: "Hephaistos" } 1385.7 "Cthonic Vent 3" Ability { id: "7926", source: "Suneater" } -1390.4 "Sunforge" Ability { id: "(7910|7911)", source: "Hephaistos" } -1391.4 "Scorching Fang/Sun's Pinion" Ability { id: "(7912|7913)", source: "Hephaistos" } -1391.6 "Emergent Octaflare/Emergent Tetraflare" Ability { id: "(7918|7919)", source: "Hephaistos" } +1390.4 "Sunforge" Ability { id: ["7910", "7911"], source: "Hephaistos" } +1391.4 "Scorching Fang/Sun's Pinion" Ability { id: ["7912", "7913"], source: "Hephaistos" } +1391.6 "Emergent Octaflare/Emergent Tetraflare" Ability { id: ["7918", "7919"], source: "Hephaistos" } 1398.8 "Flameviper 1" Ability { id: "7945", source: "Hephaistos" } 1402.0 "Flameviper 2" Ability { id: "7946", source: "Hephaistos" } @@ -235,8 +235,8 @@ hideall "--sync--" 1409.1 "--sync--" Ability { id: "7108", source: "Hephaistos" } 1414.3 "Reforged Reflection" Ability { id: "794B", source: "Hephaistos" } 1420.8 "Footprint" Ability { id: "7109", source: "Hephaistos" } -1427.1 "Quadrupedal Impact/Quadrupedal Crush" Ability { id: "(7A04|7A05)", source: "Hephaistos" } -1433.5 "Conceptual Diflare/Conceptual Tetraflare" Ability { id: "(7917|7916)", source: "Hephaistos" } +1427.1 "Quadrupedal Impact/Quadrupedal Crush" Ability { id: ["7A04", "7A05"], source: "Hephaistos" } +1433.5 "Conceptual Diflare/Conceptual Tetraflare" Ability { id: ["7917", "7916"], source: "Hephaistos" } 1439.7 "--sync--" Ability { id: "793B", source: "Hephaistos" } 1441.9 "--sync--" Ability { id: "793D", source: "Hephaistos" } 1444.1 "--sync--" Ability { id: "793B", source: "Hephaistos" } @@ -244,7 +244,7 @@ hideall "--sync--" 1448.7 "--untargetable--" 1448.7 "Blazing Footfalls" Ability { id: "7938", source: "Hephaistos" } 1449.3 "Trailblaze 1" Ability { id: "793E", source: "Hephaistos" } -1450.5 "Emergent Diflare/Emergent Tetraflare" Ability { id: "(791B|7919)", source: "Hephaistos" } +1450.5 "Emergent Diflare/Emergent Tetraflare" Ability { id: ["791B", "7919"], source: "Hephaistos" } 1453.4 "--sync--" Ability { id: "793F", source: "Hephaistos" } 1454.3 "Quadrupedal Impact/Quadrupedal Crush" Ability { id: "7107", source: "Hephaistos" } 1457.2 "--sync--" Ability { id: "7939", source: "Hephaistos" } @@ -302,13 +302,13 @@ hideall "--sync--" 5040.4 "Natural Alignment 1" Ability { id: "79BB", source: "Hephaistos" } window 20,20 5049.5 "Twist Nature" Ability { id: "79BC", source: "Hephaistos" } 5055.6 "Tyrant's Flare" Ability { id: "7A89", source: "Hephaistos" } -5058.6 "Forcible Fire III/Forcible Fire II" Ability { id: "(79BF|79C0)", source: "Hephaistos" } +5058.6 "Forcible Fire III/Forcible Fire II" Ability { id: ["79BF", "79C0"], source: "Hephaistos" } 5058.6 "Tyrant's Flare" Ability { id: "7A8A", source: "Hephaistos" } -5064.6 "Forcible Fire II/Forcible Fire III" Ability { id: "(79C0|79BF)", source: "Hephaistos" } +5064.6 "Forcible Fire II/Forcible Fire III" Ability { id: ["79C0", "79BF"], source: "Hephaistos" } -5064.6 "Ashing Blaze" Ability { id: "(79D7|79D8)", source: "Hephaistos" } -5076.4 "Forcible Trifire/Forcible Difreeze" Ability { id: "(79BD|79BE)", source: "Hephaistos" } -5082.4 "Forcible Difreeze/Forcible Trifire" Ability { id: "(79BE|79BD)", source: "Hephaistos" } +5064.6 "Ashing Blaze" Ability { id: ["79D7", "79D8"], source: "Hephaistos" } +5076.4 "Forcible Trifire/Forcible Difreeze" Ability { id: ["79BD", "79BE"], source: "Hephaistos" } +5082.4 "Forcible Difreeze/Forcible Trifire" Ability { id: ["79BE", "79BD"], source: "Hephaistos" } 5088.7 "Aioniopyr" Ability { id: "79DF", source: "Hephaistos" } window 20,20 5091.7 "--auto--" #Ability { id: "72C2", source: "Hephaistos" } @@ -321,11 +321,11 @@ hideall "--sync--" 5126.3 "Arcane Control" Ability { id: "79B6", source: "Hephaistos" } 5126.7 "Conceptual Shift" Ability { id: "79AD", source: "Hephaistos" } 5126.7 "Splicer" Ability { id: "79B3", source: "Hephaistos" } -5138.5 "Ashing Blaze" Ability { id: "(79D7|79D8)", source: "Hephaistos" } +5138.5 "Ashing Blaze" Ability { id: ["79D7", "79D8"], source: "Hephaistos" } 5138.5 "Arcane Channel" Ability { id: "79B7", source: "Hephaistos" } 5144.6 "Arcane Control" Ability { id: "79B6", source: "Hephaistos" } 5144.7 "Conceptual Shift" Ability { id: "79AD", source: "Hephaistos" } -5156.7 "Ashing Blaze" Ability { id: "(79D7|79D8)", source: "Hephaistos" } +5156.7 "Ashing Blaze" Ability { id: ["79D7", "79D8"], source: "Hephaistos" } 5156.7 "Arcane Channel" Ability { id: "79B7", source: "Hephaistos" } 5159.8 "--targetable--" 5162.8 "Deconceptualize" Ability { id: "7A8E", source: "Hephaistos" } @@ -357,11 +357,11 @@ hideall "--sync--" 5241.5 "Natural Alignment 2" Ability { id: "79BB", source: "Hephaistos" } 5247.6 "Inverse Magicks" Ability { id: "79C2", source: "Hephaistos" } 5253.7 "Twist Nature" Ability { id: "79BC", source: "Hephaistos" } -5262.9 "Forcible Fire III/Forcible Fire II" Ability { id: "(79BF|79C0)", source: "Hephaistos" } -5268.9 "Forcible Fire II/Forcible Fire III" Ability { id: "(79C0|79BF)", source: "Hephaistos" } -5281.8 "Forcible Trifire/Forcible Difreeze" Ability { id: "(79BD|79BE)", source: "Hephaistos" } -5287.9 "Forcible Difreeze/Forcible Trifire" Ability { id: "(79BE|79BD)", source: "Hephaistos" } -5293.8 "Ashing Blaze" Ability { id: "(79D7|79D8)", source: "Hephaistos" } +5262.9 "Forcible Fire III/Forcible Fire II" Ability { id: ["79BF", "79C0"], source: "Hephaistos" } +5268.9 "Forcible Fire II/Forcible Fire III" Ability { id: ["79C0", "79BF"], source: "Hephaistos" } +5281.8 "Forcible Trifire/Forcible Difreeze" Ability { id: ["79BD", "79BE"], source: "Hephaistos" } +5287.9 "Forcible Difreeze/Forcible Trifire" Ability { id: ["79BE", "79BD"], source: "Hephaistos" } +5293.8 "Ashing Blaze" Ability { id: ["79D7", "79D8"], source: "Hephaistos" } 5301.9 "Aioniopyr" Ability { id: "79DF", source: "Hephaistos" } window 20,20 5305.0 "--auto--" #Ability { id: "72C2", source: "Hephaistos" } @@ -375,7 +375,7 @@ hideall "--sync--" 5339.4 "Arcane Control" Ability { id: "79B6", source: "Hephaistos" } 5339.8 "Conceptual Shift" Ability { id: "79AD", source: "Hephaistos" } 5339.8 "Splicer" Ability { id: "79B3", source: "Hephaistos" } -5351.6 "Ashing Blaze" Ability { id: "(79D7|79D8)", source: "Hephaistos" } +5351.6 "Ashing Blaze" Ability { id: ["79D7", "79D8"], source: "Hephaistos" } 5351.6 "Arcane Channel" Ability { id: "79B7", source: "Hephaistos" } 5357.7 "Arcane Control" Ability { id: "79B6", source: "Hephaistos" } 5357.8 "Conceptual Shift" Ability { id: "79AD", source: "Hephaistos" } diff --git a/ui/raidboss/data/06-ew/raid/p9n.txt b/ui/raidboss/data/06-ew/raid/p9n.txt index 68651120d9..abe721e931 100644 --- a/ui/raidboss/data/06-ew/raid/p9n.txt +++ b/ui/raidboss/data/06-ew/raid/p9n.txt @@ -29,8 +29,8 @@ hideall "--sync--" 76.0 "Blizzard III (resolve)" Ability { id: "8121", source: "Kokytos" } 82.6 "Dualspell" Ability { id: "811D", source: "Kokytos" } 85.9 "--sync--" Ability { id: "812[23]", source: "Kokytos" } -90.3 "Fire III" Ability { id: "(8120|811E)", source: "Kokytos" } -90.3 "Blizzard III" Ability { id: "(811F|8121)", source: "Kokytos" } +90.3 "Fire III" Ability { id: ["8120", "811E"], source: "Kokytos" } +90.3 "Blizzard III" Ability { id: ["811F", "8121"], source: "Kokytos" } 99.8 "Global Spell" Ability { id: "8141", source: "Kokytos" } 103.0 "Disgorge" Ability { id: "8124", source: "Kokytos" } @@ -94,8 +94,8 @@ hideall "--sync--" 351.6 "Explosion" Ability { id: "86E[23]", source: "Fire Sphere" } 356.0 "Dualspell" Ability { id: "811D", source: "Kokytos" } 359.3 "--sync--" Ability { id: "812[23]", source: "Kokytos" } -363.8 "Blizzard III" Ability { id: "(811F|8121)", source: "Kokytos" } -363.8 "Fire III" Ability { id: "(811E|8120)", source: "Kokytos" } +363.8 "Blizzard III" Ability { id: ["811F", "8121"], source: "Kokytos" } +363.8 "Fire III" Ability { id: ["811E", "8120"], source: "Kokytos" } 370.5 "Global Spell" Ability { id: "8141", source: "Kokytos" } 372.7 "Disgorge" Ability { id: "8124", source: "Kokytos" } diff --git a/ui/raidboss/data/06-ew/raid/p9s.txt b/ui/raidboss/data/06-ew/raid/p9s.txt index 6e90bd8109..2fc63da63d 100644 --- a/ui/raidboss/data/06-ew/raid/p9s.txt +++ b/ui/raidboss/data/06-ew/raid/p9s.txt @@ -18,23 +18,23 @@ hideall "--sync--" 25.3 "Ravening (Mage #1)" Ability { id: "8118", source: "Kokytos" } 32.0 "Soul Surge" Ability { id: "811B", source: "Kokytos" } 47.0 "Duality of Death" Ability { id: "8151", source: "Kokytos" } -47.9 "Aero IV/Fire IV #1" #Ability { id: "(8152|8153)", source: "Kokytos" } -50.2 "Aero IV/Fire IV #2" #Ability { id: "(8152|8153)", source: "Kokytos" } +47.9 "Aero IV/Fire IV #1" #Ability { id: ["8152", "8153"], source: "Kokytos" } +50.2 "Aero IV/Fire IV #2" #Ability { id: ["8152", "8153"], source: "Kokytos" } 60.4 "Dualspell (Fire/Ice)" Ability { id: "8154", source: "Kokytos" } -63.7 "--sync--" Ability { id: "(8122|8123)", source: "Kokytos" } -68.1 "Blizzard III" Ability { id: "(8157|8159)", source: "Kokytos" } -68.1 "Pile Pyre" Ability { id: "(8156|8158)", source: "Kokytos" } +63.7 "--sync--" Ability { id: ["8122", "8123"], source: "Kokytos" } +68.1 "Blizzard III" Ability { id: ["8157", "8159"], source: "Kokytos" } +68.1 "Pile Pyre" Ability { id: ["8156", "8158"], source: "Kokytos" } 73.4 "Dualspell (Thunder/Ice)" Ability { id: "8155", source: "Kokytos" } -76.7 "--sync--" Ability { id: "(8123|815C)", source: "Kokytos" } -81.1 "Blizzard III" Ability { id: "(8157|8159)", source: "Kokytos" } -81.1 "Thunder III" Ability { id: "(815A|815B)", source: "Kokytos" } +76.7 "--sync--" Ability { id: ["8123", "815C"], source: "Kokytos" } +81.1 "Blizzard III" Ability { id: ["8157", "8159"], source: "Kokytos" } +81.1 "Thunder III" Ability { id: ["815A", "815B"], source: "Kokytos" } 86.4 "Dualspell (Fire/Ice)" Ability { id: "8154", source: "Kokytos" } -89.7 "--sync--" Ability { id: "(8122|8123)", source: "Kokytos" } -94.1 "Blizzard III" Ability { id: "(8157|8159)", source: "Kokytos" } -94.1 "Pile Pyre" Ability { id: "(8156|8158)", source: "Kokytos" } +89.7 "--sync--" Ability { id: ["8122", "8123"], source: "Kokytos" } +94.1 "Blizzard III" Ability { id: ["8157", "8159"], source: "Kokytos" } +94.1 "Pile Pyre" Ability { id: ["8156", "8158"], source: "Kokytos" } 101.8 "Disgorge" Ability { id: "8124", source: "Kokytos" } @@ -46,12 +46,12 @@ hideall "--sync--" 146.4 "Archaic Rockbreaker (cast)" Ability { id: "815F", source: "Kokytos" } 148.0 "Shockwave" Ability { id: "8160", source: "Kokytos" } 149.3 "Archaic Rockbreaker (stacks)" Ability { id: "8162", source: "Kokytos" } -155.5 "Front Combination/Rear Combination" Ability { id: "(8167|8168|8169|816A)", source: "Kokytos" } +155.5 "Front Combination/Rear Combination" Ability { id: ["8167", "8168", "8169", "816A"], source: "Kokytos" } 155.8 "Archaic Rockbreaker #1" Ability { id: "8161", source: "Kokytos" } -156.3 "Inside Roundhouse/Outside Roundhouse" Ability { id: "(8238|8239)", source: "Kokytos" } -158.7 "Swinging Kick" Ability { id: "(816B|816C)", source: "Kokytos" } +156.3 "Inside Roundhouse/Outside Roundhouse" Ability { id: ["8238", "8239"], source: "Kokytos" } +158.7 "Swinging Kick" Ability { id: ["816B", "816C"], source: "Kokytos" } 161.7 "Archaic Rockbreaker #2" Ability { id: "8161", source: "Kokytos" } -162.4 "Outside Roundhouse/Inside Roundhouse" Ability { id: "(8239|8238)", source: "Kokytos" } +162.4 "Outside Roundhouse/Inside Roundhouse" Ability { id: ["8239", "8238"], source: "Kokytos" } 168.7 "Archaic Demolish" Ability { id: "816D", source: "Kokytos" } 175.8 "Gluttony's Augur" Ability { id: "814C", source: "Kokytos" } @@ -95,10 +95,10 @@ hideall "--sync--" 256.5 "--middle--" Ability { id: "8144", source: "Kokytos" } 258.1 "--targetable--" -262.2 "--sync--" Ability { id: "(8122|8123|815C)", source: "Kokytos" } -265.1 "Two Minds" Ability { id: "(8184|8185)", source: "Kokytos" } -266.2 "Blizzard III" Ability { id: "(8157|8159)", source: "Kokytos" } -266.2 "Pile Pyre/Thunder III" Ability { id: "(8156|8158|815A|815B)", source: "Kokytos" } +262.2 "--sync--" Ability { id: ["8122", "8123", "815C"], source: "Kokytos" } +265.1 "Two Minds" Ability { id: ["8184", "8185"], source: "Kokytos" } +266.2 "Blizzard III" Ability { id: ["8157", "8159"], source: "Kokytos" } +266.2 "Pile Pyre/Thunder III" Ability { id: ["8156", "8158", "815A", "815B"], source: "Kokytos" } 272.2 "Gluttony's Augur" Ability { id: "814C", source: "Kokytos" } 276.3 "Disgorge" Ability { id: "8236", source: "Kokytos" } @@ -130,37 +130,37 @@ hideall "--sync--" 374.2 "Ravening (Chimera #2)" Ability { id: "817B", source: "Kokytos" } 380.8 "Soul Surge" Ability { id: "811B", source: "Kokytos" } 393.7 "Duality of Death" Ability { id: "8151", source: "Kokytos" } -394.6 "Aero IV/Fire IV #1" #Ability { id: "(8152|8153)", source: "Kokytos" } -396.4 "Aero IV/Fire IV #2" #Ability { id: "(8152|8153)", source: "Kokytos" } +394.6 "Aero IV/Fire IV #1" #Ability { id: ["8152", "8153"], source: "Kokytos" } +396.4 "Aero IV/Fire IV #2" #Ability { id: ["8152", "8153"], source: "Kokytos" } 402.9 "Archaic Rockbreaker (cast)" Ability { id: "815F", source: "Kokytos" } 404.5 "Shockwave" Ability { id: "8160", source: "Kokytos" } 405.8 "Archaic Rockbreaker (stacks)" Ability { id: "8162", source: "Kokytos" } 412.5 "Archaic Rockbreaker #1" Ability { id: "8161", source: "Kokytos" } -413.2 "Dualspell" Ability { id: "(8154|8155)", source: "Kokytos" } -416.5 "--sync--" Ability { id: "(8122|8123|815C)", source: "Kokytos" } +413.2 "Dualspell" Ability { id: ["8154", "8155"], source: "Kokytos" } +416.5 "--sync--" Ability { id: ["8122", "8123", "815C"], source: "Kokytos" } 418.5 "Archaic Rockbreaker #2" Ability { id: "8161", source: "Kokytos" } -420.9 "Blizzard III" Ability { id: "(8157|8159)", source: "Kokytos" } -420.9 "Pile Pyre/Thunder III" Ability { id: "(8156|8158|815A|815B)", source: "Kokytos" } +420.9 "Blizzard III" Ability { id: ["8157", "8159"], source: "Kokytos" } +420.9 "Pile Pyre/Thunder III" Ability { id: ["8156", "8158", "815A", "815B"], source: "Kokytos" } 426.2 "Gluttony's Augur" Ability { id: "814C", source: "Kokytos" } # Limit Cut 2 438.6 "Chimeric Succession" Ability { id: "81BB", source: "Kokytos" } 449.5 "Icemeld #1" Ability { id: "8183", source: "Kokytos's Echo" } 452.5 "Icemeld #2" Ability { id: "8190", source: "Kokytos's Echo" } -454.2 "Front Firestrikes/Rear Firestrikes" Ability { id: "(878E|878F)", source: "Kokytos" } +454.2 "Front Firestrikes/Rear Firestrikes" Ability { id: ["878E", "878F"], source: "Kokytos" } -454.4 "Pyremeld" Ability { id: "(8793|8794)", source: "Kokytos" } +454.4 "Pyremeld" Ability { id: ["8793", "8794"], source: "Kokytos" } 455.8 "Icemeld #3" Ability { id: "8191", source: "Kokytos's Echo" } 458.6 "Icemeld #4" Ability { id: "8192", source: "Kokytos's Echo" } -459.7 "Swinging Kick" Ability { id: "(8795|8796)", source: "Kokytos" } +459.7 "Swinging Kick" Ability { id: ["8795", "8796"], source: "Kokytos" } 461.8 "--middle--" Ability { id: "8144", source: "Kokytos" } -467.4 "--sync--" Ability { id: "(8122|8123|815C)", source: "Kokytos" } -470.3 "Two Minds" Ability { id: "(8184|8185)", source: "Kokytos" } -471.4 "Blizzard III" Ability { id: "(8157|8159)", source: "Kokytos" } -471.4 "Pile Pyre/Thunder III" Ability { id: "(8156|8158|815A|815B)", source: "Kokytos" } +467.4 "--sync--" Ability { id: ["8122", "8123", "815C"], source: "Kokytos" } +470.3 "Two Minds" Ability { id: ["8184", "8185"], source: "Kokytos" } +471.4 "Blizzard III" Ability { id: ["8157", "8159"], source: "Kokytos" } +471.4 "Pile Pyre/Thunder III" Ability { id: ["8156", "8158", "815A", "815B"], source: "Kokytos" } 472.4 "Disgorge" Ability { id: "8236", source: "Kokytos" } @@ -169,25 +169,25 @@ hideall "--sync--" 486.1 "Ravening (Mage #2)" Ability { id: "8118", source: "Kokytos" } 492.7 "Soul Surge" Ability { id: "811B", source: "Kokytos" } -500.3 "Dualspell" Ability { id: "(8154|8155)", source: "Kokytos" } -503.6 "--sync--" Ability { id: "(8122|8123|815C)", source: "Kokytos" } -508.2 "Blizzard III" Ability { id: "(8157|8159)", source: "Kokytos" } -508.2 "Pile Pyre/Thunder III" Ability { id: "(8156|8158|815A|815B)", source: "Kokytos" } +500.3 "Dualspell" Ability { id: ["8154", "8155"], source: "Kokytos" } +503.6 "--sync--" Ability { id: ["8122", "8123", "815C"], source: "Kokytos" } +508.2 "Blizzard III" Ability { id: ["8157", "8159"], source: "Kokytos" } +508.2 "Pile Pyre/Thunder III" Ability { id: ["8156", "8158", "815A", "815B"], source: "Kokytos" } 513.5 "Gluttony's Augur" Ability { id: "814C", source: "Kokytos" } -520.6 "Dualspell" Ability { id: "(8154|8155)", source: "Kokytos" } -523.9 "--sync--" Ability { id: "(8122|8123|815C)", source: "Kokytos" } -528.5 "Blizzard III" Ability { id: "(8157|8159)", source: "Kokytos" } -528.5 "Pile Pyre/Thunder III" Ability { id: "(8156|8158|815A|815B)", source: "Kokytos" } +520.6 "Dualspell" Ability { id: ["8154", "8155"], source: "Kokytos" } +523.9 "--sync--" Ability { id: ["8122", "8123", "815C"], source: "Kokytos" } +528.5 "Blizzard III" Ability { id: ["8157", "8159"], source: "Kokytos" } +528.5 "Pile Pyre/Thunder III" Ability { id: ["8156", "8158", "815A", "815B"], source: "Kokytos" } 534.8 "Duality of Death" Ability { id: "8151", source: "Kokytos" } -535.7 "Aero IV/Fire IV #1" #Ability { id: "(8152|8153)", source: "Kokytos" } -538.0 "Aero IV/Fire IV #2" #Ability { id: "(8152|8153)", source: "Kokytos" } +535.7 "Aero IV/Fire IV #1" #Ability { id: ["8152", "8153"], source: "Kokytos" } +538.0 "Aero IV/Fire IV #2" #Ability { id: ["8152", "8153"], source: "Kokytos" } -544.0 "Dualspell" Ability { id: "(8154|8155)", source: "Kokytos" } -547.3 "--sync--" Ability { id: "(8122|8123|815C)", source: "Kokytos" } -551.9 "Blizzard III" Ability { id: "(8157|8159)", source: "Kokytos" } -551.9 "Pile Pyre/Thunder III" Ability { id: "(8156|8158|815A|815B)", source: "Kokytos" } +544.0 "Dualspell" Ability { id: ["8154", "8155"], source: "Kokytos" } +547.3 "--sync--" Ability { id: ["8122", "8123", "815C"], source: "Kokytos" } +551.9 "Blizzard III" Ability { id: ["8157", "8159"], source: "Kokytos" } +551.9 "Pile Pyre/Thunder III" Ability { id: ["8156", "8158", "815A", "815B"], source: "Kokytos" } 557.1 "Gluttony's Augur" Ability { id: "814C", source: "Kokytos" } 564.7 "Disgorge" Ability { id: "8124", source: "Kokytos" } diff --git a/ui/raidboss/data/06-ew/trial/barbariccia-ex.txt b/ui/raidboss/data/06-ew/trial/barbariccia-ex.txt index 23ef96c27c..db4832a04b 100644 --- a/ui/raidboss/data/06-ew/trial/barbariccia-ex.txt +++ b/ui/raidboss/data/06-ew/trial/barbariccia-ex.txt @@ -15,30 +15,30 @@ hideall "Brush with Death" # Pattern 1a, linked with pattern 2a through 757A+7575 and 757A+757B # 6? Possible Spell Ids -25.7 "--sync--" StartsUsing { id: "(7573|7464|7465|7466|7489|748B)", source: "Barbariccia" } window 10,10 -31.7 "--sync--" Ability { id: "(7573|7464|7465|7466|7489|748B)", source: "Barbariccia" } -32.7 "Savage Barbery (line/donut)" Ability { id: "(7574|757A)", source: "Barbariccia" } -34.8 "Savage Barbery (out)" Ability { id: "(7575|757B)", source: "Barbariccia" } +25.7 "--sync--" StartsUsing { id: ["7573", "7464", "7465", "7466", "7489", "748B"], source: "Barbariccia" } window 10,10 +31.7 "--sync--" Ability { id: ["7573", "7464", "7465", "7466", "7489", "748B"], source: "Barbariccia" } +32.7 "Savage Barbery (line/donut)" Ability { id: ["7574", "757A"], source: "Barbariccia" } +34.8 "Savage Barbery (out)" Ability { id: ["7575", "757B"], source: "Barbariccia" } 35.8 "Brush with Death" Ability { id: "75A4", source: "Barbariccia" } # Pattern 1b, linked with Pattern 2b through 757C+757D and 757E+757F and also independently by 75A6 and 75A7 -44.9 "--sync--" Ability { id: "(757C|757E)", source: "Barbariccia" } -46.9 "Hair Raid" Ability { id: "(757D|757F)", source: "Barbariccia" } -49.1 "Hair Spray/Deadly Twist" Ability { id: "(75A6|75A7)", source: "Barbariccia" } +44.9 "--sync--" Ability { id: ["757C", "757E"], source: "Barbariccia" } +46.9 "Hair Raid" Ability { id: ["757D", "757F"], source: "Barbariccia" } +49.1 "Hair Spray/Deadly Twist" Ability { id: ["75A6", "75A7"], source: "Barbariccia" } 51.0 "Raging Storm" Ability { id: "7572", source: "Barbariccia" } # Pattern 2a -54.4 "--sync--" StartsUsing { id: "(7573|7464|7465|7466|7489|748B)", source: "Barbariccia" } window 10,10 -60.4 "--sync--" Ability { id: "(7573|7464|7465|7466|7489|748B)", source: "Barbariccia" } -61.4 "Savage Barbery (donut/line)" Ability { id: "(757A|7574)", source: "Barbariccia" } -63.5 "Savage Barbery (out)" Ability { id: "(757B|7575)", source: "Barbariccia" } +54.4 "--sync--" StartsUsing { id: ["7573", "7464", "7465", "7466", "7489", "748B"], source: "Barbariccia" } window 10,10 +60.4 "--sync--" Ability { id: ["7573", "7464", "7465", "7466", "7489", "748B"], source: "Barbariccia" } +61.4 "Savage Barbery (donut/line)" Ability { id: ["757A", "7574"], source: "Barbariccia" } +63.5 "Savage Barbery (out)" Ability { id: ["757B", "7575"], source: "Barbariccia" } 64.5 "Brush with Death" Ability { id: "75A4", source: "Barbariccia" } # Pattern 2b -73.6 "--sync--" Ability { id: "(757E|757C)", source: "Barbariccia" } -75.6 "Hair Raid" Ability { id: "(757F|757D)", source: "Barbariccia" } -77.9 "Deadly Twist/Hair Spray" Ability { id: "(75A7|75A6)", source: "Barbariccia" } +73.6 "--sync--" Ability { id: ["757E", "757C"], source: "Barbariccia" } +75.6 "Hair Raid" Ability { id: ["757F", "757D"], source: "Barbariccia" } +77.9 "Deadly Twist/Hair Spray" Ability { id: ["75A7", "75A6"], source: "Barbariccia" } 85.8 "Void Aero IV" Ability { id: "7570", source: "Barbariccia" } 92.9 "Void Aero III" Ability { id: "7571", source: "Barbariccia" } @@ -129,17 +129,17 @@ hideall "Brush with Death" 338.2 "Secret Breeze (protean)" #Ability { id: "7581", source: "Barbariccia" } # Pattern 3a, linked with pattern 4a through 757A+7575 and 757A+757B -341.4 "--sync--" StartsUsing { id: "(7573|7464|7465|7466|7489|748B)", source: "Barbariccia" } window 10,10 -347.4 "--sync--" Ability { id: "(7573|7464|7465|7466|7489|748B)", source: "Barbariccia" } -348.4 "Savage Barbery (line/donut)" Ability { id: "(7574|757A)", source: "Barbariccia" } -350.5 "Savage Barbery (out)" Ability { id: "(7575|757B)", source: "Barbariccia" } +341.4 "--sync--" StartsUsing { id: ["7573", "7464", "7465", "7466", "7489", "748B"], source: "Barbariccia" } window 10,10 +347.4 "--sync--" Ability { id: ["7573", "7464", "7465", "7466", "7489", "748B"], source: "Barbariccia" } +348.4 "Savage Barbery (line/donut)" Ability { id: ["7574", "757A"], source: "Barbariccia" } +350.5 "Savage Barbery (out)" Ability { id: ["7575", "757B"], source: "Barbariccia" } 351.5 "Brush with Death" Ability { id: "75A4", source: "Barbariccia" } # Pattern 3b, linked with Pattern 4b through 757C+757D and 757E+757F and also independently by 75A6 and 75A7 -360.6 "--sync--" Ability { id: "(757C|757E)", source: "Barbariccia" } -362.6 "Hair Raid" Ability { id: "(757D|757F)", source: "Barbariccia" } -364.9 "Deadly Twist/Hair Spray" Ability { id: "(75A7|75A6)", source: "Barbariccia" } +360.6 "--sync--" Ability { id: ["757C", "757E"], source: "Barbariccia" } +362.6 "Hair Raid" Ability { id: ["757D", "757F"], source: "Barbariccia" } +364.9 "Deadly Twist/Hair Spray" Ability { id: ["75A7", "75A6"], source: "Barbariccia" } 373.8 "Void Aero IV" Ability { id: "7570", source: "Barbariccia" } 380.9 "Void Aero III" Ability { id: "7571", source: "Barbariccia" } @@ -153,15 +153,15 @@ hideall "Brush with Death" 409.2 "Upbraid" Ability { id: "75A8", source: "Barbariccia" } # Pattern 4a -410.7 "--sync--" StartsUsing { id: "(7573|7464|7465|7466|7489|748B)", source: "Barbariccia" } window 10,10 -416.7 "--sync--" Ability { id: "(7573|7464|7465|7466|7489|748B)", source: "Barbariccia" } -417.7 "Savage Barbery (donut/line)" Ability { id: "(757A|7574)", source: "Barbariccia" } -419.8 "Savage Barbery (out)" Ability { id: "(757B|7575)", source: "Barbariccia" } +410.7 "--sync--" StartsUsing { id: ["7573", "7464", "7465", "7466", "7489", "748B"], source: "Barbariccia" } window 10,10 +416.7 "--sync--" Ability { id: ["7573", "7464", "7465", "7466", "7489", "748B"], source: "Barbariccia" } +417.7 "Savage Barbery (donut/line)" Ability { id: ["757A", "7574"], source: "Barbariccia" } +419.8 "Savage Barbery (out)" Ability { id: ["757B", "7575"], source: "Barbariccia" } # Pattern 4b -426.8 "--sync--" Ability { id: "(757C|757E)", source: "Barbariccia" } -428.8 "Hair Raid" Ability { id: "(757D|757F)", source: "Barbariccia" } -430.7 "Hair Spray/Deadly Twist" Ability { id: "(75A6|75A7)", source: "Barbariccia" } +426.8 "--sync--" Ability { id: ["757C", "757E"], source: "Barbariccia" } +428.8 "Hair Raid" Ability { id: ["757D", "757F"], source: "Barbariccia" } +430.7 "Hair Spray/Deadly Twist" Ability { id: ["75A6", "75A7"], source: "Barbariccia" } 439.9 "Void Aero IV" Ability { id: "7570", source: "Barbariccia" } 447.1 "Raging Storm" Ability { id: "7572", source: "Barbariccia" } @@ -224,17 +224,17 @@ hideall "Brush with Death" 622.9 "Secret Breeze (protean)" #Ability { id: "7581", source: "Barbariccia" } # Pattern 5a -626.2 "--sync--" StartsUsing { id: "(7573|7464|7465|7466|7489|748B)", source: "Barbariccia" } window 10,10 -632.2 "--sync--" Ability { id: "(7573|7464|7465|7466|7489|748B)", source: "Barbariccia" } -633.2 "Savage Barbery (line/donut)" Ability { id: "(7574|757A)", source: "Barbariccia" } -635.3 "Savage Barbery (out)" Ability { id: "(7575|757B)", source: "Barbariccia" } +626.2 "--sync--" StartsUsing { id: ["7573", "7464", "7465", "7466", "7489", "748B"], source: "Barbariccia" } window 10,10 +632.2 "--sync--" Ability { id: ["7573", "7464", "7465", "7466", "7489", "748B"], source: "Barbariccia" } +633.2 "Savage Barbery (line/donut)" Ability { id: ["7574", "757A"], source: "Barbariccia" } +635.3 "Savage Barbery (out)" Ability { id: ["7575", "757B"], source: "Barbariccia" } 636.3 "Brush with Death" Ability { id: "75A4", source: "Barbariccia" } # Pattern 5b -645.4 "--sync--" Ability { id: "(757C|757E)", source: "Barbariccia" } -647.4 "Hair Raid" Ability { id: "(757D|757F)", source: "Barbariccia" } -649.7 "Hair Spray/Deadly Twist" Ability { id: "(75A6|75A7)", source: "Barbariccia" } +645.4 "--sync--" Ability { id: ["757C", "757E"], source: "Barbariccia" } +647.4 "Hair Raid" Ability { id: ["757D", "757F"], source: "Barbariccia" } +649.7 "Hair Spray/Deadly Twist" Ability { id: ["75A6", "75A7"], source: "Barbariccia" } 658.6 "Void Aero IV" Ability { id: "7570", source: "Barbariccia" } 660.7 "Raging Storm" Ability { id: "7572", source: "Barbariccia" } diff --git a/ui/raidboss/data/06-ew/trial/hydaelyn-ex.txt b/ui/raidboss/data/06-ew/trial/hydaelyn-ex.txt index b1903a3a44..7df5dc82e6 100644 --- a/ui/raidboss/data/06-ew/trial/hydaelyn-ex.txt +++ b/ui/raidboss/data/06-ew/trial/hydaelyn-ex.txt @@ -19,11 +19,11 @@ hideall "--sync--" 44.8 "--sync--" Ability { id: "6598", source: "Hydaelyn" } jump 144.8 44.8 "--sync--" Ability { id: "6594", source: "Hydaelyn" } jump 242.9 -44.8 "Highest Holy/Anthelion?" #Ability { id: "(6598|6594)", source: "Hydaelyn" } +44.8 "Highest Holy/Anthelion?" #Ability { id: ["6598", "6594"], source: "Hydaelyn" } 47.9 "--sync--" #Ability { id: "65A[01]", source: "Hydaelyn" } 48.8 "Crystalline Water III" #Ability { id: "65A2", source: "Hydaelyn" } -56.4 "Magos's Radiance/Mousa's Scorn?" #Ability { id: "(65C2|65C0)", source: "Hydaelyn" } -66.6 "Aureole/Lateral Aureole?" #Ability { id: "(6C91|6F13)", source: "Hydaelyn" } +56.4 "Magos's Radiance/Mousa's Scorn?" #Ability { id: ["65C2", "65C0"], source: "Hydaelyn" } +66.6 "Aureole/Lateral Aureole?" #Ability { id: ["6C91", "6F13"], source: "Hydaelyn" } # Highest Holy first @@ -31,15 +31,15 @@ hideall "--sync--" 147.9 "--sync--" Ability { id: "65A0", source: "Hydaelyn" } 148.8 "Crystalline Water III" Ability { id: "65A2", source: "Hydaelyn" } 156.4 "Magos's Radiance" Ability { id: "65C2", source: "Hydaelyn" } -166.6 "Aureole/Lateral Aureole" Ability { id: "(6C91|6F13)", source: "Hydaelyn" } +166.6 "Aureole/Lateral Aureole" Ability { id: ["6C91", "6F13"], source: "Hydaelyn" } 175.7 "Crystallize" Ability { id: "659C", source: "Hydaelyn" } 184.9 "Anthelion" Ability { id: "6594", source: "Hydaelyn" } 188.0 "--sync--" Ability { id: "65A1", source: "Hydaelyn" } 188.9 "Crystalline Blizzard III" Ability { id: "65A4", source: "Hydaelyn" } 197.1 "Mousa's Scorn" Ability { id: "65C0", source: "Hydaelyn" } -207.3 "Aureole/Lateral Aureole" Ability { id: "(6F11|65C5)", source: "Hydaelyn" } jump 307.1 -216.6 "Crystallize" #Ability { id: "(659E|6ED5|659A|659B)", source: "Hydaelyn" } +207.3 "Aureole/Lateral Aureole" Ability { id: ["6F11", "65C5"], source: "Hydaelyn" } jump 307.1 +216.6 "Crystallize" #Ability { id: ["659E", "6ED5", "659A", "659B"], source: "Hydaelyn" } 225.8 "Equinox" #Ability { id: "65C3", source: "Hydaelyn" } 228.9 "--sync--" #Ability { id: "659F", source: "Hydaelyn" } 229.8 "Crystalline Water/Stone III" #Ability { id: "65A[23]", source: "Hydaelyn" } @@ -51,7 +51,7 @@ hideall "--sync--" 246.0 "--sync--" Ability { id: "65A1", source: "Hydaelyn" } 246.9 "Crystalline Water III" Ability { id: "65A2", source: "Hydaelyn" } 255.1 "Mousa's Scorn" Ability { id: "65C0", source: "Hydaelyn" } -265.3 "Aureole/Lateral Aureole" Ability { id: "(6F11|65C5)", source: "Hydaelyn" } +265.3 "Aureole/Lateral Aureole" Ability { id: ["6F11", "65C5"], source: "Hydaelyn" } 276.1 "Crystallize" Ability { id: "659D", source: "Hydaelyn" } 285.3 "Highest Holy" Ability { id: "6598", source: "Hydaelyn" } 288.4 "--sync--" Ability { id: "65A0", source: "Hydaelyn" } @@ -60,8 +60,8 @@ hideall "--sync--" # -> naturally into Crystallize 3 (or jump from above) # Crystallize 3 (Equinox and Water/Stone) -307.1 "Aureole/Lateral Aureole" Ability { id: "(6C91|6F13)", source: "Hydaelyn" } -316.4 "Crystallize" Ability { id: "(659E|6ED5|659A|659B)", source: "Hydaelyn" } +307.1 "Aureole/Lateral Aureole" Ability { id: ["6C91", "6F13"], source: "Hydaelyn" } +316.4 "Crystallize" Ability { id: ["659E", "6ED5", "659A", "659B"], source: "Hydaelyn" } 325.6 "Equinox" Ability { id: "65C3", source: "Hydaelyn" } 328.7 "--sync--" Ability { id: "659F", source: "Hydaelyn" } 329.6 "Crystalline Water/Stone III" Ability { id: "65A[23]", source: "Hydaelyn" } @@ -105,11 +105,11 @@ hideall "--sync--" # Parhelion or Parhelic Circle 1575.3 "--sync--" Ability { id: "6594", source: "Hydaelyn" } jump 1675.3 1575.3 "--sync--" Ability { id: "6598", source: "Hydaelyn" } jump 1966.1 -1575.3 "Anthelion/Highest Holy?" #Ability { id: "(6594|6598)", source: "Hydaelyn" } -1585.5 "Mousa's Scorn/Magos's Radiance?" #Ability { id: "(65C0|65C2)", source: "Hydaelyn" } +1575.3 "Anthelion/Highest Holy?" #Ability { id: ["6594", "6598"], source: "Hydaelyn" } +1585.5 "Mousa's Scorn/Magos's Radiance?" #Ability { id: ["65C0", "65C2"], source: "Hydaelyn" } 1590.7 "--middle?--" #Ability { id: "6E7A", source: "Hydaelyn" } 1594.6 "Crystallize?" #Ability { id: "659C", source: "Hydaelyn" } -1597.2 "Parhelion?" Ability { id: "(65B0|65AC)", source: "Hydaelyn" } +1597.2 "Parhelion?" Ability { id: ["65B0", "65AC"], source: "Hydaelyn" } 1597.8 "--top-middle?--" #Ability { id: "65A9", source: "Hydaelyn" } 1605.4 "Parhelic Circle?" #Ability { id: "65AC", source: "Hydaelyn" } @@ -129,7 +129,7 @@ hideall "--sync--" 1717.2 "--sync--" Ability { id: "65A1", source: "Hydaelyn" } 1717.9 "Beacon 2" #Ability { id: "65B3", source: "Parhelion" } 1719.5 "Beacon 3" #Ability { id: "65B3", source: "Parhelion" } -1724.4 "Aureole/Lateral Aureole" Ability { id: "(6F11|65C5)", source: "Hydaelyn" } +1724.4 "Aureole/Lateral Aureole" Ability { id: ["6F11", "65C5"], source: "Hydaelyn" } 1733.5 "Highest Holy" Ability { id: "6598", source: "Hydaelyn" } 1743.6 "Magos's Radiance" Ability { id: "65C2", source: "Hydaelyn" } @@ -140,7 +140,7 @@ hideall "--sync--" 1765.4 "Incandescence" Ability { id: "65AF", source: "Mystic Refulgence" } 1766.7 "--sync--" Ability { id: "65A0", source: "Hydaelyn" } 1768.9 "Crystalline Blizzard III" Ability { id: "65A4", source: "Hydaelyn" } -1774.7 "Aureole/Lateral Aureole" Ability { id: "(6C91|6F13)", source: "Hydaelyn" } +1774.7 "Aureole/Lateral Aureole" Ability { id: ["6C91", "6F13"], source: "Hydaelyn" } 1783.8 "Equinox" Ability { id: "65C3", source: "Hydaelyn" } 1791.0 "--middle--" Ability { id: "65A9", source: "Hydaelyn" } 1797.6 "Radiant Halo" Ability { id: "65B4", source: "Hydaelyn" } @@ -162,7 +162,7 @@ hideall "--sync--" 1998.2 "Incandescence" Ability { id: "65AF", source: "Mystic Refulgence" } 1999.5 "--sync--" Ability { id: "65A0", source: "Hydaelyn" } 2001.7 "Crystalline Blizzard III" Ability { id: "65A4", source: "Hydaelyn" } -2007.6 "Aureole/Lateral Aureole" Ability { id: "(6C91|6F13)", source: "Hydaelyn" } +2007.6 "Aureole/Lateral Aureole" Ability { id: ["6C91", "6F13"], source: "Hydaelyn" } 2016.7 "Anthelion" Ability { id: "6594", source: "Hydaelyn" } 2026.9 "Mousa's Scorn" Ability { id: "65C0", source: "Hydaelyn" } @@ -178,7 +178,7 @@ hideall "--sync--" 2058.7 "--sync--" Ability { id: "65A1", source: "Hydaelyn" } 2059.4 "Beacon 2" #Ability { id: "65B3", source: "Parhelion" } 2061.0 "Beacon 3" #Ability { id: "65B3", source: "Parhelion" } -2065.8 "Aureole/Lateral Aureole" Ability { id: "(6F11|65C5)", source: "Hydaelyn" } +2065.8 "Aureole/Lateral Aureole" Ability { id: ["6F11", "65C5"], source: "Hydaelyn" } 2074.9 "Equinox" Ability { id: "65C3", source: "Hydaelyn" } 2082.1 "--top-middle--" Ability { id: "65A9", source: "Hydaelyn" } 2088.6 "Radiant Halo" Ability { id: "65B4", source: "Hydaelyn" } @@ -199,7 +199,7 @@ hideall "--sync--" 2246.3 "Crystallize" Ability { id: "659A", source: "Hydaelyn" } 2253.9 "Shining Saber" Ability { id: "68C8", source: "Hydaelyn" } 2258.2 "Crystalline Water III" Ability { id: "65A2", source: "Hydaelyn" } -2263.2 "Highest Holy/Anthelion" Ability { id: "(6594|6598)", source: "Hydaelyn" } +2263.2 "Highest Holy/Anthelion" Ability { id: ["6594", "6598"], source: "Hydaelyn" } 2266.3 "--sync--" Ability { id: "65A[01]", source: "Hydaelyn" } # Lightwave 4 @@ -209,13 +209,13 @@ hideall "--sync--" 2301.8 "Dichroic Spectrum" Ability { id: "65B8", source: "Hydaelyn" } 2314.0 "Crystallize" Ability { id: "659[CD]", source: "Hydaelyn" } -2321.7 "Aureole/Lateral Aureole" Ability { id: "(6C91|6F13|6F11|65C5)", source: "Hydaelyn" } +2321.7 "Aureole/Lateral Aureole" Ability { id: ["6C91", "6F13", "6F11", "65C5"], source: "Hydaelyn" } 2325.9 "Crystalline Blizzard III" Ability { id: "65A4", source: "Hydaelyn" } -2330.9 "Highest Holy/Anthelion" Ability { id: "(6594|6598)", source: "Hydaelyn" } +2330.9 "Highest Holy/Anthelion" Ability { id: ["6594", "6598"], source: "Hydaelyn" } 2334.0 "--sync--" Ability { id: "65A[01]", source: "Hydaelyn" } 2342.1 "Crystallize" Ability { id: "659E", source: "Hydaelyn" } -2350.3 "Aureole/Lateral Aureole" Ability { id: "(6C91|6F13|6F11|65C5)", source: "Hydaelyn" } +2350.3 "Aureole/Lateral Aureole" Ability { id: ["6C91", "6F13", "6F11", "65C5"], source: "Hydaelyn" } 2354.5 "Crystalline Stone III" Ability { id: "65A3", source: "Hydaelyn" } 2359.5 "Equinox" Ability { id: "65C3", source: "Hydaelyn" } diff --git a/ui/raidboss/data/06-ew/trial/hydaelyn.txt b/ui/raidboss/data/06-ew/trial/hydaelyn.txt index a390d4bb2e..a5cf40bbc4 100644 --- a/ui/raidboss/data/06-ew/trial/hydaelyn.txt +++ b/ui/raidboss/data/06-ew/trial/hydaelyn.txt @@ -136,7 +136,7 @@ hideall "--sync--" 2155.4 "Dawn Mantle" #Ability { id: "6C0C", source: "Hydaelyn" } 2161.7 "Equinox" #Ability { id: "65C3", source: "Hydaelyn" } 2164.8 "--sync--" #Ability { id: "659F", source: "Hydaelyn" } -2165.5 "Crystalline Blizzard III/Crystalline Stone III" #Ability { id: "(6C5A|6C59)", source: "Hydaelyn" } +2165.5 "Crystalline Blizzard III/Crystalline Stone III" #Ability { id: ["6C5A", "6C59"], source: "Hydaelyn" } ### Parhelion first @@ -177,32 +177,32 @@ hideall "--sync--" 3155.2 "Dawn Mantle" Ability { id: "6C0C", source: "Hydaelyn" } 3161.5 "Equinox" Ability { id: "65C3", source: "Hydaelyn" } 3164.6 "--sync--" Ability { id: "659F", source: "Hydaelyn" } -3165.4 "Crystalline Blizzard III/Crystalline Stone III" Ability { id: "(6C5A|6C59)", source: "Hydaelyn" } +3165.4 "Crystalline Blizzard III/Crystalline Stone III" Ability { id: ["6C5A", "6C59"], source: "Hydaelyn" } 3176.9 "Heros's Sundering" Ability { id: "65D5", source: "Hydaelyn" } 3180.0 "--sync--" Ability { id: "65A9", source: "Hydaelyn" } 3186.5 "Radiant Halo" Ability { id: "65D0", source: "Hydaelyn" } # Lightwave loop -3191.8 "--sync--" StartsUsing { id: "(6693|6694|6695)", source: "Hydaelyn" } -3195.8 "Lightwave" Ability { id: "(6693|6694|6695)", source: "Hydaelyn" } -3203.9 "Echoes" Ability { id: "(65B5|65B6|65B7)", source: "Hydaelyn" } +3191.8 "--sync--" StartsUsing { id: ["6693", "6694", "6695"], source: "Hydaelyn" } +3195.8 "Lightwave" Ability { id: ["6693", "6694", "6695"], source: "Hydaelyn" } +3203.9 "Echoes" Ability { id: ["65B5", "65B6", "65B7"], source: "Hydaelyn" } 3221.1 "Crystallize" Ability { id: "659[CE]", source: "Hydaelyn" } -3224.3 "--middle--" Ability { id: "(65A9|6E7A)", source: "Hydaelyn" } +3224.3 "--middle--" Ability { id: ["65A9", "6E7A"], source: "Hydaelyn" } 3230.7 "Dawn Mantle" Ability { id: "6C0C", source: "Hydaelyn" } -3237.0 "Highest Holy/Anthelion/Equinox" Ability { id: "(65C3|65C7|65C8)", source: "Hydaelyn" } +3237.0 "Highest Holy/Anthelion/Equinox" Ability { id: ["65C3", "65C7", "65C8"], source: "Hydaelyn" } # This timing is +/- 1 second for some reason (even with the same Crystallize), # so don't sync because it throws Lightwave off even more. -3239.9 "Crystalline Blizzard III/Crystalline Stone III" #Ability { id: "(6C5A|6C59)", source: "Hydaelyn" } +3239.9 "Crystalline Blizzard III/Crystalline Stone III" #Ability { id: ["6C5A", "6C59"], source: "Hydaelyn" } # Even ignoring the blizzard/stone above, this is still +/- 0.5s, so add a starts using cast. # TODO: it's possible the first loop is slightly different?? -3245.8 "--sync--" StartsUsing { id: "(6693|6694|6695)", source: "Hydaelyn" } window 30,30 jump 3191.8 -3249.8 "Lightwave" #Ability { id: "(6693|6694|6695)", source: "Hydaelyn" } -3257.9 "Echoes" #Ability { id: "(65B5|65B6|65B7)", source: "Hydaelyn" } +3245.8 "--sync--" StartsUsing { id: ["6693", "6694", "6695"], source: "Hydaelyn" } window 30,30 jump 3191.8 +3249.8 "Lightwave" #Ability { id: ["6693", "6694", "6695"], source: "Hydaelyn" } +3257.9 "Echoes" #Ability { id: ["65B5", "65B6", "65B7"], source: "Hydaelyn" } 3275.1 "Crystallize" #Ability { id: "659[CE]", source: "Hydaelyn" } -3278.3 "--middle--" #Ability { id: "(65A9|6E7A)", source: "Hydaelyn" } +3278.3 "--middle--" #Ability { id: ["65A9", "6E7A"], source: "Hydaelyn" } 3284.7 "Dawn Mantle" #Ability { id: "6C0C", source: "Hydaelyn" } -3291.0 "Highest Holy/Anthelion/Equinox" #Ability { id: "(65C3|65C7|65C8)", source: "Hydaelyn" } -3293.9 "Crystalline Blizzard III/Crystalline Stone III" #Ability { id: "(6C5A|6C59)", source: "Hydaelyn" } +3291.0 "Highest Holy/Anthelion/Equinox" #Ability { id: ["65C3", "65C7", "65C8"], source: "Hydaelyn" } +3293.9 "Crystalline Blizzard III/Crystalline Stone III" #Ability { id: ["6C5A", "6C59"], source: "Hydaelyn" } diff --git a/ui/raidboss/data/06-ew/trial/rubicante-ex.txt b/ui/raidboss/data/06-ew/trial/rubicante-ex.txt index 8ce768245d..80bcea5c23 100644 --- a/ui/raidboss/data/06-ew/trial/rubicante-ex.txt +++ b/ui/raidboss/data/06-ew/trial/rubicante-ex.txt @@ -19,7 +19,7 @@ hideall "Infernal Slaughter" 17.4 "Hope Abandon Ye" Ability { id: "7F27", source: "Rubicante" } 26.8 "Arcane Revelation" Ability { id: "7CBE", source: "Rubicante" } 49.0 "Ordeal of Purgation 1" Ability { id: "80E9", source: "Rubicante" } -57.0 "Fiery Expiation" Ability { id: "(7CEF|7CF0)", source: "Circle of Purgatory" } +57.0 "Fiery Expiation" Ability { id: ["7CEF", "7CF0"], source: "Circle of Purgatory" } 75.8 "Ordeal of Purgation 2" Ability { id: "80E9", source: "Rubicante" } 83.8 "Fiery Expiation" Ability { id: "7CF0", source: "Circle of Purgatory" } 97.9 "Shattering Heat" Ability { id: "7D2D", source: "Rubicante" } @@ -29,10 +29,10 @@ hideall "Infernal Slaughter" 113.1 "Arch Inferno" Ability { id: "7CF9", source: "Rubicante" } 113.1 "Inferno Devil x2" Ability { id: "7CFB", source: "Rubicante" } duration 26 116.2 "Infernal Slaughter" Ability { id: "7D00", source: "Rubicante" } -122.1 "Spike of Flame/Fourfold Flame/Twinfold Flame 1" Ability { id: "(7D02|7D03|7D04)", source: "Rubicante" } +122.1 "Spike of Flame/Fourfold Flame/Twinfold Flame 1" Ability { id: ["7D02", "7D03", "7D04"], source: "Rubicante" } 126.3 "Conflagration" Ability { id: "7CFD", source: "Rubicante" } 129.4 "Infernal Slaughter" Ability { id: "7D00", source: "Rubicante" } -135.3 "Spike of Flame/Fourfold Flame/Twinfold Flame 2" Ability { id: "(7D02|7D03|7D04)", source: "Rubicante" } +135.3 "Spike of Flame/Fourfold Flame/Twinfold Flame 2" Ability { id: ["7D02", "7D03", "7D04"], source: "Rubicante" } 142.5 "Radial Flagration" Ability { id: "7CFE", source: "Rubicante" } 152.6 "Inferno (aoe)" Ability { id: "7D2C", source: "Rubicante" } @@ -79,11 +79,11 @@ hideall "Infernal Slaughter" # Scalding/Line baits 1 1071.0 "--middle--" Ability { id: "7CBD", source: "Rubicante" } -1078.0 "Scalding Ring/Scalding Signal" Ability { id: "(7D25|7D24)", source: "Rubicante" } +1078.0 "Scalding Ring/Scalding Signal" Ability { id: ["7D25", "7D24"], source: "Rubicante" } 1079.1 "Scalding Fleet" Ability { id: "7D26", source: "Rubicante Mirage" } 1088.1 "Sweeping Immolation" Ability { id: "7D21", source: "Rubicante" } 1088.5 "Scalding Fleet" #Ability { id: "7D27", source: "Rubicante Mirage" } -1088.5 "Partial Immolation/Total Immolation" Ability { id: "(7D22|7D23)", source: "Rubicante" } +1088.5 "Partial Immolation/Total Immolation" Ability { id: ["7D22", "7D23"], source: "Rubicante" } 1094.2 "Explosive Pyre" Ability { id: "7D11", source: "Rubicante" } 1102.3 "Dualfire" Ability { id: "7D2E", source: "Rubicante" } @@ -93,9 +93,9 @@ hideall "Infernal Slaughter" 1114.7 "Hope Abandon Ye" Ability { id: "7F27", source: "Rubicante" } 1124.1 "Arcane Revelation" Ability { id: "7CBE", source: "Rubicante" } 1146.8 "Ordeal of Purgation 5" Ability { id: "80E9", source: "Rubicante" } -1154.8 "Fiery Expiation" Ability { id: "(7CEF|7CF0)", source: "Circle of Purgatory" } +1154.8 "Fiery Expiation" Ability { id: ["7CEF", "7CF0"], source: "Circle of Purgatory" } 1173.1 "Ordeal of Purgation 6" Ability { id: "80E9", source: "Rubicante" } -1181.1 "Fiery Expiation" Ability { id: "(7CEF|7CF0)", source: "Circle of Purgatory" } +1181.1 "Fiery Expiation" Ability { id: ["7CEF", "7CF0"], source: "Circle of Purgatory" } 1190.2 "Inferno (aoe)" Ability { id: "7D2C", source: "Rubicante" } @@ -115,11 +115,11 @@ hideall "Infernal Slaughter" # Scalding/Line baits 2 1240.1 "--middle--" Ability { id: "7CBD", source: "Rubicante" } -1247.1 "Scalding Ring/Scalding Signal" Ability { id: "(7D25|7D24)", source: "Rubicante" } +1247.1 "Scalding Ring/Scalding Signal" Ability { id: ["7D25", "7D24"], source: "Rubicante" } 1248.2 "Scalding Fleet" Ability { id: "7D26", source: "Rubicante Mirage" } 1257.4 "Sweeping Immolation" Ability { id: "7D20", source: "Rubicante" } 1257.7 "Scalding Fleet" Ability { id: "7D27", source: "Rubicante Mirage" } -1257.8 "Partial Immolation/Total Immolation" Ability { id: "(7D22|7D23)", source: "Rubicante" } +1257.8 "Partial Immolation/Total Immolation" Ability { id: ["7D22", "7D23"], source: "Rubicante" } 1263.5 "Explosive Pyre" Ability { id: "7D11", source: "Rubicante" } 1271.5 "Dualfire" Ability { id: "7D2E", source: "Rubicante" } diff --git a/ui/raidboss/data/06-ew/trial/sephirot-un.txt b/ui/raidboss/data/06-ew/trial/sephirot-un.txt index 9654ee8f81..cb2e9f313e 100644 --- a/ui/raidboss/data/06-ew/trial/sephirot-un.txt +++ b/ui/raidboss/data/06-ew/trial/sephirot-un.txt @@ -64,19 +64,19 @@ hideall "--sync--" # Phase 2 rotation block, 197.3 seconds 1013.2 "Yesod" Ability { id: "76AB", source: "Sephirot" } window 30,30 1016.2 "Force Field" Ability { id: "76B4", source: "Sephirot" } -1028.4 "Chesed Gevurah" Ability { id: "(76A5|76A6)", source: "Sephirot" } -1029.0 "Life Force + Spirit" Ability { id: "(76A7|76A8)", source: "Sephirot" } +1028.4 "Chesed Gevurah" Ability { id: ["76A5", "76A6"], source: "Sephirot" } +1029.0 "Life Force + Spirit" Ability { id: ["76A7", "76A8"], source: "Sephirot" } 1034.6 "Fiendish Wail" Ability { id: "76A3", source: "Sephirot" } 1042.7 "Da'at Tethers" duration 5 #Ability { id: "769F", source: "Sephirot" } 1053.3 "Fiendish Wail" Ability { id: "76A3", source: "Sephirot" } -1060.3 "Chesed Gevurah" Ability { id: "(76A5|76A6)", source: "Sephirot" } -1060.9 "Life Force + Spirit" Ability { id: "(76A7|76A8)", source: "Sephirot" } +1060.3 "Chesed Gevurah" Ability { id: ["76A5", "76A6"], source: "Sephirot" } +1060.9 "Life Force + Spirit" Ability { id: ["76A7", "76A8"], source: "Sephirot" } 1068.4 "Earth Shaker" Ability { id: "76AA", source: "Sephirot" } 1070.1 "Yesod" Ability { id: "76AB", source: "Sephirot" } window 20,20 1077.7 "Da'at spread" duration 3.2 #Ability { id: "76AD", source: "Sephirot" } 1085.1 "Fiendish Wail" Ability { id: "76A3", source: "Sephirot" } -1092.2 "Chesed Gevurah" Ability { id: "(76A5|76A6)", source: "Sephirot" } -1092.9 "Life Force + Spirit" Ability { id: "(76A7|76A8)", source: "Sephirot" } +1092.2 "Chesed Gevurah" Ability { id: ["76A5", "76A6"], source: "Sephirot" } +1092.9 "Life Force + Spirit" Ability { id: ["76A7", "76A8"], source: "Sephirot" } 1101.0 "Pillar of Mercy 1" Ability { id: "76AD", source: "Sephirot" } 1101.3 "Yesod" Ability { id: "76AB", source: "Sephirot" } window 20,20 1106.2 "Pillar of Mercy 2" Ability { id: "76AD", source: "Sephirot" } @@ -85,38 +85,38 @@ hideall "--sync--" 1128.8 "Da'at spread" duration 3.2 #Ability { id: "76AD", source: "Sephirot" } 1129.7 "Yesod" Ability { id: "76AB", source: "Sephirot" } window 20,20 1136.1 "Fiendish Wail" Ability { id: "76A3", source: "Sephirot" } -1143.2 "Chesed Gevurah" Ability { id: "(76A5|76A6)", source: "Sephirot" } -1143.8 "Life Force + Spirit" Ability { id: "(76A7|76A8)", source: "Sephirot" } +1143.2 "Chesed Gevurah" Ability { id: ["76A5", "76A6"], source: "Sephirot" } +1143.8 "Life Force + Spirit" Ability { id: ["76A7", "76A8"], source: "Sephirot" } 1149.4 "Malkuth" Ability { id: "76AF", source: "Sephirot" } window 30,30 1150.5 "Adds Spawn" AddedCombatant { name: "Storm Of Words" } -1158.7 "Chesed Gevurah" Ability { id: "(76A5|76A6)", source: "Sephirot" } -1159.3 "Life Force + Spirit" Ability { id: "(76A7|76A8)", source: "Sephirot" } +1158.7 "Chesed Gevurah" Ability { id: ["76A5", "76A6"], source: "Sephirot" } +1159.3 "Life Force + Spirit" Ability { id: ["76A7", "76A8"], source: "Sephirot" } 1164.9 "Fiendish Wail" Ability { id: "76A3", source: "Sephirot" } 1166.5 "Yesod" Ability { id: "76AB", source: "Sephirot" } -1172.2 "Chesed Gevurah" Ability { id: "(76A5|76A6)", source: "Sephirot" } -1172.8 "Life Force + Spirit" Ability { id: "(76A7|76A8)", source: "Sephirot" } +1172.2 "Chesed Gevurah" Ability { id: ["76A5", "76A6"], source: "Sephirot" } +1172.8 "Life Force + Spirit" Ability { id: ["76A7", "76A8"], source: "Sephirot" } 1185.8 "Yesod" Ability { id: "76AB", source: "Sephirot" } -1188.4 "Chesed Gevurah" Ability { id: "(76A5|76A6)", source: "Sephirot" } -1189.0 "Life Force + Spirit" Ability { id: "(76A7|76A8)", source: "Sephirot" } +1188.4 "Chesed Gevurah" Ability { id: ["76A5", "76A6"], source: "Sephirot" } +1189.0 "Life Force + Spirit" Ability { id: ["76A7", "76A8"], source: "Sephirot" } 1191.6 "Pillar of Severity" Ability { id: "76B2", source: "Sephirot" } 1195.3 "Impact of Hod" Ability { id: "76BA", source: "Sephirot" } 1199.7 "Ascension" Ability { id: "76B1", source: "Coronal Wind" } 1210.4 "Yesod" Ability { id: "76AB", source: "Sephirot" } window 30,30 1213.5 "Force Field" Ability { id: "76B4", source: "Sephirot" } -1225.7 "Chesed Gevurah" Ability { id: "(76A5|76A6)", source: "Sephirot" } -1226.3 "Life Force + Spirit" Ability { id: "(76A7|76A8)", source: "Sephirot" } +1225.7 "Chesed Gevurah" Ability { id: ["76A5", "76A6"], source: "Sephirot" } +1226.3 "Life Force + Spirit" Ability { id: ["76A7", "76A8"], source: "Sephirot" } 1231.9 "Fiendish Wail" Ability { id: "76A3", source: "Sephirot" } 1240.0 "Da'at Tethers" duration 5 #Ability { id: "769F", source: "Sephirot" } 1250.6 "Fiendish Wail" Ability { id: "76A3", source: "Sephirot" } -1257.6 "Chesed Gevurah" Ability { id: "(76A5|76A6)", source: "Sephirot" } -1258.2 "Life Force + Spirit" Ability { id: "(76A7|76A8)", source: "Sephirot" } +1257.6 "Chesed Gevurah" Ability { id: ["76A5", "76A6"], source: "Sephirot" } +1258.2 "Life Force + Spirit" Ability { id: ["76A7", "76A8"], source: "Sephirot" } 1265.7 "Earth Shaker" Ability { id: "76AA", source: "Sephirot" } 1267.4 "Yesod" Ability { id: "76AB", source: "Sephirot" } window 20,20 1275.0 "Da'at spread" duration 3.2 #Ability { id: "76AD", source: "Sephirot" } 1282.4 "Fiendish Wail" Ability { id: "76A3", source: "Sephirot" } -1289.5 "Chesed Gevurah" Ability { id: "(76A5|76A6)", source: "Sephirot" } -1290.2 "Life Force + Spirit" Ability { id: "(76A7|76A8)", source: "Sephirot" } +1289.5 "Chesed Gevurah" Ability { id: ["76A5", "76A6"], source: "Sephirot" } +1290.2 "Life Force + Spirit" Ability { id: ["76A7", "76A8"], source: "Sephirot" } 1298.3 "Pillar of Mercy 1" Ability { id: "76AD", source: "Sephirot" } 1298.6 "Yesod" Ability { id: "76AB", source: "Sephirot" } window 20,20 1303.5 "Pillar of Mercy 2" Ability { id: "76AD", source: "Sephirot" } @@ -125,19 +125,19 @@ hideall "--sync--" 1326.1 "Da'at spread" duration 3.2 #Ability { id: "76AD", source: "Sephirot" } 1327.0 "Yesod" Ability { id: "76AB", source: "Sephirot" } window 20,20 1333.4 "Fiendish Wail" Ability { id: "76A3", source: "Sephirot" } -1340.5 "Chesed Gevurah" Ability { id: "(76A5|76A6)", source: "Sephirot" } -1341.1 "Life Force + Spirit" Ability { id: "(76A7|76A8)", source: "Sephirot" } +1340.5 "Chesed Gevurah" Ability { id: ["76A5", "76A6"], source: "Sephirot" } +1341.1 "Life Force + Spirit" Ability { id: ["76A7", "76A8"], source: "Sephirot" } 1346.7 "Malkuth" Ability { id: "76AF", source: "Sephirot" } 1347.8 "Adds Spawn" AddedCombatant { name: "Storm Of Words" } -1356.0 "Chesed Gevurah" Ability { id: "(76A5|76A6)", source: "Sephirot" } -1356.6 "Life Force + Spirit" Ability { id: "(76A7|76A8)", source: "Sephirot" } +1356.0 "Chesed Gevurah" Ability { id: ["76A5", "76A6"], source: "Sephirot" } +1356.6 "Life Force + Spirit" Ability { id: ["76A7", "76A8"], source: "Sephirot" } 1362.2 "Fiendish Wail" Ability { id: "76A3", source: "Sephirot" } 1363.8 "Yesod" Ability { id: "76AB", source: "Sephirot" } -1369.5 "Chesed Gevurah" Ability { id: "(76A5|76A6)", source: "Sephirot" } -1370.1 "Life Force + Spirit" Ability { id: "(76A7|76A8)", source: "Sephirot" } +1369.5 "Chesed Gevurah" Ability { id: ["76A5", "76A6"], source: "Sephirot" } +1370.1 "Life Force + Spirit" Ability { id: ["76A7", "76A8"], source: "Sephirot" } 1382.9 "Yesod" Ability { id: "76AB", source: "Sephirot" } -1385.7 "Chesed Gevurah" Ability { id: "(76A5|76A6)", source: "Sephirot" } -1386.3 "Life Force + Spirit" Ability { id: "(76A7|76A8)", source: "Sephirot" } +1385.7 "Chesed Gevurah" Ability { id: ["76A5", "76A6"], source: "Sephirot" } +1386.3 "Life Force + Spirit" Ability { id: ["76A7", "76A8"], source: "Sephirot" } 1388.9 "Pillar of Severity" Ability { id: "76B2", source: "Sephirot" } 1392.6 "Impact of Hod" Ability { id: "76BA", source: "Sephirot" } 1397.0 "Pillar of Severity Enrage" Ability { id: "76B2", source: "Sephirot" } diff --git a/ui/raidboss/data/06-ew/trial/sophia-un.txt b/ui/raidboss/data/06-ew/trial/sophia-un.txt index 458b7b5c0b..92d75c9c6a 100644 --- a/ui/raidboss/data/06-ew/trial/sophia-un.txt +++ b/ui/raidboss/data/06-ew/trial/sophia-un.txt @@ -24,7 +24,7 @@ hideall "--sync--" # This section will be reached either at 56.0, or at the time she is pushed to 90% 56.0 "--clones appear--" AddedCombatant { name: "Aion Teleos" } window 56,5 -63.6 "Thunder II/III" Ability { id: "(7DA6|7DAA)", source: "Sophia" } +63.6 "Thunder II/III" Ability { id: ["7DA6", "7DAA"], source: "Sophia" } 63.6 "--sync--" Ability { id: "7DA5", source: "Aion Teleos" } window 30,2.5 69.7 "Aero III" Ability { id: "7DA8", source: "Sophia" } 69.7 "--sync--" Ability { id: "7DA5", source: "Aion Teleos" } @@ -38,22 +38,22 @@ hideall "--sync--" 110.6 "Cloudy Heavens" Ability { id: "7DB8", source: "Sophia" } window 110.6 111.6 "--untargetable--" 111.6 "--adds spawn--" -120.9 "Horizontal Kenoma/Vertical Kenoma" Ability { id: "(7DB5|7DB6)", source: "The First Demiurge" } +120.9 "Horizontal Kenoma/Vertical Kenoma" Ability { id: ["7DB5", "7DB6"], source: "The First Demiurge" } 121.9 "Gnostic Spear" Ability { id: "7DB3", source: "The Third Demiurge" } 125.9 "Divine Spark" # Ability { id: "7DB0", source: "The Second Demiurge" } 129.0 "Ring Of Pain" Ability { id: "7DB4", source: "The Third Demiurge" } -135.1 "Horizontal Kenoma/Vertical Kenoma" Ability { id: "(7DB5|7DB6)", source: "The First Demiurge" } +135.1 "Horizontal Kenoma/Vertical Kenoma" Ability { id: ["7DB5", "7DB6"], source: "The First Demiurge" } 147.3 "Gnostic Spear?" Ability { id: "7DB3", source: "The Third Demiurge" } -149.2 "Horizontal Kenoma/Vertical Kenoma" Ability { id: "(7DB5|7DB6)", source: "The First Demiurge" } +149.2 "Horizontal Kenoma/Vertical Kenoma" Ability { id: ["7DB5", "7DB6"], source: "The First Demiurge" } 191.6 "Zombification Enrage?" # There's an introductory block leading into a rotation. 250.0 "The Scales Of Wisdom" Ability { id: "7D9C", source: "Sophia" } window 250,5 267.5 "The Scales Of Wisdom" Ability { id: "7DC6", source: "Sophia" } 272.9 "--targetable--" -280.8 "Quasar (Snapshot)" Ability { id: "(7D9B|7DA1)", source: "Sophia" } +280.8 "Quasar (Snapshot)" Ability { id: ["7D9B", "7DA1"], source: "Sophia" } 286.8 "Quasar (Meteor Detonate)" Ability { id: "7E81", source: "Sophia" } -291.3 "Aero III/Thunder II/Thunder III" Ability { id: "(7DA6|7DA8|7DAA)", source: "Sophia" } window 41.3,5 +291.3 "Aero III/Thunder II/Thunder III" Ability { id: ["7DA6", "7DA8", "7DAA"], source: "Sophia" } window 41.3,5 297.1 "Quasar Tethers" Ability { id: "7D9B", source: "Sophia" } 305.7 "Quasar (Tilt)" Ability { id: "7E46", source: "Sophia" } 310.7 "Cintamani x2" duration 3 # Ability { id: "7DBF", source: "Sophia" } @@ -66,13 +66,13 @@ hideall "--sync--" 341.2 "Onrush" Ability { id: "7DBB", source: "Sophia" } 341.8 "Quasar (Tilt)" # Ability { id: "7E46", source: "Sophia" } 345.4 "--targetable--" -361.5 "Dischordant Cleansing" # Ability { id: "(7DAD|7DAF)", source: "Sophia" } +361.5 "Dischordant Cleansing" # Ability { id: ["7DAD", "7DAF"], source: "Sophia" } 361.5 "Cintamani x2" duration 3 # Ability { id: "7DBF", source: "Sophia" } 370.8 "Arms Of Wisdom" Ability { id: "7DBE", source: "Sophia" } window 30,5 379.0 "--clones appear--" AddedCombatant { name: "Aion Teleos" } window 60,20 382.0 "Cintamani x3" duration 6 # Ability { id: "7DBF", source: "Sophia" } 393.3 "--sync--" Ability { id: "7DA5", source: "Aion Teleos" } -393.3 "Thunder II/III" Ability { id: "(7DA6|7DAA)", source: "Sophia" } +393.3 "Thunder II/III" Ability { id: ["7DA6", "7DAA"], source: "Sophia" } 399.4 "--sync--" Ability { id: "7DA5", source: "Aion Teleos" } 399.4 "Aero III" Ability { id: "7DA8", source: "Sophia" } window 30,5 408.5 "Arms Of Wisdom" Ability { id: "7DBE", source: "Sophia" } @@ -98,23 +98,23 @@ hideall "--sync--" 507.1 "Cintamani x3" duration 6 # Ability { id: "7DBF", source: "Sophia" } 518.3 "Arms Of Wisdom" Ability { id: "7DBE", source: "Sophia" } 525.4 "Thunder II" Ability { id: "7DAA", source: "Sophia" } -535.9 "Dischordant Cleansing" # Ability { id: "(7DAD|7DAF)", source: "Sophia" } +535.9 "Dischordant Cleansing" # Ability { id: ["7DAD", "7DAF"], source: "Sophia" } 539.7 "Gnosis" Ability { id: "7DBC", source: "Barbelo" } window 30,5 552.2 "Arms Of Wisdom" Ability { id: "7DBE", source: "Sophia" } 567.0 "Quasar Tethers" Ability { id: "7D9B", source: "Sophia" } -568.3 "Dischordant Cleansing" # Ability { id: "(7DAD|7DAF)", source: "Sophia" } +568.3 "Dischordant Cleansing" # Ability { id: ["7DAD", "7DAF"], source: "Sophia" } 575.7 "Quasar (Tilt)" # Ability { id: "7E46", source: "Sophia" } 581.5 "Cintamani x3" duration 6 # Ability { id: "7DBF", source: "Sophia" } 577.5 "--clones appear--" AddedCombatant { name: "Aion Teleos" } window 60,5 592.8 "Arms Of Wisdom" Ability { id: "7DBE", source: "Sophia" } 599.9 "--sync--" Ability { id: "7DA5", source: "Aion Teleos" } window 10,2.5 -599.9 "Thunder II/III" Ability { id: "(7DA6|7DAA)", source: "Sophia" } +599.9 "Thunder II/III" Ability { id: ["7DA6", "7DAA"], source: "Sophia" } 606.1 "--sync--" Ability { id: "7DA5", source: "Aion Teleos" } 606.1 "Aero III" Ability { id: "7DA8", source: "Sophia" } -611.9 "Quasar (Snapshot)" Ability { id: "(7D9B|7DA1)", source: "Sophia" } +611.9 "Quasar (Snapshot)" Ability { id: ["7D9B", "7DA1"], source: "Sophia" } 617.9 "Quasar (Meteor Detonate)" Ability { id: "7E81", source: "Sophia" } 624.4 "Arms Of Wisdom" Ability { id: "7DBE", source: "Sophia" } -636.6 "Dischordant Cleansing" # Ability { id: "(7DAD|7DAF)", source: "Sophia" } +636.6 "Dischordant Cleansing" # Ability { id: ["7DAD", "7DAF"], source: "Sophia" } 639.0 "Execute" Ability { id: "7DA4", source: "Sophia" } window 30,30 jump 420.5 650.9 "Cintamani x3" diff --git a/ui/raidboss/data/06-ew/trial/thordan-un.txt b/ui/raidboss/data/06-ew/trial/thordan-un.txt index cb27453ce4..384fb1b783 100644 --- a/ui/raidboss/data/06-ew/trial/thordan-un.txt +++ b/ui/raidboss/data/06-ew/trial/thordan-un.txt @@ -128,14 +128,14 @@ hideall "--sync--" 488.1 "Holy Shield Bash" Ability { id: "89D6", source: ["Ser Adelphel", "Ser Janlenoux"] } 497.1 "Spear Of the Fury" Ability { id: "89D1", source: "Ser Zephirin" } # A smile better suits a hero 499.5 "Heavenly Heel" Ability { id: "89C6", source: "King Thordan" } -504.6 "The Dragon's Gaze/The Dragon's Glory" Ability { id: "(89C8|89C9)", source: "King Thordan" } +504.6 "The Dragon's Gaze/The Dragon's Glory" Ability { id: ["89C8", "89C9"], source: "King Thordan" } 516.6 "Ancient Quaga" Ability { id: "89C4", source: "King Thordan" } #Phase 4 # Conviction Trio 521.8 "the Dragon's Eye" Ability { id: "89C7", source: "King Thordan" } 532.0 "Knights Of the Round" Ability { id: "89CB", source: "King Thordan" } -543.1 "The Dragon's Gaze/The Dragon's Glory" Ability { id: "(89C8|89C9)", source: "King Thordan" } +543.1 "The Dragon's Gaze/The Dragon's Glory" Ability { id: ["89C8", "89C9"], source: "King Thordan" } 543.2 "Conviction" Ability { id: "89DB", source: "Ser Hermenost" } 544.1 "Heavy Impact 1" Ability { id: "89DF", source: "Ser Guerrique" } 546.0 "Conviction" Ability { id: "89DC", source: "Ser Hermenost" } @@ -169,7 +169,7 @@ hideall "--sync--" 641.5 "--chains appear--" 642.4 "Holy Meteor" Ability { id: "89EF", source: "Ser Noudenet" } 643.5 "Comet x4" duration 4 #Ability { id: "89F4", source: "Ser Noudenet" } -643.5 "The Dragon's Gaze/The Dragon's Glory" Ability { id: "(89C8|89C9)", source: "King Thordan" } +643.5 "The Dragon's Gaze/The Dragon's Glory" Ability { id: ["89C8", "89C9"], source: "King Thordan" } 643.8 "--sync--" Ability { id: "89EA", source: "Ser Charibert" } # Heavensflame (cast) 644.2 "Heavensflame 1" #Ability { id: "89EB", source: "Ser Charibert" } 645.3 "Heavensflame 2" #Ability { id: "89EB", source: "Ser Charibert" } @@ -192,10 +192,10 @@ hideall "--sync--" 707.6 "Heavensward Leap 2" Ability { id: "89E9", source: "Ser Paulecrain" } 710.6 "Heavensward Leap 3" Ability { id: "89E9", source: "Ser Ignasse" } 718.7 "Sacred Cross" StartsUsing { id: "89D0", source: "Ser Zephirin" } duration 24.7 -724.6 "Pure Of Soul" Ability { id: "(89F0|89F1)", source: ["Ser Charibert", "Ser Noudenet", "Ser Haumeric"] } +724.6 "Pure Of Soul" Ability { id: ["89F0", "89F1"], source: ["Ser Charibert", "Ser Noudenet", "Ser Haumeric"] } 732.6 "Absolute Conviction 1" Ability { id: "89E3", source: "Ser Guerrique" } 735.5 "Absolute Conviction 2" Ability { id: "89E4", source: "Ser Hermenost" } -740.6 "The Dragon's Gaze/The Dragon's Glory" Ability { id: "(89C8|89C9)", source: "King Thordan" } +740.6 "The Dragon's Gaze/The Dragon's Glory" Ability { id: ["89C8", "89C9"], source: "King Thordan" } 743.4 "--sync--" Ability { id: "89D0", source: "Ser Zephirin" } # Sacred Cross resolves 750.7 "Ancient Quaga" Ability { id: "89C4", source: "King Thordan" } diff --git a/ui/raidboss/data/06-ew/trial/ultima-un.txt b/ui/raidboss/data/06-ew/trial/ultima-un.txt index e91f562144..4ec4858b28 100644 --- a/ui/raidboss/data/06-ew/trial/ultima-un.txt +++ b/ui/raidboss/data/06-ew/trial/ultima-un.txt @@ -246,9 +246,9 @@ hideall "--sync--" 1015.6 "Homing Lasers" Ability { id: "6EF0", source: "The Ultima Weapon" } 1019.9 "Ceruleum Vent" Ability { id: "6EEF", source: "The Ultima Weapon" } 1023.1 "Viscous Aetheroplasm" Ability { id: "6EEE", source: "The Ultima Weapon" } -1034.1 "Magitek Ray 1" Ability { id: "(6EF2|6EF3|6EF4)", source: "The Ultima Weapon" } -1037.1 "Magitek Ray 2" Ability { id: "(6EF2|6EF3|6EF4)", source: "The Ultima Weapon" } -1040.1 "Magitek Ray 3" Ability { id: "(6EF2|6EF3|6EF4)", source: "The Ultima Weapon" } +1034.1 "Magitek Ray 1" Ability { id: ["6EF2", "6EF3", "6EF4"], source: "The Ultima Weapon" } +1037.1 "Magitek Ray 2" Ability { id: ["6EF2", "6EF3", "6EF4"], source: "The Ultima Weapon" } +1040.1 "Magitek Ray 3" Ability { id: ["6EF2", "6EF3", "6EF4"], source: "The Ultima Weapon" } 1042.7 "--sync--" StartsUsing { id: "6EF9", source: "The Ultima Weapon" } window 45,45 1045.9 "Tank Purge" Ability { id: "6EF9", source: "The Ultima Weapon" } @@ -257,17 +257,17 @@ hideall "--sync--" 1054.8 "Homing Lasers" Ability { id: "6EF0", source: "The Ultima Weapon" } window 20,20 1059.1 "Ceruleum Vent" Ability { id: "6EEF", source: "The Ultima Weapon" } 1062.4 "Viscous Aetheroplasm" Ability { id: "6EEE", source: "The Ultima Weapon" } -1070.5 "Magitek Ray 1" Ability { id: "(6EF2|6EF3|6EF4)", source: "The Ultima Weapon" } window 15,1 -1073.5 "Magitek Ray 2" Ability { id: "(6EF2|6EF3|6EF4)", source: "The Ultima Weapon" } -1076.5 "Magitek Ray 3" Ability { id: "(6EF2|6EF3|6EF4)", source: "The Ultima Weapon" } +1070.5 "Magitek Ray 1" Ability { id: ["6EF2", "6EF3", "6EF4"], source: "The Ultima Weapon" } window 15,1 +1073.5 "Magitek Ray 2" Ability { id: ["6EF2", "6EF3", "6EF4"], source: "The Ultima Weapon" } +1076.5 "Magitek Ray 3" Ability { id: ["6EF2", "6EF3", "6EF4"], source: "The Ultima Weapon" } 1080.8 "Viscous Aetheroplasm" Ability { id: "6EEE", source: "The Ultima Weapon" } 1084.1 "Diffractive Laser" Ability { id: "6EF1", source: "The Ultima Weapon" } window 10,20 1086.4 "Homing Lasers" Ability { id: "6EF0", source: "The Ultima Weapon" } window 10,20 1090.7 "Ceruleum Vent" Ability { id: "6EEF", source: "The Ultima Weapon" } 1094.0 "Viscous Aetheroplasm" Ability { id: "6EEE", source: "The Ultima Weapon" } -1105.1 "Magitek Ray 1" Ability { id: "(6EF2|6EF3|6EF4)", source: "The Ultima Weapon" } window 15,1 -1108.1 "Magitek Ray 2" Ability { id: "(6EF2|6EF3|6EF4)", source: "The Ultima Weapon" } -1111.0 "Magitek Ray 3" Ability { id: "(6EF2|6EF3|6EF4)", source: "The Ultima Weapon" } +1105.1 "Magitek Ray 1" Ability { id: ["6EF2", "6EF3", "6EF4"], source: "The Ultima Weapon" } window 15,1 +1108.1 "Magitek Ray 2" Ability { id: ["6EF2", "6EF3", "6EF4"], source: "The Ultima Weapon" } +1111.0 "Magitek Ray 3" Ability { id: ["6EF2", "6EF3", "6EF4"], source: "The Ultima Weapon" } 1113.6 "--sync--" StartsUsing { id: "6EF9", source: "The Ultima Weapon" } window 45,45 jump 1042.7 1116.8 "Tank Purge" diff --git a/ui/raidboss/data/06-ew/trial/zodiark.txt b/ui/raidboss/data/06-ew/trial/zodiark.txt index 714a128655..9fa9c4dae4 100644 --- a/ui/raidboss/data/06-ew/trial/zodiark.txt +++ b/ui/raidboss/data/06-ew/trial/zodiark.txt @@ -34,7 +34,7 @@ hideall "Triple Esoteric Ray" 103.1 "Styx x5" Ability { id: "67DB", source: "Zodiark" } duration 5.5 115.7 "Paradeigma" Ability { id: "67C8", source: "Zodiark" } 122.8 "Exoterikos" Ability { id: "6C36", source: "Zodiark" } -129.1 "Esoteric Dyad/Esoteric Sect" Ability { id: "(67CB|67CC)", source: "Arcane Sigil" } +129.1 "Esoteric Dyad/Esoteric Sect" Ability { id: ["67CB", "67CC"], source: "Arcane Sigil" } 129.4 "Meteoros Eidolon" Ability { id: "67C6", source: "Behemoth" } # Cutscene @@ -70,7 +70,7 @@ hideall "Triple Esoteric Ray" 318.1 "Styx x5" Ability { id: "67DA", source: "Zodiark" } duration 5.5 333.2 "Kokytos" Ability { id: "6C5F", source: "Zodiark" } 338.3 "Paradeigma" Ability { id: "67BF", source: "Zodiark" } -353.4 "Astral Flow" Ability { id: "(662F|6630)", source: "Zodiark" } +353.4 "Astral Flow" Ability { id: ["662F", "6630"], source: "Zodiark" } 359.8 "Meteoros Eidolon" Ability { id: "67C6", source: "Behemoth" } 368.6 "Styx" Ability { id: "67DA", source: "Zodiark" } 378.7 "Exoterikos" Ability { id: "67C1", source: "Zodiark" } @@ -78,11 +78,11 @@ hideall "Triple Esoteric Ray" 388.0 "Esoteric Dyad" Ability { id: "67CB", source: "Arcane Sigil" } 391.0 "Trimorphos Exoterikos" StartsUsing { id: "67C2", source: "Zodiark" } -401.7 "Esoteric Dyad/Esoteric Sect" Ability { id: "(67CB|67CC)", source: "Arcane Sigil" } -405.7 "Esoteric Dyad/Esoteric Sect" Ability { id: "(67CB|67CC)", source: "Arcane Sigil" } -409.7 "Esoteric Dyad/Esoteric Sect" Ability { id: "(67CB|67CC)", source: "Arcane Sigil" } +401.7 "Esoteric Dyad/Esoteric Sect" Ability { id: ["67CB", "67CC"], source: "Arcane Sigil" } +405.7 "Esoteric Dyad/Esoteric Sect" Ability { id: ["67CB", "67CC"], source: "Arcane Sigil" } +409.7 "Esoteric Dyad/Esoteric Sect" Ability { id: ["67CB", "67CC"], source: "Arcane Sigil" } 416.2 "Paradeigma" Ability { id: "67BF", source: "Zodiark" } -431.4 "Astral Flow" Ability { id: "(662F|6630)", source: "Zodiark" } +431.4 "Astral Flow" Ability { id: ["662F", "6630"], source: "Zodiark" } 437.2 "Opheos Eidolon" Ability { id: "67C7", source: ["Python", "Behemoth", "Zodiark"] } 446.5 "Styx x5" Ability { id: "67DA", source: "Zodiark" } duration 5.5 456.6 "Exoterikos" Ability { id: "67C1", source: "Zodiark" } @@ -93,14 +93,14 @@ hideall "Triple Esoteric Ray" 472.8 "Ania" Ability { id: "67D4", source: "Zodiark" } 479.0 "Trimorphos Exoterikos" StartsUsing { id: "67C2", source: "Zodiark" } -489.8 "Esoteric Dyad/Esoteric Sect" Ability { id: "(67CB|67CC)", source: "Arcane Sigil" } -493.8 "Esoteric Dyad/Esoteric Sect" Ability { id: "(67CB|67CC)", source: "Arcane Sigil" } +489.8 "Esoteric Dyad/Esoteric Sect" Ability { id: ["67CB", "67CC"], source: "Arcane Sigil" } +493.8 "Esoteric Dyad/Esoteric Sect" Ability { id: ["67CB", "67CC"], source: "Arcane Sigil" } 497.1 "Phlegethon x3" Ability { id: "67CF", source: "Zodiark" } duration 4.6 -497.7 "Esoteric Dyad/Esoteric Sect" Ability { id: "(67CB|67CC)", source: "Arcane Sigil" } +497.7 "Esoteric Dyad/Esoteric Sect" Ability { id: ["67CB", "67CC"], source: "Arcane Sigil" } 505.3 "Styx x5" Ability { id: "67DA", source: "Zodiark" } duration 5.5 517.5 "Algedon" Ability { id: "67D[12]", source: "Zodiark" } 530.7 "Paradeigma" Ability { id: "67BF", source: "Zodiark" } -545.9 "Astral Flow" Ability { id: "(662F|6630)", source: "Zodiark" } +545.9 "Astral Flow" Ability { id: ["662F", "6630"], source: "Zodiark" } 551.7 "Opheos Eidolon" Ability { id: "67C7", source: ["Python", "Behemoth", "Zodiark"] } 561.0 "Styx x5" Ability { id: "67DA", source: "Zodiark" } duration 5.5 571.2 "Exoterikos" Ability { id: "67C1", source: "Zodiark" } @@ -111,9 +111,9 @@ hideall "Triple Esoteric Ray" 587.4 "Ania" Ability { id: "67D4", source: "Zodiark" } 593.5 "Trimorphos Exoterikos" StartsUsing { id: "67C2", source: "Zodiark" } window 50,50 jump 479 -604.3 "Esoteric Dyad/Esoteric Sect" #Ability { id: "(67CB|67CC)", source: "Arcane Sigil" } -608.3 "Esoteric Dyad/Esoteric Sect" #Ability { id: "(67CB|67CC)", source: "Arcane Sigil" } +604.3 "Esoteric Dyad/Esoteric Sect" #Ability { id: ["67CB", "67CC"], source: "Arcane Sigil" } +608.3 "Esoteric Dyad/Esoteric Sect" #Ability { id: ["67CB", "67CC"], source: "Arcane Sigil" } 611.6 "Phlegethon x3" #Ability { id: "67CF", source: "Zodiark" } duration 4.6 -612.2 "Esoteric Dyad/Esoteric Sect" #Ability { id: "(67CB|67CC)", source: "Arcane Sigil" } +612.2 "Esoteric Dyad/Esoteric Sect" #Ability { id: ["67CB", "67CC"], source: "Arcane Sigil" } 619.8 "Styx x5" #Ability { id: "67DA", source: "Zodiark" } duration 5.5 632.0 "Algedon" #Ability { id: "67D[12]", source: "Zodiark" } diff --git a/ui/raidboss/data/06-ew/trial/zurvan-un.txt b/ui/raidboss/data/06-ew/trial/zurvan-un.txt index dced26e3df..5f88cee6fa 100644 --- a/ui/raidboss/data/06-ew/trial/zurvan-un.txt +++ b/ui/raidboss/data/06-ew/trial/zurvan-un.txt @@ -110,7 +110,7 @@ hideall "--sync--" 429.3 "Southern Cross (snapshot)" Ability { id: "8565", source: "Zurvan" } window 430,10 432.9 "Southern Cross (puddle)" Ability { id: "8566", source: "Zurvan" } 434.6 "Metal Cutter" Ability { id: "8579", source: "Zurvan" } -444.7 "Biting Halberd/Ciclicle/Tail End" Ability { id: "(8562|8563|8564)", source: "Zurvan" } +444.7 "Biting Halberd/Ciclicle/Tail End" Ability { id: ["8562", "8563", "8564"], source: "Zurvan" } # This is the earliest point this phase can push 448.8 "Metal Cutter" Ability { id: "8579", source: "Zurvan" } @@ -139,7 +139,7 @@ hideall "--sync--" 990.3 "Eidos" Ability { id: "8568", source: "Zurvan" } window 500,10 1000.0 "Ahura Mazda" Ability { id: "8569", source: "Zurvan" } window 1000,10 1018.2 "--targetable--" -1024.4 "Infinite Fire/Infinite Ice" Ability { id: "(8570|8571)", source: "Zurvan" } +1024.4 "Infinite Fire/Infinite Ice" Ability { id: ["8570", "8571"], source: "Zurvan" } 1032.5 "Wave Cannon (avoid)" Ability { id: "857C", source: "Zurvan" } 1039.7 "Tyrfing x5" Ability { id: "8576", source: "Zurvan" } duration 5 window 1040,5 1044.8 "Fire III" Ability { id: "8578", source: "Zurvan" } @@ -147,9 +147,9 @@ hideall "--sync--" 1054.5 "Southern Cross (puddle)" Ability { id: "8566", source: "Zurvan" } 1056.2 "Metal Cutter" Ability { id: "8579", source: "Zurvan" } 1065.3 "Broken Seal" Ability { id: "857D", source: "Zurvan" } window 30,30 -1081.0 "Biting Halberd/Ciclicle/Tail End" Ability { id: "(8562|8564|8563)", source: "Zurvan" } +1081.0 "Biting Halberd/Ciclicle/Tail End" Ability { id: ["8562", "8564", "8563"], source: "Zurvan" } 1086.3 "Metal Cutter" Ability { id: "8579", source: "Zurvan" } -1091.1 "Infinite Fire/Infinite Ice" Ability { id: "(8570|8571)", source: "Zurvan" } +1091.1 "Infinite Fire/Infinite Ice" Ability { id: ["8570", "8571"], source: "Zurvan" } 1099.5 "Wave Cannon (avoid)" Ability { id: "857C", source: "Zurvan" } 1106.6 "Tyrfing x6" Ability { id: "8576", source: "Zurvan" } duration 6 1112.7 "Fire III" Ability { id: "8578", source: "Zurvan" } @@ -157,7 +157,7 @@ hideall "--sync--" 1122.4 "Southern Cross (puddle)" Ability { id: "8566", source: "Zurvan" } 1124.1 "Metal Cutter" Ability { id: "8579", source: "Zurvan" } 1133.2 "Broken Seal" Ability { id: "857D", source: "Zurvan" } -1147.9 "Biting Halberd/Ciclicle/Tail End" Ability { id: "(8562|8564|8563)", source: "Zurvan" } +1147.9 "Biting Halberd/Ciclicle/Tail End" Ability { id: ["8562", "8564", "8563"], source: "Zurvan" } 1154.0 "Metal Cutter" Ability { id: "8579", source: "Zurvan" } 1164.1 "Soar" Ability { id: "857E", source: "Zurvan" } window 100,20 1164.2 "--untargetable--" @@ -167,7 +167,7 @@ hideall "--sync--" 1181.3 "--targetable--" 1187.4 "The Demon's Claw" Ability { id: "857A", source: "Zurvan" } 1194.5 "Wave Cannon (stack)" Ability { id: "857B", source: "Zurvan" } -1200.6 "Infinite Fire/Infinite Ice" Ability { id: "(8570|8571)", source: "Zurvan" } +1200.6 "Infinite Fire/Infinite Ice" Ability { id: ["8570", "8571"], source: "Zurvan" } 1208.7 "Wave Cannon (avoid)" Ability { id: "857C", source: "Zurvan" } 1215.8 "Tyrfing x7" Ability { id: "8576", source: "Zurvan" } duration 7 1222.9 "Fire III" Ability { id: "8578", source: "Zurvan" } @@ -175,9 +175,9 @@ hideall "--sync--" 1232.6 "Southern Cross (puddle)" Ability { id: "8566", source: "Zurvan" } 1234.3 "Metal Cutter" Ability { id: "8579", source: "Zurvan" } 1243.4 "Broken Seal" Ability { id: "857D", source: "Zurvan" } window 30,30 -1258.4 "Biting Halberd/Ciclicle/Tail End" Ability { id: "(8562|8564|8563)", source: "Zurvan" } +1258.4 "Biting Halberd/Ciclicle/Tail End" Ability { id: ["8562", "8564", "8563"], source: "Zurvan" } 1264.5 "Metal Cutter" Ability { id: "8579", source: "Zurvan" } -1269.6 "Infinite Fire/Infinite Ice" Ability { id: "(8570|8571)", source: "Zurvan" } +1269.6 "Infinite Fire/Infinite Ice" Ability { id: ["8570", "8571"], source: "Zurvan" } 1277.7 "Wave Cannon (avoid)" Ability { id: "857C", source: "Zurvan" } 1284.8 "Tyrfing x8" Ability { id: "8576", source: "Zurvan" } duration 8 1292.9 "Fire III" Ability { id: "8578", source: "Zurvan" } @@ -185,7 +185,7 @@ hideall "--sync--" 1302.6 "Southern Cross (puddle)" Ability { id: "8566", source: "Zurvan" } 1304.3 "Metal Cutter" Ability { id: "8579", source: "Zurvan" } 1313.4 "Broken Seal" Ability { id: "857D", source: "Zurvan" } -1328.6 "Biting Halberd/Ciclicle/Tail End" Ability { id: "(8562|8564|8563)", source: "Zurvan" } +1328.6 "Biting Halberd/Ciclicle/Tail End" Ability { id: ["8562", "8564", "8563"], source: "Zurvan" } 1334.8 "Metal Cutter" Ability { id: "8579", source: "Zurvan" } 1344.8 "Soar" Ability { id: "857E", source: "Zurvan" } window 100,20 1344.9 "--untargetable--" @@ -195,7 +195,7 @@ hideall "--sync--" 1362.0 "--targetable--" 1368.1 "The Demon's Claw" Ability { id: "857A", source: "Zurvan" } 1375.2 "Wave Cannon (stack)" Ability { id: "857B", source: "Zurvan" } -1381.3 "Infinite Fire/Infinite Ice" Ability { id: "(8570|8571)", source: "Zurvan" } +1381.3 "Infinite Fire/Infinite Ice" Ability { id: ["8570", "8571"], source: "Zurvan" } 1389.5 "Wave Cannon (avoid)" Ability { id: "857C", source: "Zurvan" } 1396.6 "Tyrfing x9" Ability { id: "8576", source: "Zurvan" } duration 9 1405.7 "Fire III" Ability { id: "8578", source: "Zurvan" } @@ -203,12 +203,12 @@ hideall "--sync--" 1415.4 "Southern Cross (puddle)" Ability { id: "8566", source: "Zurvan" } 1417.1 "Metal Cutter" Ability { id: "8579", source: "Zurvan" } 1426.2 "Broken Seal" Ability { id: "857D", source: "Zurvan" } window 30,30 -1441.2 "Biting Halberd/Ciclicle/Tail End" Ability { id: "(8562|8564|8563)", source: "Zurvan" } +1441.2 "Biting Halberd/Ciclicle/Tail End" Ability { id: ["8562", "8564", "8563"], source: "Zurvan" } # It should theoretically be impossible to reach here before enrage, # but just in case we'll unroll a bit more to get to 10x Tyrfings. 1447.4 "Metal Cutter" Ability { id: "8579", source: "Zurvan" } -1452.5 "Infinite Fire/Infinite Ice" Ability { id: "(8570|8571)", source: "Zurvan" } +1452.5 "Infinite Fire/Infinite Ice" Ability { id: ["8570", "8571"], source: "Zurvan" } 1460.6 "Wave Cannon (avoid)" Ability { id: "857C", source: "Zurvan" } 1467.7 "Tyrfing x10" Ability { id: "8576", source: "Zurvan" } duration 10 1475.8 "Fire III" Ability { id: "8578", source: "Zurvan" } @@ -216,7 +216,7 @@ hideall "--sync--" 1485.5 "Southern Cross (puddle)" Ability { id: "8566", source: "Zurvan" } 1487.2 "Metal Cutter" Ability { id: "8579", source: "Zurvan" } 1496.3 "Broken Seal" Ability { id: "857D", source: "Zurvan" } -1511.5 "Biting Halberd/Ciclicle/Tail End" Ability { id: "(8562|8564|8563)", source: "Zurvan" } +1511.5 "Biting Halberd/Ciclicle/Tail End" Ability { id: ["8562", "8564", "8563"], source: "Zurvan" } 1517.7 "Metal Cutter" Ability { id: "8579", source: "Zurvan" } 1527.7 "Soar" Ability { id: "857E", source: "Zurvan" } 1527.8 "--untargetable--" diff --git a/ui/raidboss/data/06-ew/ultimate/dragonsongs_reprise_ultimate.txt b/ui/raidboss/data/06-ew/ultimate/dragonsongs_reprise_ultimate.txt index 85a2428376..98d48d0011 100644 --- a/ui/raidboss/data/06-ew/ultimate/dragonsongs_reprise_ultimate.txt +++ b/ui/raidboss/data/06-ew/ultimate/dragonsongs_reprise_ultimate.txt @@ -38,7 +38,7 @@ hideall "--sync--" 86.2 "Faith Unmoving" Ability { id: "62DC", source: "Ser Grinnaux" } 88.2 "Heavensflame" Ability { id: "62DE", source: "Ser Charibert" } 102.2 "Holiest of Holy" Ability { id: "62D4", source: "Ser Adelphel" } -104.2 "Empty Dimension/Full Dimension" Ability { id: "(62DA|62DB)", source: "Ser Grinnaux" } +104.2 "Empty Dimension/Full Dimension" Ability { id: ["62DA", "62DB"], source: "Ser Grinnaux" } 122.2 "Holiest of Holy" Ability { id: "62D4", source: "Ser Adelphel" } # "soft" enrage 127.4 "The Bull's Steel" Ability { id: "62CD", source: "Ser Grinnaux" } @@ -159,13 +159,13 @@ hideall "--sync--" 1002.3 "Final Chorus" Ability { id: "6709", source: "Nidhogg" } 1020.5 "Dive from Grace" Ability { id: "670D", source: "Nidhogg" } 1030.2 "Lash and Gnash/Gnash and Lash" Ability { id: "671[23]", source: "Nidhogg" } -1030.4 "Tower 1" Ability { id: "(670E|670F|6710)", source: "Nidhogg" } +1030.4 "Tower 1" Ability { id: ["670E", "670F", "6710"], source: "Nidhogg" } 1030.5 "Eye of the Tyrant" Ability { id: "6714", source: "Nidhogg" } 1036.9 "Darkdragon Dive" Ability { id: "671[1789B]", source: "Nidhogg" } -1040.3 "Tower 2" Ability { id: "(670E|670F|6710)", source: "Nidhogg" } +1040.3 "Tower 2" Ability { id: ["670E", "670F", "6710"], source: "Nidhogg" } 1044.0 "Geirskogul" Ability { id: "670A", source: "Nidhogg" } 1046.9 "Darkdragon Dive" Ability { id: "671[1789B]", source: "Nidhogg" } -1051.3 "Tower 3" Ability { id: "(670E|670F|6710)", source: "Nidhogg" } +1051.3 "Tower 3" Ability { id: ["670E", "670F", "6710"], source: "Nidhogg" } 1051.7 "Lash and Gnash/Gnash and Lash" Ability { id: "671[23]", source: "Nidhogg" } 1052.0 "Eye of the Tyrant" Ability { id: "6714", source: "Nidhogg" } 1054.0 "Geirskogul" Ability { id: "670A", source: "Nidhogg" } @@ -317,7 +317,7 @@ hideall "--sync--" 3554.3 "Akh Afah" Ability { id: "6D42", source: "Hraesvelgr" } 3558.3 "--untargetable--" 3559.5 "--targetable--" -3567.4 "Hallowed Wings" Ability { id: "(6D23|6D24|6D26|6D27)", source: "Hraesvelgr" } +3567.4 "Hallowed Wings" Ability { id: ["6D23", "6D24", "6D26", "6D27"], source: "Hraesvelgr" } 3568.2 "Hallowed Plume" #Ability { id: "6D29", source: "Hraesvelgr" } 3568.5 "Cauterize" Ability { id: "6D3E", source: "Nidhogg" } 3568.8 "--untargetable--" @@ -333,15 +333,15 @@ hideall "--sync--" 3596.5 "Akh Morn 3" #Ability { id: "6D47", source: "Nidhogg" } 3598.1 "Akh Morn 4" #Ability { id: "6D47", source: "Nidhogg" } 3599.1 "--targetable--" -3605.2 "Hot Tail/Hot Wing" Ability { id: "(6D2D|6D2B)", source: "Nidhogg" } +3605.2 "Hot Tail/Hot Wing" Ability { id: ["6D2D", "6D2B"], source: "Nidhogg" } 3607.2 "Spreading Flames" #Ability { id: "742B", source: "Nidhogg" } 3607.2 "Entangled Flames" #Ability { id: "742C", source: "Nidhogg" } 3607.2 "Spreading Flames" #Ability { id: "742B", source: "Nidhogg" } 3607.2 "Entangled Flames" #Ability { id: "742C", source: "Nidhogg" } 3611.1 "Mortal Vow" Ability { id: "6D31", source: "Nidhogg" } 3623.4 "Akh Afah" Ability { id: "6D42", source: "Hraesvelgr" } -3635.4 "Hallowed Wings" Ability { id: "(6D23|6D24|6D26|6D27)", source: "Hraesvelgr" } -3635.4 "Hot Tail/Hot Wing" #Ability { id: "(6D2D|6D2B)", source: "Nidhogg" } +3635.4 "Hallowed Wings" Ability { id: ["6D23", "6D24", "6D26", "6D27"], source: "Hraesvelgr" } +3635.4 "Hot Tail/Hot Wing" #Ability { id: ["6D2D", "6D2B"], source: "Nidhogg" } 3635.5 "Hallowed Plume" #Ability { id: "6D29", source: "Hraesvelgr" } 3645.1 "Mortal Vow" Ability { id: "6D31", source: "Nidhogg" } 3655.1 "Great Wyrmsbreath" Ability { id: "6D35", source: "Hraesvelgr" } @@ -413,61 +413,61 @@ hideall "--sync--" 4024.8 "--targetable--" 4035.1 "--sync--" Ability { id: "6D9B", source: "Dragon-king Thordan" } 4036.0 "Exaflare's Edge" duration 9.3 #Ability { id: "6D9C", source: "Dragon-king Thordan" } -4036.2 "Ice of Ascalon/Flames of Ascalon" Ability { id: "(6D92|6D91)", source: ["Nidhogg", "Dragon-king Thordan"] } +4036.2 "Ice of Ascalon/Flames of Ascalon" Ability { id: ["6D92", "6D91"], source: ["Nidhogg", "Dragon-king Thordan"] } 4043.2 "--sync--" Ability { id: "6D9E", source: "Dragon-king Thordan" } -4044.3 "Trinity 1" #Ability { id: "(6D9F|6DA0|6DA1)", source: "Dragon-king Thordan" } +4044.3 "Trinity 1" #Ability { id: ["6D9F", "6DA0", "6DA1"], source: "Dragon-king Thordan" } 4047.3 "--sync--" Ability { id: "6D9E", source: "Dragon-king Thordan" } -4048.4 "Trinity 2" #Ability { id: "(6D9F|6DA0|6DA1)", source: "Dragon-king Thordan" } +4048.4 "Trinity 2" #Ability { id: ["6D9F", "6DA0", "6DA1"], source: "Dragon-king Thordan" } 4056.3 "--sync--" Ability { id: "6D93", source: "Dragon-king Thordan" } -4057.0 "Akh Morn's Edge x5" duration 5.5 #Ability { id: "(730C|730D|730E)", source: "Dragon-king Thordan" } -4057.1 "Ice of Ascalon/Flames of Ascalon" Ability { id: "(6D92|6D91)", source: "Dragon-king Thordan" } +4057.0 "Akh Morn's Edge x5" duration 5.5 #Ability { id: ["730C", "730D", "730E"], source: "Dragon-king Thordan" } +4057.1 "Ice of Ascalon/Flames of Ascalon" Ability { id: ["6D92", "6D91"], source: "Dragon-king Thordan" } 4067.8 "--sync--" Ability { id: "6D9E", source: "Dragon-king Thordan" } -4068.9 "Trinity 3" #Ability { id: "(6D9F|6DA0|6DA1)", source: "Dragon-king Thordan" } +4068.9 "Trinity 3" #Ability { id: ["6D9F", "6DA0", "6DA1"], source: "Dragon-king Thordan" } 4071.9 "--sync--" Ability { id: "6D9E", source: "Dragon-king Thordan" } -4073.0 "Trinity 4" #Ability { id: "(6D9F|6DA0|6DA1)", source: "Dragon-king Thordan" } +4073.0 "Trinity 4" #Ability { id: ["6D9F", "6DA0", "6DA1"], source: "Dragon-king Thordan" } 4082.9 "--sync--" Ability { id: "6D99", source: "Dragon-king Thordan" } 4083.9 "Gigaflare's Edge x3" duration 7.9 #Ability { id: "6D9A", source: "Dragon-king Thordan" } -4084.0 "Ice of Ascalon/Flames of Ascalon" Ability { id: "(6D92|6D91)", source: "Dragon-king Thordan" } +4084.0 "Ice of Ascalon/Flames of Ascalon" Ability { id: ["6D92", "6D91"], source: "Dragon-king Thordan" } 4100.9 "--sync--" Ability { id: "6D9E", source: "Dragon-king Thordan" } -4102.0 "Trinity 5" #Ability { id: "(6D9F|6DA0|6DA1)", source: "Dragon-king Thordan" } +4102.0 "Trinity 5" #Ability { id: ["6D9F", "6DA0", "6DA1"], source: "Dragon-king Thordan" } 4104.9 "--sync--" Ability { id: "6D9E", source: "Dragon-king Thordan" } -4106.0 "Trinity 6" #Ability { id: "(6D9F|6DA0|6DA1)", source: "Dragon-king Thordan" } +4106.0 "Trinity 6" #Ability { id: ["6D9F", "6DA0", "6DA1"], source: "Dragon-king Thordan" } 4113.9 "--sync--" Ability { id: "6D9B", source: "Dragon-king Thordan" } 4114.8 "Exaflare's Edge" duration 9.3 #Ability { id: "6D9C", source: "Dragon-king Thordan" } -4115.0 "Ice of Ascalon/Flames of Ascalon" Ability { id: "(6D92|6D91)", source: "Dragon-king Thordan" } +4115.0 "Ice of Ascalon/Flames of Ascalon" Ability { id: ["6D92", "6D91"], source: "Dragon-king Thordan" } 4121.9 "--sync--" Ability { id: "6D9E", source: "Dragon-king Thordan" } -4122.9 "Trinity 1" #Ability { id: "(6D9F|6DA0|6DA1)", source: "Dragon-king Thordan" } +4122.9 "Trinity 1" #Ability { id: ["6D9F", "6DA0", "6DA1"], source: "Dragon-king Thordan" } 4125.8 "--sync--" Ability { id: "6D9E", source: "Dragon-king Thordan" } -4126.9 "Trinity 2" #Ability { id: "(6D9F|6DA0|6DA1)", source: "Dragon-king Thordan" } +4126.9 "Trinity 2" #Ability { id: ["6D9F", "6DA0", "6DA1"], source: "Dragon-king Thordan" } 4134.9 "--sync--" Ability { id: "6D93", source: "Dragon-king Thordan" } -4135.6 "Akh Morn's Edge x6" duration 6.6 #Ability { id: "(730C|730D|730E)", source: "Dragon-king Thordan" } -4135.7 "Ice of Ascalon/Flames of Ascalon" Ability { id: "(6D92|6D91)", source: "Dragon-king Thordan" } +4135.6 "Akh Morn's Edge x6" duration 6.6 #Ability { id: ["730C", "730D", "730E"], source: "Dragon-king Thordan" } +4135.7 "Ice of Ascalon/Flames of Ascalon" Ability { id: ["6D92", "6D91"], source: "Dragon-king Thordan" } 4147.5 "--sync--" Ability { id: "6D9E", source: "Dragon-king Thordan" } -4148.6 "Trinity 3" #Ability { id: "(6D9F|6DA0|6DA1)", source: "Dragon-king Thordan" } +4148.6 "Trinity 3" #Ability { id: ["6D9F", "6DA0", "6DA1"], source: "Dragon-king Thordan" } 4151.6 "--sync--" Ability { id: "6D9E", source: "Dragon-king Thordan" } -4152.7 "Trinity 4" #Ability { id: "(6D9F|6DA0|6DA1)", source: "Dragon-king Thordan" } +4152.7 "Trinity 4" #Ability { id: ["6D9F", "6DA0", "6DA1"], source: "Dragon-king Thordan" } 4162.6 "Gigaflare's Edge x3" Ability { id: "6D99", source: "Dragon-king Thordan" } duration 7.9 -4163.7 "Ice of Ascalon/Flames of Ascalon" Ability { id: "(6D92|6D91)", source: "Dragon-king Thordan" } +4163.7 "Ice of Ascalon/Flames of Ascalon" Ability { id: ["6D92", "6D91"], source: "Dragon-king Thordan" } 4180.8 "--sync--" Ability { id: "6D9E", source: "Dragon-king Thordan" } -4181.9 "Trinity 5" #Ability { id: "(6D9F|6DA0|6DA1)", source: "Dragon-king Thordan" } +4181.9 "Trinity 5" #Ability { id: ["6D9F", "6DA0", "6DA1"], source: "Dragon-king Thordan" } 4184.9 "--sync--" Ability { id: "6D9E", source: "Dragon-king Thordan" } -4186.0 "Trinity 6" #Ability { id: "(6D9F|6DA0|6DA1)", source: "Dragon-king Thordan" } +4186.0 "Trinity 6" #Ability { id: ["6D9F", "6DA0", "6DA1"], source: "Dragon-king Thordan" } 4193.9 "--sync--" Ability { id: "6D9B", source: "Dragon-king Thordan" } 4194.8 "Exaflare's Edge" duration 9.3 #Ability { id: "6D9C", source: "Dragon-king Thordan" } -4195.0 "Ice of Ascalon/Flames of Ascalon" Ability { id: "(6D92|6D91)", source: "Dragon-king Thordan" } +4195.0 "Ice of Ascalon/Flames of Ascalon" Ability { id: ["6D92", "6D91"], source: "Dragon-king Thordan" } 4201.9 "--sync--" Ability { id: "6D9E", source: "Dragon-king Thordan" } -4202.9 "Trinity 1" #Ability { id: "(6D9F|6DA0|6DA1)", source: "Dragon-king Thordan" } +4202.9 "Trinity 1" #Ability { id: ["6D9F", "6DA0", "6DA1"], source: "Dragon-king Thordan" } 4205.8 "--sync--" Ability { id: "6D9E", source: "Dragon-king Thordan" } -4206.9 "Trinity 2" #Ability { id: "(6D9F|6DA0|6DA1)", source: "Dragon-king Thordan" } +4206.9 "Trinity 2" #Ability { id: ["6D9F", "6DA0", "6DA1"], source: "Dragon-king Thordan" } 4214.8 "--sync--" Ability { id: "6D93", source: "Dragon-king Thordan" } -4215.5 "Akh Morn's Edge x7" duration 7.7 #Ability { id: "(730C|730D|730E)", source: "Dragon-king Thordan" } -4215.6 "Ice of Ascalon/Flames of Ascalon" Ability { id: "(6D92|6D91)", source: "Dragon-king Thordan" } +4215.5 "Akh Morn's Edge x7" duration 7.7 #Ability { id: ["730C", "730D", "730E"], source: "Dragon-king Thordan" } +4215.6 "Ice of Ascalon/Flames of Ascalon" Ability { id: ["6D92", "6D91"], source: "Dragon-king Thordan" } 4228.5 "--sync--" Ability { id: "6D9E", source: "Dragon-king Thordan" } -4229.6 "Trinity 3" #Ability { id: "(6D9F|6DA0|6DA1)", source: "Dragon-king Thordan" } +4229.6 "Trinity 3" #Ability { id: ["6D9F", "6DA0", "6DA1"], source: "Dragon-king Thordan" } 4232.6 "--sync--" Ability { id: "6D9E", source: "Dragon-king Thordan" } -4233.7 "Trinity 4" #Ability { id: "(6D9F|6DA0|6DA1)", source: "Dragon-king Thordan" } +4233.7 "Trinity 4" #Ability { id: ["6D9F", "6DA0", "6DA1"], source: "Dragon-king Thordan" } 4245.6 "--sync--" Ability { id: "6E2E", source: "Dragon-king Thordan" } -4246.3 "Morn Afah's Edge x3" Ability { id: "(730F|7310|7311)", source: "Dragon-king Thordan" } +4246.3 "Morn Afah's Edge x3" Ability { id: ["730F", "7310", "7311"], source: "Dragon-king Thordan" } # This seems to loop indefinitely # 6E31 will fire if 6E30 does not hit a player diff --git a/ui/raidboss/data/06-ew/ultimate/the_omega_protocol.txt b/ui/raidboss/data/06-ew/ultimate/the_omega_protocol.txt index 418beb788c..dc6398aacf 100644 --- a/ui/raidboss/data/06-ew/ultimate/the_omega_protocol.txt +++ b/ui/raidboss/data/06-ew/ultimate/the_omega_protocol.txt @@ -55,8 +55,8 @@ hideall "--sync--" 230.9 "Party Synergy" Ability { id: "7B3E", source: "Omega" } window 20,20 233.9 "--untargetable--" 240.5 "--sync--" Ability { id: "7B1B", source: "Omega" } -241.3 "Superliminal Steel/Optimized Blizzard III" Ability { id: "(7B2A|7B2D)", source: "Omega-F" } -241.3 "Efficient Bladework/Beyond Strength" Ability { id: "(7B25|7B26)", source: "Omega-M" } +241.3 "Superliminal Steel/Optimized Blizzard III" Ability { id: ["7B2A", "7B2D"], source: "Omega-F" } +241.3 "Efficient Bladework/Beyond Strength" Ability { id: ["7B25", "7B26"], source: "Omega-M" } 247.7 "Optimized Fire III" Ability { id: "7B2F", source: "Omega" } 248.0 "Optical Laser" Ability { id: "7B21", source: "Optical Unit" } 250.8 "--sync--" Ability { id: "7B1F", source: "Omega" } @@ -132,7 +132,7 @@ hideall "--sync--" 550.1 "Critical Error" Ability { id: "7B64", source: "Omega" } 560.2 "--sync--" Ability { id: "7B46", source: "Omega" } -571.4 "Oversampled Wave Cannon" Ability { id: "(7B6B|7B6C)", source: "Omega" } +571.4 "Oversampled Wave Cannon" Ability { id: ["7B6B", "7B6C"], source: "Omega" } 577.4 "--sync--" StartsUsing { id: "7B48", source: "Omega" } window 50,50 587.4 "Ion Efflux Enrage" Ability { id: "7B48", source: "Omega" } @@ -199,7 +199,7 @@ hideall "--sync--" 774.0 "Hyper Pulse" #Ability { id: "7B71", source: "Right Arm Unit" } 782.0 "Patch" #Ability { id: "7B63", source: "Omega-M" } 784.0 "Patch" #Ability { id: "7B63", source: "Omega-M" } -786.4 "Swivel Cannon" Ability { id: "(7B94|7B95)", source: "Omega" } +786.4 "Swivel Cannon" Ability { id: ["7B94", "7B95"], source: "Omega" } 787.0 "Hello, Distant World 1" Ability { id: "8110", source: "Omega-M" } 787.0 "Hello, Near World 1" Ability { id: "7B89", source: "Omega-M" } 788.0 "Hello, Distant World 2" #Ability { id: "8111", source: "Omega-M" } @@ -230,7 +230,7 @@ hideall "--sync--" 856.4 "Storage Violation x5 / Storage Violation x6" Ability { id: "7B0[45]", source: "Omega" } 870.6 "Rear Lasers x14" Ability { id: "7B8F", source: "Rear Power Unit" } duration 7.8 -873.7 "Superliminal Steel/Optimized Blizzard III" Ability { id: "(7B2A|7B2D)", source: "Omega-M" } +873.7 "Superliminal Steel/Optimized Blizzard III" Ability { id: ["7B2A", "7B2D"], source: "Omega-M" } 880.6 "Hello, Near World 1" Ability { id: "7B89", source: "Omega-F" } 880.6 "Hello, Distant World 1" Ability { id: "8110", source: "Omega-F" } 880.6 "Hyper Pulse" Ability { id: "7B72", source: "Right Arm Unit" } @@ -246,10 +246,10 @@ hideall "--sync--" 897.4 "Solar Ray 2" Ability { id: "7B02", source: "Omega-M" } 904.6 "--sync--" Ability { id: "7B43", source: "Omega-M" } 910.7 "Run: ****mi* (Omega Version)" Ability { id: "8015", source: "Omega-M" } -927.8 "Diffuse Wave Cannon" Ability { id: "(7B9B|7B9C)", source: "Omega" } +927.8 "Diffuse Wave Cannon" Ability { id: ["7B9B", "7B9C"], source: "Omega" } # 928.8 "Superliminal Steel" Ability { id: "7B2A", source: "Omega-F" } # 928.8 "Beyond Strength" Ability { id: "7B25", source: "Omega-M" } -931.9 "Diffuse Wave Cannon" Ability { id: "(7B78|7B77)", source: "Omega" } +931.9 "Diffuse Wave Cannon" Ability { id: ["7B78", "7B77"], source: "Omega" } # 932.7 "Optimized Blizzard III" Ability { id: "7B2D", source: "Omega-F" } # 932.7 "Beyond Strength" Ability { id: "7B25", source: "Omega-M" } 935.6 "--untargetable--"