From aa826bf555397c8311289cf9b0f8d0245492c7ec Mon Sep 17 00:00:00 2001 From: Adrienne Walker Date: Thu, 14 Dec 2023 08:16:05 -0800 Subject: [PATCH] raidboss: timeline netregex for hw startsusing (#6003) Done by running #5977. A few backslash escapes were found which are listed in a PR comment below. --- .../data/03-hw/alliance/dun_scaith.txt | 8 +++--- .../data/03-hw/alliance/weeping_city.txt | 6 ++--- .../data/03-hw/dungeon/baelsars_wall.txt | 2 +- ui/raidboss/data/03-hw/dungeon/sohm_al.txt | 8 +++--- .../dungeon/the_lost_city_of_amdapor_hard.txt | 6 ++--- ui/raidboss/data/03-hw/dungeon/xelphatol.txt | 2 +- ui/raidboss/data/03-hw/raid/a10n.txt | 2 +- ui/raidboss/data/03-hw/raid/a11s.txt | 26 +++++++++---------- ui/raidboss/data/03-hw/raid/a12s.txt | 2 +- ui/raidboss/data/03-hw/raid/a1s.txt | 4 +-- ui/raidboss/data/03-hw/raid/a3s.txt | 2 +- ui/raidboss/data/03-hw/raid/a4s.txt | 10 +++---- ui/raidboss/data/03-hw/raid/a5s.txt | 6 ++--- ui/raidboss/data/03-hw/raid/a7s.txt | 16 ++++++------ ui/raidboss/data/03-hw/raid/a8s.txt | 4 +-- ui/raidboss/data/03-hw/raid/a9s.txt | 2 +- ui/raidboss/data/03-hw/trial/ravana-ex.txt | 2 +- ui/raidboss/data/03-hw/trial/thordan-ex.txt | 4 +-- ui/raidboss/data/03-hw/trial/zurvan-ex.txt | 2 +- ui/raidboss/data/06-ew/trial/thordan-un.txt | 4 +-- ui/raidboss/data/06-ew/trial/zurvan-un.txt | 2 +- 21 files changed, 60 insertions(+), 60 deletions(-) diff --git a/ui/raidboss/data/03-hw/alliance/dun_scaith.txt b/ui/raidboss/data/03-hw/alliance/dun_scaith.txt index ad149d1d43..5ef576dcba 100644 --- a/ui/raidboss/data/03-hw/alliance/dun_scaith.txt +++ b/ui/raidboss/data/03-hw/alliance/dun_scaith.txt @@ -149,7 +149,7 @@ hideall "--sync--" -1300.0 "--sync--" sync / 14:[^:]*:Ferdiad Hollow:1CA4:/ window 300,5 +1300.0 "--sync--" StartsUsing { id: "1CA4", source: "Ferdiad Hollow" } window 300,5 1304.7 "Jester's Jig" Ability { id: "1CA4", source: "Ferdiad Hollow" } 1306.7 "--sync--" Ability { id: "1CA5", source: "Ferdiad Hollow" } @@ -237,7 +237,7 @@ hideall "--sync--" 2220.5 "Light Pillar x10" # Enrage is a LOOOONG cast alongside Aether Collectors. -2500.0 "--sync--" sync / 14:[^:]*:Proto Ultima:1DA9:/ window 2500,5 +2500.0 "--sync--" StartsUsing { id: "1DA9", source: "Proto Ultima" } window 2500,5 2559.7 "Supernova Enrage" Ability { id: "1DA9", source: "Proto Ultima" } @@ -296,7 +296,7 @@ hideall "--sync--" 3333.6 "Particle Beam" Ability { id: "1D2[78]", source: "Scathach" } -3400.5 "--sync--" sync / 14:[^:]*:Scathach:1D34:/ window 100,5 +3400.5 "--sync--" StartsUsing { id: "1D34", source: "Scathach" } window 100,5 # 3405.2 "Blinding Shadow" Ability { id: "1D34", source: "Scathach" } 3409.2 "Blinding Shadow" Ability { id: "1DAE", source: "Scathach" } @@ -376,7 +376,7 @@ hideall "--sync--" 4103.1 "Noctoshield" 4108.1 "Nightmare" -4149.0 "--sync--" sync / 14:[^:]*:Diabolos:1C10:/ window 150,5 +4149.0 "--sync--" StartsUsing { id: "1C10", source: "Diabolos" } window 150,5 4163.7 "Ruinous Omen" Ability { id: "1C10", source: "Diabolos" } 4164.7 "Ruinous Omen" Ability { id: "1C11", source: "Diabolos" } diff --git a/ui/raidboss/data/03-hw/alliance/weeping_city.txt b/ui/raidboss/data/03-hw/alliance/weeping_city.txt index c31c83cb70..b9ea5f7973 100644 --- a/ui/raidboss/data/03-hw/alliance/weeping_city.txt +++ b/ui/raidboss/data/03-hw/alliance/weeping_city.txt @@ -37,7 +37,7 @@ hideall "--sync--" # Back on the ground for a relatively short bridge block # We sync to a 14/20 startsUsing log line instead of a 15/21 ability line. # This lets us jump out of the intermission slightly earlier. -197.3 "Dark Spike" sync / 14:[^:]*:Arachne Eve:1823:/ window 100,5 +197.3 "Dark Spike" StartsUsing { id: "1823", source: "Arachne Eve" } window 100,5 206.3 "--sync--" Ability { id: "1847", source: "Arachne Eve" } 210.5 "Sticky Wicket x3" # Ability { id: "183F", source: "Arachne Eve" } 212.1 "--untargetable--" @@ -212,7 +212,7 @@ hideall "--sync--" 2157.1 "Execration" Ability { id: "1828", source: "Ozma" } 2178.4 "Acceleration Bomb" Ability { id: "182F", source: "Ozma" } 2195.7 "Transfiguration (Sphere)" Ability { id: "1827", source: "Ozma" } -2199.1 "--sync--" sync / 14:[^:]*:Ozma:1800:/ window 48.8,5 +2199.1 "--sync--" StartsUsing { id: "1800", source: "Ozma" } window 48.8,5 2203.8 "Black Hole" Ability { id: "1800", source: "Ozma" } window 53,5 jump 2400.0 # Cube-first path @@ -221,7 +221,7 @@ hideall "--sync--" 2257.0 "Flare Star" Ability { id: "1805", source: "Ozma" } 2288.0 "Holy" Ability { id: "182E", source: "Ozma" } 2300.0 "Transfiguration (Sphere)" Ability { id: "1804", source: "Ozma" } -2303.3 "--sync--" sync / 14:[^:]*:Ozma:1800:/ window 53.3,5 +2303.3 "--sync--" StartsUsing { id: "1800", source: "Ozma" } window 53.3,5 2308.0 "Black Hole" Ability { id: "1800", source: "Ozma" } window 58,5 jump 2400.0 # Intermission diff --git a/ui/raidboss/data/03-hw/dungeon/baelsars_wall.txt b/ui/raidboss/data/03-hw/dungeon/baelsars_wall.txt index fa12401f35..9de0ba7c65 100644 --- a/ui/raidboss/data/03-hw/dungeon/baelsars_wall.txt +++ b/ui/raidboss/data/03-hw/dungeon/baelsars_wall.txt @@ -26,7 +26,7 @@ hideall "--sync--" 68.7 "Magitek Missile" Ability { id: "1CB4", source: "Magitek Predator" } 70.8 "Magitek Missile" Ability { id: "1CB4", source: "Magitek Predator" } -73.2 "--sync--" sync / 14:[^:]*:Magitek Predator:1CB3:/ window 10,10 +73.2 "--sync--" StartsUsing { id: "1CB3", source: "Magitek Predator" } window 10,10 75.9 "Magitek Ray" Ability { id: "1CB3", source: "Magitek Predator" } jump 44.4 89.0 "Magitek Claw" 98.4 "Magitek Missile" diff --git a/ui/raidboss/data/03-hw/dungeon/sohm_al.txt b/ui/raidboss/data/03-hw/dungeon/sohm_al.txt index 74d854d4a7..50bfb8e842 100644 --- a/ui/raidboss/data/03-hw/dungeon/sohm_al.txt +++ b/ui/raidboss/data/03-hw/dungeon/sohm_al.txt @@ -23,7 +23,7 @@ hideall "--Reset--" # Looks like there are two loop groups of skills used repeatly? # Group 1 -100.0 "--sync--" sync / 14:[^:]*:Raskovnik:1395:/ window 100,0 +100.0 "--sync--" StartsUsing { id: "1395", source: "Raskovnik" } window 100,0 103.0 "Sweet Scent" Ability { id: "1395", source: "Raskovnik" } window 103,0 114.6 "Floral Trap" Ability { id: "1391", source: "Raskovnik" } 119.6 "Flower Devour" Ability { id: "1392", source: "Raskovnik" } @@ -41,7 +41,7 @@ hideall "--Reset--" # Inside Loop # Loop -200.0 "--sync--" sync / 14:[^:]*:Raskovnik:1395:/ window 97,0 jump 100.0 +200.0 "--sync--" StartsUsing { id: "1395", source: "Raskovnik" } window 97,0 jump 100.0 203.0 "Sweet Scent" Ability { id: "1395", source: "Raskovnik" } window 97,0 jump 103.0 214.8 "Floral Trap" # Ability { id: "1391", source: "Raskovnik" } 219.8 "Flower Devour" # Ability { id: "1392", source: "Raskovnik" } @@ -49,7 +49,7 @@ hideall "--Reset--" 226.7 "--sync--" # Ability { id: "1394", source: "Raskovnik" } # Group 2 -300.0 "--sync--" sync / 14:[^:]*:Raskovnik:ED6:/ window 300,0 +300.0 "--sync--" StartsUsing { id: "ED6", source: "Raskovnik" } window 300,0 303.0 "Leafstorm" Ability { id: "ED6", source: "Raskovnik" } 308.2 "Bloody Caress" Ability { id: "ED1", source: "Raskovnik" } 314.3 "--sync--" Ability { id: "ED2", source: "Raskovnik" } @@ -65,7 +65,7 @@ hideall "--Reset--" 373.4 "Bloody Caress" # Ability { id: "ED1", source: "Raskovnik" } # jump back to group 1 -500.0 "--sync--" sync / 14:[^:]*:Raskovnik:1395:/ window 500,0 jump 100.0 +500.0 "--sync--" StartsUsing { id: "1395", source: "Raskovnik" } window 500,0 jump 100.0 ### Myath diff --git a/ui/raidboss/data/03-hw/dungeon/the_lost_city_of_amdapor_hard.txt b/ui/raidboss/data/03-hw/dungeon/the_lost_city_of_amdapor_hard.txt index bf11d4abc9..201d1a0b2a 100644 --- a/ui/raidboss/data/03-hw/dungeon/the_lost_city_of_amdapor_hard.txt +++ b/ui/raidboss/data/03-hw/dungeon/the_lost_city_of_amdapor_hard.txt @@ -60,7 +60,7 @@ hideall "--sync--" 2043.3 "Scratch" Ability { id: "15D5", source: "Winged Lion" } # can hp% push here -2049.5 "--sync--" sync / 14:[^:]*:Winged Lion:15C9:/ window 50,5 +2049.5 "--sync--" StartsUsing { id: "15C9", source: "Winged Lion" } window 50,5 2052.5 "--sync--" Ability { id: "15C9", source: "Winged Lion" } 2054.5 "--untargetable--" 2072.6 "Ancient Holy" Ability { id: "15CA", source: "Winged Lion" } window 20,20 @@ -74,7 +74,7 @@ hideall "--sync--" 2133.2 "Ancient Stone" Ability { id: "15D2", source: "Winged Lion" } 2138.3 "Scratch" Ability { id: "15D5", source: "Winged Lion" } -2143.3 "--sync--" sync / 14:[^:]*:Winged Lion:15C9:/ window 80,5 +2143.3 "--sync--" StartsUsing { id: "15C9", source: "Winged Lion" } window 80,5 2145.6 "--adds--" 2146.3 "--sync--" Ability { id: "15C9", source: "Winged Lion" } 2148.3 "--untargetable--" @@ -94,7 +94,7 @@ hideall "--sync--" 2259.3 "Scratch" Ability { id: "15D5", source: "Winged Lion" } 2266.7 "--adds--" -2264.4 "--sync--" sync / 14:[^:]*:Winged Lion:15C9:/ window 80,5 +2264.4 "--sync--" StartsUsing { id: "15C9", source: "Winged Lion" } window 80,5 2267.4 "--sync--" Ability { id: "15C9", source: "Winged Lion" } 2269.4 "--untargetable--" 2287.5 "Ancient Holy" Ability { id: "15CA", source: "Winged Lion" } window 50,50 jump 2166.4 diff --git a/ui/raidboss/data/03-hw/dungeon/xelphatol.txt b/ui/raidboss/data/03-hw/dungeon/xelphatol.txt index 0cfbbba6d9..eed869f70b 100644 --- a/ui/raidboss/data/03-hw/dungeon/xelphatol.txt +++ b/ui/raidboss/data/03-hw/dungeon/xelphatol.txt @@ -39,7 +39,7 @@ hideall "--sync--" 169.7 "Short Burst" # syncing to a 14/20 line to give the user a little extra warning. -200.0 "--sync--" sync / 14:[^:]*:Nuzal Hueloc:19C9:/ window 100,5 +200.0 "--sync--" StartsUsing { id: "19C9", source: "Nuzal Hueloc" } window 100,5 202.7 "Lift" Ability { id: "19C9", source: "Nuzal Hueloc" } 203.2 "--untargetable--" 206.9 "Air Raid" Ability { id: "19CA", source: "Nuzal Hueloc" } diff --git a/ui/raidboss/data/03-hw/raid/a10n.txt b/ui/raidboss/data/03-hw/raid/a10n.txt index 1acd42af0a..d1f9c8a7d6 100644 --- a/ui/raidboss/data/03-hw/raid/a10n.txt +++ b/ui/raidboss/data/03-hw/raid/a10n.txt @@ -34,7 +34,7 @@ hideall "--sync--" 105.4 "--sync--" Ability { id: "1AA2", source: "Lamebrix Strikebocks" } window 20,20 110.7 "--targetable--" -111.1 "--sync--" sync / 14:[^:]*:Gobpress R-VI:1AC9:/ window 112,10 +111.1 "--sync--" StartsUsing { id: "1AC9", source: "Gobpress R-VI" } window 112,10 112.8 "--sync--" Ability { id: "1A9C", source: "Lamebrix Strikebocks" } 117.8 "Critical Wrath" Ability { id: "1ACD", source: "Lamebrix Strikebocks" } 122.9 "Illuminati Hand Cannon" Ability { id: "1AD2", source: "Lamebrix Strikebocks" } diff --git a/ui/raidboss/data/03-hw/raid/a11s.txt b/ui/raidboss/data/03-hw/raid/a11s.txt index c9e9fd1164..145d982e70 100644 --- a/ui/raidboss/data/03-hw/raid/a11s.txt +++ b/ui/raidboss/data/03-hw/raid/a11s.txt @@ -11,7 +11,7 @@ hideall "--Reset--" hideall "--sync--" 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1 -6.2 "--sync--" sync / 14:[^:]*:Cruise Chaser:1A7[A9]:/ window 7,5 +6.2 "--sync--" StartsUsing { id: "1A7[A9]", source: "Cruise Chaser" } window 7,5 9.2 "Left/Right Laser Sword" Ability { id: "1A7[A9]", source: "Cruise Chaser" } # skippable @@ -27,13 +27,13 @@ hideall "--sync--" # If we jump to this laser sword immediately after first, the timing is: # 9.2 (first sword) 21.7 (second sword) # Sync to somewhere that will catch t=18.7 - 2.5 seconds = ~36 window (at least) -51.8 "--sync--" sync / 14:[^:]*:Cruise Chaser:1A7[A9]:/ window 40,5 +51.8 "--sync--" StartsUsing { id: "1A7[A9]", source: "Cruise Chaser" } window 40,5 54.8 "Left/Right Laser Sword" Ability { id: "1A7[A9]", source: "Cruise Chaser" } 55.8 "E.D.D. Armored Pauldron" 64.0 "Spin Crusher" Ability { id: "1A85", source: "Cruise Chaser" } 81.2 "Whirlwind" Ability { id: "1A84", source: "Cruise Chaser" } -85.3 "--sync--" sync / 14:[^:]*:Cruise Chaser:1A7[A9]:/ window 30,5 +85.3 "--sync--" StartsUsing { id: "1A7[A9]", source: "Cruise Chaser" } window 30,5 88.3 "Left/Right Laser Sword" Ability { id: "1A7[A9]", source: "Cruise Chaser" } # GA-100 in the first phase. WHO KNEW? @@ -41,7 +41,7 @@ hideall "--sync--" 101.6 "GA-100?" Ability { id: "1A76", source: "Cruise Chaser" } # can skip add and jump here -112.7 "--sync--" sync / 14:[^:]*:Cruise Chaser:1A6E:/ window 113,5 +112.7 "--sync--" StartsUsing { id: "1A6E", source: "Cruise Chaser" } window 113,5 114.7 "Optical Sight (bait)" Ability { id: "1A6E", source: "Cruise Chaser" } 119.9 "Hawk Blaster" Ability { id: "1A6F", source: "Cruise Chaser" } @@ -55,7 +55,7 @@ hideall "--sync--" 168.1 "Left/Right Laser Sword" Ability { id: "1A7[A9]", source: "Cruise Chaser" } ### Limit Cut Numbers -177.3 "--sync--" sync / 14:[^:]*:Cruise Chaser:1A80:/ window 180,5 +177.3 "--sync--" StartsUsing { id: "1A80", source: "Cruise Chaser" } window 180,5 179.3 "Limit Cut (numbers)" Ability { id: "1A80", source: "Cruise Chaser" } 179.9 "--invincible--" 183.5 "Markers" @@ -109,7 +109,7 @@ hideall "--sync--" ### Eternal Darkness 344.4 "--targetable--" -344.5 "--sync--" sync / 14:[^:]*:Cruise Chaser:1A19:/ window 350,10 +344.5 "--sync--" StartsUsing { id: "1A19", source: "Cruise Chaser" } window 350,10 352.5 "Eternal Darkness" Ability { id: "1A19", source: "Cruise Chaser" } 361.7 "Left/Right Laser Sword" Ability { id: "1A7[A9]", source: "Cruise Chaser" } 370.8 "Whirlwind" Ability { id: "1A84", source: "Cruise Chaser" } @@ -121,16 +121,16 @@ hideall "--sync--" 396.1 "Super Hawk Blaster" Ability { id: "1A71", source: "Cruise Chaser" } # also skippable -399.2 "--sync--" sync / 14:[^:]*:Cruise Chaser:1A80:/ window 50,10 +399.2 "--sync--" StartsUsing { id: "1A80", source: "Cruise Chaser" } window 50,10 401.2 "Limit Cut (shield)" Ability { id: "1A80", source: "Cruise Chaser" } 401.8 "--invincible--" 406.6 "Plasma Shield" 431.2 "Plasma Shield Enrage" -431.2 "--sync--" sync / 14:[^:]*:Cruise Chaser:1A83:/ window 40,30 +431.2 "--sync--" StartsUsing { id: "1A83", source: "Cruise Chaser" } window 40,30 435.2 "Blassty Charge" Ability { id: "1A83", source: "Cruise Chaser" } 437.3 "--targetable--" -439.5 "--sync--" sync / 14:[^:]*:Cruise Chaser:1A73:/ window 40,10 +439.5 "--sync--" StartsUsing { id: "1A73", source: "Cruise Chaser" } window 40,10 442.5 "Photon (offtank)" Ability { id: "1A73", source: "Cruise Chaser" } 450.9 "Laser X Sword" Ability { id: "1A7F", source: "Cruise Chaser" } @@ -139,7 +139,7 @@ hideall "--sync--" 462.0 "Photon (dps)" Ability { id: "1A73", source: "Cruise Chaser" } 470.2 "Whirlwind" Ability { id: "1A84", source: "Cruise Chaser" } -478.4 "--sync--" sync / 14:[^:]*:Cruise Chaser:1A7[A9]:/ window 80,5 +478.4 "--sync--" StartsUsing { id: "1A7[A9]", source: "Cruise Chaser" } window 80,5 481.4 "Left/Right Laser Sword" Ability { id: "1A7[A9]", source: "Cruise Chaser" } 487.5 "Photon (healer)" Ability { id: "1A73", source: "Cruise Chaser" } 495.6 "Whirlwind" Ability { id: "1A84", source: "Cruise Chaser" } @@ -179,7 +179,7 @@ hideall "--sync--" 647.4 "Assault Cannon" #Ability { id: "1A78", source: "Claster" } 651.8 "Propeller Wind" Ability { id: "1A75", source: "Cruise Chaser" } -655.0 "--sync--" sync / 14:[^:]*:Cruise Chaser:1A80:/ window 100,20 +655.0 "--sync--" StartsUsing { id: "1A80", source: "Cruise Chaser" } window 100,20 657.0 "Limit Cut (numbers)" Ability { id: "1A80", source: "Cruise Chaser" } 657.6 "--invincible--" 661.2 "Markers" @@ -200,12 +200,12 @@ hideall "--sync--" 722.7 "Photon (healer)" Ability { id: "1A73", source: "Cruise Chaser" } 730.8 "Whirlwind" Ability { id: "1A84", source: "Cruise Chaser" } -733.7 "--sync--" sync / 14:[^:]*:Cruise Chaser:1A80:/ window 70,20 +733.7 "--sync--" StartsUsing { id: "1A80", source: "Cruise Chaser" } window 70,20 735.7 "Limit Cut (shield)" Ability { id: "1A80", source: "Cruise Chaser" } 736.3 "--invincible--" 741.1 "Plasma Shield" 765.7 "Plasma Shield Enrage" -765.7 "--sync--" sync / 14:[^:]*:Cruise Chaser:1A83:/ window 40,30 +765.7 "--sync--" StartsUsing { id: "1A83", source: "Cruise Chaser" } window 40,30 769.7 "Blassty Charge" Ability { id: "1A83", source: "Cruise Chaser" } 771.8 "--targetable--" diff --git a/ui/raidboss/data/03-hw/raid/a12s.txt b/ui/raidboss/data/03-hw/raid/a12s.txt index 1097e8623b..5f2f2d8387 100644 --- a/ui/raidboss/data/03-hw/raid/a12s.txt +++ b/ui/raidboss/data/03-hw/raid/a12s.txt @@ -29,7 +29,7 @@ hideall "--sync--" 70.4 "Arrhidaeus's Lanner x8" 105.5 "The General's Wing x4" -113.7 "--sync--" sync / 14:[^:]*:The General's Wing:19F7:/ window 114,3 +113.7 "--sync--" StartsUsing { id: "19F7", source: "The General's Wing" } window 114,3 116.7 "Almost Holy" Ability { id: "19F7", source: "The General's Wing" } 124.9 "Almost Holy" Ability { id: "19F7", source: "The General's Wing" } 133.2 "Almost Holy" Ability { id: "19F7", source: "The General's Wing" } diff --git a/ui/raidboss/data/03-hw/raid/a1s.txt b/ui/raidboss/data/03-hw/raid/a1s.txt index cbdb4dfd77..2c125d5f7a 100644 --- a/ui/raidboss/data/03-hw/raid/a1s.txt +++ b/ui/raidboss/data/03-hw/raid/a1s.txt @@ -123,6 +123,6 @@ hideall "--sync--" ## Enrage -3000.0 "--sync--" sync / 14:[^:]*:Oppressor:E49:/ window 3000,0 -3000.0 "--sync--" sync / 14:[^:]*:Oppressor 0\.5:E49:/ window 3000,0 +3000.0 "--sync--" StartsUsing { id: "E49", source: "Oppressor" } window 3000,0 +3000.0 "--sync--" StartsUsing { id: "E49", source: "Oppressor 0\\.5" } window 3000,0 3010.0 "Self-Destruct Enrage" Ability { id: "E49", source: "Oppressor" } diff --git a/ui/raidboss/data/03-hw/raid/a3s.txt b/ui/raidboss/data/03-hw/raid/a3s.txt index b6593d9d36..722166abf1 100644 --- a/ui/raidboss/data/03-hw/raid/a3s.txt +++ b/ui/raidboss/data/03-hw/raid/a3s.txt @@ -181,5 +181,5 @@ hideall "--sync--" 748.0 "Ferrofluid" Ability { id: "F01", source: "Living Liquid" } 749.2 "Magnetism/Repel" Ability { id: "F1[35]", source: "Living Liquid" } -751.2 "--sync--" sync / 14:[^:]*:Living Liquid:EFF:/ window 1000,1000 +751.2 "--sync--" StartsUsing { id: "EFF", source: "Living Liquid" } window 1000,1000 761.2 "Cascade Enrage" Ability { id: "EFF", source: "Living Liquid" } diff --git a/ui/raidboss/data/03-hw/raid/a4s.txt b/ui/raidboss/data/03-hw/raid/a4s.txt index 0eefc7a006..286ae35c5f 100644 --- a/ui/raidboss/data/03-hw/raid/a4s.txt +++ b/ui/raidboss/data/03-hw/raid/a4s.txt @@ -48,7 +48,7 @@ ### Leg 2 500.0 "--sync--" sync / 22:........:The Manipulator:........:The Manipulator:01/ window 500,0 512.1 "--untargetable--" -516.2 "--sync--" sync / 14:[^:]*:The Manipulator:13E7:/ window 517,5 +516.2 "--sync--" StartsUsing { id: "13E7", source: "The Manipulator" } window 517,5 522.2 "Mortal Revolution" Ability { id: "13E7", source: "The Manipulator" } 524.2 "--targetable--" 532.3 "Emergency Quarantine" Ability { id: "F62", source: "The Manipulator" } @@ -89,7 +89,7 @@ ### Leg 3 1000.0 "--sync--" sync / 22:........:The Manipulator:........:The Manipulator:01/ window 490,0 1012.1 "--untargetable--" -1016.2 "--sync--" sync / 14:[^:]*:The Manipulator:13E7:/ window 490,5 +1016.2 "--sync--" StartsUsing { id: "13E7", source: "The Manipulator" } window 490,5 1022.2 "Mortal Revolution" Ability { id: "13E7", source: "The Manipulator" } 1024.2 "--targetable--" 1027.4 "Hydrothermal Missile" Ability { id: "F5B", source: "The Manipulator" } window 10,10 @@ -144,7 +144,7 @@ ### Leg 4 1500.0 "--sync--" sync / 22:........:The Manipulator:........:The Manipulator:01/ window 490,0 1512.1 "--untargetable--" -1516.2 "--sync--" sync / 14:[^:]*:The Manipulator:13E7:/ window 490,5 +1516.2 "--sync--" StartsUsing { id: "13E7", source: "The Manipulator" } window 490,5 1522.2 "Mortal Revolution" Ability { id: "13E7", source: "The Manipulator" } 1524.2 "--targetable--" 1528.4 "Judgment Nisi" Ability { id: "F64", source: "The Manipulator" } @@ -179,7 +179,7 @@ ### Final Phase 2000.0 "--sync--" sync / 22:........:The Manipulator:........:The Manipulator:01/ window 490,0 2012.1 "--untargetable--" -2016.2 "--sync--" sync / 14:[^:]*:The Manipulator:13E7:/ window 490,5 +2016.2 "--sync--" StartsUsing { id: "13E7", source: "The Manipulator" } window 490,5 2022.2 "Mortal Revolution" Ability { id: "13E7", source: "The Manipulator" } 2024.2 "--targetable--" @@ -222,5 +222,5 @@ ### Enrage # Note: Manipulator won't enrage until all legs have been killed. -2500.0 "--sync--" sync / 14:[^:]*:The Manipulator:13E7:/ window 480,480 +2500.0 "--sync--" StartsUsing { id: "13E7", source: "The Manipulator" } window 480,480 2506.0 "Mortal Revolution Enrage" Ability { id: "13E7", source: "The Manipulator" } diff --git a/ui/raidboss/data/03-hw/raid/a5s.txt b/ui/raidboss/data/03-hw/raid/a5s.txt index 9af411b8c1..2685c07eaa 100644 --- a/ui/raidboss/data/03-hw/raid/a5s.txt +++ b/ui/raidboss/data/03-hw/raid/a5s.txt @@ -20,7 +20,7 @@ hideall "Relaxant" #1045.5 "Kaltstrahl" Ability { id: "16CC", source: "Faust" } #1047.6 "Kaltstrahl" Ability { id: "16CC", source: "Faust" } -1051.6 "--sync--" sync / 14:[^:]*:Hummelfaust:16D2:/ window 52,10 +1051.6 "--sync--" StartsUsing { id: "16D2", source: "Hummelfaust" } window 52,10 1056.6 "Panzer Vor" Ability { id: "16D2", source: "Hummelfaust" } # Note: if previous Fausts haven't been destroyed, @@ -49,7 +49,7 @@ hideall "Relaxant" # FIXME: maybe more abilities if Fausts are pushed quickly? # Time-based enrage. -1150.7 "--sync--" sync / 14:[^:]*:Hummelfaust:16D1:/ window 151,20 +1150.7 "--sync--" StartsUsing { id: "16D1", source: "Hummelfaust" } window 151,20 1154.7 "Panzerschreck Enrage" Ability { id: "16D1", source: "Hummelfaust" } @@ -170,5 +170,5 @@ hideall "Relaxant" ### Enrage (time-based) # We could sync down here on an 16A4 ability, which is the damage, # but that point you're dead. -2700.0 "--sync--" sync / 14:[^:]*:Ratfinx Twinkledinks:159C:/ window 200,200 +2700.0 "--sync--" StartsUsing { id: "159C", source: "Ratfinx Twinkledinks" } window 200,200 2703.0 "Shock Therapy Enrage" Ability { id: "159C", source: "Ratfinx Twinkledinks" } diff --git a/ui/raidboss/data/03-hw/raid/a7s.txt b/ui/raidboss/data/03-hw/raid/a7s.txt index cfa62fd545..34db5ba17c 100644 --- a/ui/raidboss/data/03-hw/raid/a7s.txt +++ b/ui/raidboss/data/03-hw/raid/a7s.txt @@ -78,11 +78,11 @@ hideall "--sync--" ################# Version 1 - Phase 2 194 "Uplander Doom" Ability { id: "15F0", source: "Quickthinx Allthoughts" } window 65,0 -204 "Kill Heart" sync / 14:[^:]*:Shanoa:15EC:/ window 145,10 +204 "Kill Heart" StartsUsing { id: "15EC", source: "Shanoa" } window 145,10 219 "Stun Heart" 219 "Sizzlespark" 229 "Flamethrower" Ability { id: "1CFA", source: "Quickthinx Allthoughts" } window 20 -234 "Kill Heart" sync / 14:[^:]*:Shanoa:15EC:/ window 20 +234 "Kill Heart" StartsUsing { id: "15EC", source: "Shanoa" } window 20 249 "Stun Heart" 249 "Sizzlebeam" 258 "Sizzlespark" #can be skipped @@ -115,11 +115,11 @@ hideall "--sync--" ################# Version 2 - Phase 2 489 "Uplander Doom" Ability { id: "15F0", source: "Quickthinx Allthoughts" } window 78,0 -499 "Kill Heart" sync / 14:[^:]*:Shanoa:15EC:/ window 130,10 +499 "Kill Heart" StartsUsing { id: "15EC", source: "Shanoa" } window 130,10 514 "Stun Heart" 514 "Sizzlespark" 524 "Flamethrower" Ability { id: "1CFA", source: "Quickthinx Allthoughts" } window 20 -529 "Kill Heart" sync / 14:[^:]*:Shanoa:15EC:/ window 10 +529 "Kill Heart" StartsUsing { id: "15EC", source: "Shanoa" } window 10 544 "Stun Heart" 544 "Sizzlebeam" 553 "Sizzlespark" #can be skipped @@ -161,12 +161,12 @@ hideall "--sync--" ################# Phase 5 854 "Flamethrower" Ability { id: "1CFA", source: "Quickthinx Allthoughts" } window 60,10 -858 "Kill Heart" sync / 14:[^:]*:Shanoa:15EC:/ window 200,10 +858 "Kill Heart" StartsUsing { id: "15EC", source: "Shanoa" } window 200,10 865 "Uplander Doom" 873 "Stun Heart" 879 "Sizzlebeam" 888 "Flamethrower" -888 "Kill Heart" sync / 14:[^:]*:Shanoa:15EC:/ window 10 +888 "Kill Heart" StartsUsing { id: "15EC", source: "Shanoa" } window 10 901 "Sizzlespark" 903 "Stun Heart" 909 "Sizzlespark" @@ -220,12 +220,12 @@ hideall "--sync--" ############################################ ################# Phase 5 1253 "Flamethrower" Ability { id: "1CFA", source: "Quickthinx Allthoughts" } window 60,10 -1258 "Kill Heart" sync / 14:[^:]*:Shanoa:15EC:/ window 200,10 +1258 "Kill Heart" StartsUsing { id: "15EC", source: "Shanoa" } window 200,10 1263 "Uplander Doom" 1273 "Stun Heart" 1280 "Sizzlebeam" 1288 "Flamethrower" -1288 "Kill Heart" sync / 14:[^:]*:Shanoa:15EC:/ window 10 +1288 "Kill Heart" StartsUsing { id: "15EC", source: "Shanoa" } window 10 1301 "Sizzlespark" 1303 "Stun Heart" 1308 "Sizzlespark" diff --git a/ui/raidboss/data/03-hw/raid/a8s.txt b/ui/raidboss/data/03-hw/raid/a8s.txt index 5c7adeb199..a703d51873 100644 --- a/ui/raidboss/data/03-hw/raid/a8s.txt +++ b/ui/raidboss/data/03-hw/raid/a8s.txt @@ -111,7 +111,7 @@ hideall "Brute Force" # All of the robots have their own rotation <50% # Messing up thunder seems the most punishing, so here's Vortexer. -600.0 "--sync--" sync / 14:[^:]*:Vortexer:1657:/ window 600,0 +600.0 "--sync--" StartsUsing { id: "1657", source: "Vortexer" } window 600,0 603.0 "Super Cyclone" Ability { id: "1657", source: "Vortexer" } 608.1 "Elemental Jammer" Ability { id: "167E", source: "Vortexer" } 615.4 "Ballistic Missile" Ability { id: "1650", source: "Vortexer" } @@ -220,7 +220,7 @@ hideall "Brute Force" ### Phase 7: Gavel -1252.1 "--targetable--" sync / 14:[^:]*:Brute Justice:166E:/ window 1255,100 +1252.1 "--targetable--" StartsUsing { id: "166E", source: "Brute Justice" } window 1255,100 1257.1 "Justice" Ability { id: "166E", source: "Brute Justice" } 1264.2 "Verdict" Ability { id: "166F", source: "Brute Justice" } 1296.3 "Gavel" Ability { id: "1670", source: "Brute Justice" } diff --git a/ui/raidboss/data/03-hw/raid/a9s.txt b/ui/raidboss/data/03-hw/raid/a9s.txt index 12fdf75a20..767337e721 100644 --- a/ui/raidboss/data/03-hw/raid/a9s.txt +++ b/ui/raidboss/data/03-hw/raid/a9s.txt @@ -186,7 +186,7 @@ hideall "--sync--" 2654.4 "Scrap Bomb" Ability { id: "1A3E", source: "Refurbisher 0" } # 11 minute less soft enrage, in case you weren't killed by previous enrage. -2659.2 "--sync--" sync / 14:[^:]*:Refurbisher 0:1A3B:/ window 50,10000 +2659.2 "--sync--" StartsUsing { id: "1A3B", source: "Refurbisher 0" } window 50,10000 2659.5 "Scrap Storm Enrage" Ability { id: "1A3B", source: "Refurbisher 0" } 2659.5 "Scrap Storm Enrage" #Ability { id: "1A3B", source: "Refurbisher 0" } 2667.7 "Scrap Storm Enrage" #Ability { id: "1A3B", source: "Refurbisher 0" } diff --git a/ui/raidboss/data/03-hw/trial/ravana-ex.txt b/ui/raidboss/data/03-hw/trial/ravana-ex.txt index 55d70322e0..c452bd836a 100644 --- a/ui/raidboss/data/03-hw/trial/ravana-ex.txt +++ b/ui/raidboss/data/03-hw/trial/ravana-ex.txt @@ -81,7 +81,7 @@ hideall "--sync--" # The intermission can have 0-10 Laughing Moon charges before Ravana uses the Chandrahas ultimate. # The number is dependent on how many Gana are able to finish their Falling Laughter casts. # More than 1-2 is typically a wipe, as each inflicts a Vulnerability Up stack to the party. -336.8 "Bloody Fuller" sync / 14:[^:]*:Ravana:EB3:/ duration 4.7 window 336.8,5 +336.8 "Bloody Fuller" StartsUsing { id: "EB3", source: "Ravana" } duration 4.7 window 336.8,5 341.1 "--untargetable--" 400.0 "Chandrahas" Ability { id: "EB5", source: "Ravana" } window 400,5 diff --git a/ui/raidboss/data/03-hw/trial/thordan-ex.txt b/ui/raidboss/data/03-hw/trial/thordan-ex.txt index 748a025a46..6fd1520f52 100644 --- a/ui/raidboss/data/03-hw/trial/thordan-ex.txt +++ b/ui/raidboss/data/03-hw/trial/thordan-ex.txt @@ -41,7 +41,7 @@ hideall "--sync--" 101.4 "Heavensflame 4" #Ability { id: "14AC", source: "Ser Charibert" } 101.5 "--sync--" Ability { id: "149C", source: "Ser Hermenost" } # Conviction (model animation, no actual snapshot) 104.3 "Conviction" Ability { id: "149D", source: "Ser Hermenost" } -107.4 "Sacred Cross" sync / 14:[^:]*:Ser Zephirin:1490:/ duration 19.7 +107.4 "Sacred Cross" StartsUsing { id: "1490", source: "Ser Zephirin" } duration 19.7 127.1 "--sync--" Ability { id: "1490", source: "Ser Zephirin" } 133.1 "Spiral Thrust" Ability { id: "14A6", source: "(Ser Ignasse|Ser Paulecrain|Ser Vellguine)" } @@ -186,7 +186,7 @@ hideall "--sync--" 704.6 "Heavensward Leap 1" Ability { id: "14AA", source: "Ser Vellguine" } 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" sync / 14:[^:]*:Ser Zephirin:1491:/ duration 24.7 +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)" } 732.6 "Absolute Conviction 1" Ability { id: "14A4", source: "Ser Guerrique" } 735.5 "Absolute Conviction 2" Ability { id: "14A5", source: "Ser Hermenost" } diff --git a/ui/raidboss/data/03-hw/trial/zurvan-ex.txt b/ui/raidboss/data/03-hw/trial/zurvan-ex.txt index 1270cb6a93..2f482be1cd 100644 --- a/ui/raidboss/data/03-hw/trial/zurvan-ex.txt +++ b/ui/raidboss/data/03-hw/trial/zurvan-ex.txt @@ -219,7 +219,7 @@ hideall "--sync--" # Enrage at 12 minutes -1989.7 "--sync--" sync / 14:[^:]*:Zurvan:1E59:/ window 2000,100 +1989.7 "--sync--" StartsUsing { id: "1E59", source: "Zurvan" } window 2000,100 1998.8 "Flame Halberd Enrage" Ability { id: "1E59", source: "Zurvan" } 1998.8 "--untargetable--" 2000.0 "--sync--" Ability { id: "1E58", source: "Zurvan" } diff --git a/ui/raidboss/data/06-ew/trial/thordan-un.txt b/ui/raidboss/data/06-ew/trial/thordan-un.txt index 85d7a0c3e8..83652f12c6 100644 --- a/ui/raidboss/data/06-ew/trial/thordan-un.txt +++ b/ui/raidboss/data/06-ew/trial/thordan-un.txt @@ -46,7 +46,7 @@ hideall "--sync--" 101.4 "Heavensflame 4" #Ability { id: "89EB", source: "Ser Charibert" } 101.5 "--sync--" Ability { id: "89DB", source: "Ser Hermenost" } # Conviction (model animation, no actual snapshot) 104.3 "Conviction" Ability { id: "89DC", source: "Ser Hermenost" } -107.4 "Sacred Cross" sync / 14:[^:]*:Ser Zephirin:89CF:/ duration 19.7 +107.4 "Sacred Cross" StartsUsing { id: "89CF", source: "Ser Zephirin" } duration 19.7 127.1 "--sync--" Ability { id: "89CF", source: "Ser Zephirin" } 133.1 "Spiral Thrust" Ability { id: "89E5", source: "(Ser Ignasse|Ser Paulecrain|Ser Vellguine)" } @@ -191,7 +191,7 @@ hideall "--sync--" 704.6 "Heavensward Leap 1" Ability { id: "89E9", source: "Ser Vellguine" } 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" sync / 14:[^:]*:Ser Zephirin:89D0:/ duration 24.7 +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)" } 732.6 "Absolute Conviction 1" Ability { id: "89E3", source: "Ser Guerrique" } 735.5 "Absolute Conviction 2" Ability { id: "89E4", source: "Ser Hermenost" } diff --git a/ui/raidboss/data/06-ew/trial/zurvan-un.txt b/ui/raidboss/data/06-ew/trial/zurvan-un.txt index 66bed125a2..37eab817d7 100644 --- a/ui/raidboss/data/06-ew/trial/zurvan-un.txt +++ b/ui/raidboss/data/06-ew/trial/zurvan-un.txt @@ -224,7 +224,7 @@ hideall "--sync--" # Enrage at 12 minutes -1989.7 "--sync--" sync / 14:[^:]*:Zurvan:8592:/ window 2000,100 +1989.7 "--sync--" StartsUsing { id: "8592", source: "Zurvan" } window 2000,100 1998.8 "Flame Halberd Enrage" Ability { id: "8592", source: "Zurvan" } 1998.8 "--untargetable--" 2000.0 "--sync--" Ability { id: "8591", source: "Zurvan" }