diff --git a/ui/raidboss/data/04-sb/alliance/orbonne_monastery.txt b/ui/raidboss/data/04-sb/alliance/orbonne_monastery.txt index 9e623b6b5b..ae4575f6ed 100644 --- a/ui/raidboss/data/04-sb/alliance/orbonne_monastery.txt +++ b/ui/raidboss/data/04-sb/alliance/orbonne_monastery.txt @@ -119,7 +119,7 @@ hideall "--sync--" 2196.6 "--sync--" Ability { id: "385D", source: "Agrias" } 2222.3 "Mortal Blow" Ability { id: "385E", source: "Sword Knight" } 2262.6 "Enrage" -2500.0 "--sync--" sync / 14:[^:]*:Agrias:3861:/ window 500,0 +2500.0 "--sync--" StartsUsing { id: "3861", source: "Agrias" } window 500,0 2508.0 "Heavenly Judgment" Ability { id: "3861", source: "Agrias" } window 10,10 ### Phase 3 Loop @@ -156,7 +156,7 @@ hideall "--sync--" # -p 377F:3500 -ii 3780 # Lifeless Alley will be sealed off 3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:B37:/ window 3000,0 -3491.0 "--sync--" sync / 14:[^:]*:Dark Crusader:377F:/ window 500,0 +3491.0 "--sync--" StartsUsing { id: "377F", source: "Dark Crusader" } window 500,0 3500.0 "Dark Rite" Ability { id: "377F", source: "Dark Crusader" } 3509.0 "Noahionto" Ability { id: "377E", source: "Dark Crusader" } 3520.0 "Infernal Wave" #Ability { id: "3781", source: "Dark Crusader" } @@ -301,7 +301,7 @@ hideall "--sync--" ################# ### Phase 1: March -6004.0 "--sync--" sync / 14:[^:]*:Ultima, the High Seraph:38C2:/ window 1000,0 +6004.0 "--sync--" StartsUsing { id: "38C2", source: "Ultima, the High Seraph" } window 1000,0 6007.0 "Demi-Virgo Line" Ability { id: "38C2", source: "Ultima, the High Seraph" } 6016.0 "East/West March" Ability { id: "38A[01]", source: "Ultima, the High Seraph" } 6018.0 "Ray of Light" Ability { id: "38B7", source: "Dominion" } diff --git a/ui/raidboss/data/04-sb/alliance/ridorana_lighthouse.txt b/ui/raidboss/data/04-sb/alliance/ridorana_lighthouse.txt index f0ba28bda9..7e959e6f19 100644 --- a/ui/raidboss/data/04-sb/alliance/ridorana_lighthouse.txt +++ b/ui/raidboss/data/04-sb/alliance/ridorana_lighthouse.txt @@ -150,7 +150,7 @@ hideall "--sync--" 2230 "Area Lockdown" # After adds -2244 "--sync--" sync / 14:[^:]*:Construct 7:2C59:/ window 5000,766 +2244 "--sync--" StartsUsing { id: "2C59", source: "Construct 7" } window 5000,766 2254 "Annihilation Mode" Ability { id: "2C59", source: "Construct 7" } window 5000,756 2264 "Destroy" Ability { id: "2C71", source: "Construct 7" } 2274 "Ignite" Ability { id: "2C67", source: "Construct 7" } @@ -258,7 +258,7 @@ hideall "--sync--" 3634 "Dust Storm" # 9.99% push -3694 "--sync--" sync / 14:[^:]*:Yiazmat:2C32:/ window 5000,306 +3694 "--sync--" StartsUsing { id: "2C32", source: "Yiazmat" } window 5000,306 3700 "Growing Threat" Ability { id: "2C32", source: "Yiazmat" } window 5000,300 3707 "Rake (combo)" duration 14 3727 "White Breath" Ability { id: "2C31", source: "Yiazmat" } 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 a8f4e37a48..88b2644f97 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 @@ -13,7 +13,7 @@ hideall "--start--" # Crumbling Bridge will be sealed off 0.0 "--start--" sync / 29:[^:]*:7DC:[^:]*:949:/ window 0,1 # TODO: does this only start when the adds are dead? -22.6 "--sync--" sync / 14:[^:]*:Mateus, The Corrupt:2633:/ window 30,10 +22.6 "--sync--" StartsUsing { id: "2633", source: "Mateus, The Corrupt" } window 30,10 # Ice phase 27.6 "Unbind" Ability { id: "2633", source: "Mateus, The Corrupt" } @@ -63,7 +63,7 @@ hideall "--start--" # Palace Square will be sealed off 1000.0 "--start--" sync / 29:[^:]*:7DC:[^:]*:94C:/ window 10000,0 -1011.0 "--sync--" sync / 14:[^:]*:Hashmal, Bringer of Order:25D8:/ window 20,20 +1011.0 "--sync--" StartsUsing { id: "25D8", source: "Hashmal, Bringer of Order" } window 20,20 1015.0 "Quake IV" Ability { id: "25D8", source: "Hashmal, Bringer of Order" } 1020.4 "Jagged Edge 1" #Ability { id: "25CD", source: "Hashmal, Bringer of Order" } 1022.5 "Jagged Edge 2" #Ability { id: "25CD", source: "Hashmal, Bringer of Order" } @@ -82,7 +82,7 @@ hideall "--start--" 1082.6 "Rock Cutter" Ability { id: "25D7", source: "Hashmal, Bringer of Order" } # This can push early. -1087.0 "--sync--" sync / 14:[^:]*:Hashmal, Bringer of Order:25BC:/ window 100,20 +1087.0 "--sync--" StartsUsing { id: "25BC", source: "Hashmal, Bringer of Order" } window 100,20 1090.0 "Command Tower" Ability { id: "25BC", source: "Hashmal, Bringer of Order" } 1101.3 "Earth Shaker" Ability { id: "25C8", source: "Command Tower" } 1106.2 "Earth Shaker" Ability { id: "25C8", source: "Command Tower" } @@ -98,7 +98,7 @@ hideall "--start--" 1149.8 "Falling Rock" Ability { id: "25D3", source: "Hashmal, Bringer of Order" } # ??? more earth shaker, more jagged edge (seen on video, but no logs) -1300.0 "--sync--" sync / 14:[^:]*:Hashmal, Bringer of Order:25C5:/ window 300,0 +1300.0 "--sync--" StartsUsing { id: "25C5", source: "Hashmal, Bringer of Order" } window 300,0 1305.0 "Landwaster" Ability { id: "25C5", source: "Hashmal, Bringer of Order" } 1314.4 "Control Tower x2" Ability { id: "25C1", source: "Hashmal, Bringer of Order" } @@ -138,12 +138,12 @@ hideall "--start--" 1447.8 "Submission Tower" Ability { id: "266D", source: "Hashmal, Bringer of Order" } 1451.0 "Sanction" Ability { id: "2703", source: "Hashmal, Bringer of Order" } 1454.1 "--Sand Sphere Adds--" -# 1459.1 "--sync--" sync / 14:[^:]*:Sand Sphere:25C9:/ # To Dust starts casting, probably the phase over when 20s cast complete +# 1459.1 "--sync--" StartsUsing { id: "25C9", source: "Sand Sphere" } # To Dust starts casting, probably the phase over when 20s cast complete 1460.9 "Towerfall" Ability { id: "25CA", source: "Submission Tower" } 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--" sync / 14:[^:]*:Hashmal, Bringer of Order:(25CE|25D0):/ window 40,40 +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" } @@ -175,7 +175,7 @@ hideall "--start--" # Lesalia Garden Ruins will be sealed off 2000.0 "--start--" sync / 29:[^:]*:7DC:[^:]*:94D:/ window 10000,0 -2012.8 "--sync--" sync / 14:[^:]*:Rofocale:2680:/ window 20,20 +2012.8 "--sync--" StartsUsing { id: "2680", source: "Rofocale" } window 20,20 2015.8 "Crush Helm" Ability { id: "2680", source: "Rofocale" } duration 3.4 2035.5 "Chariot" Ability { id: "2674", source: "Rofocale" } 2040.8 "Cry Of Victory" Ability { id: "2675", source: "Rofocale" } @@ -198,7 +198,7 @@ hideall "--start--" # TODO: could trigger instead off of Rofocale losing Sprint which happens ~here 2400.0 "--sync--" sync / 00:0044:[^:]*:The heavens tremble in my wake/ window 500,0 -2417.6 "--sync--" sync / 14:[^:]*:Rofocale:268A:/ window 500,10 +2417.6 "--sync--" StartsUsing { id: "268A", source: "Rofocale" } window 500,10 2421.1 "Heavenly Subjugation" 2433.5 "Embrace" Ability { id: "2685", source: "Rofocale" } 2450.8 "Chariot" Ability { id: "2674", source: "Rofocale" } @@ -216,7 +216,7 @@ hideall "--start--" # => variable time turning off the lights # Seen 2734 only once in the loop fflogs link below. -2700.0 "--sync--" sync / 14:[^:]*:Rofocale:(2734|2726):/ window 160,0 +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" } @@ -230,7 +230,7 @@ hideall "--start--" 2779.1 "Dark Geas" Ability { id: "2688", source: "Rofocale" } # => variable time turning off the lights -2900.0 "--sync--" sync / 14:[^:]*:Rofocale:(2734|2726):/ window 160,0 +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" } @@ -291,7 +291,7 @@ hideall "--start--" ## Phase 1 # Lesalia Temple Ruins will be sealed off 4000.0 "--start--" sync / 29:[^:]*:7DC:[^:]*:94E:/ window 10000,0 -4006.7 "--sync--" sync / 14:[^:]*:Argath Thadalfus:262D:/ window 20,20 +4006.7 "--sync--" StartsUsing { id: "262D", source: "Argath Thadalfus" } window 20,20 4009.7 "Crippling Blow" Ability { id: "262D", source: "Argath Thadalfus" } 4017.9 "Crush Weapon x3" Ability { id: "2628", source: "Argath Thadalfus" } 4023.9 "Soulfix" Ability { id: "262A", source: "Argath Thadalfus" } @@ -301,7 +301,7 @@ hideall "--start--" 4058.1 "Crippling Blow" Ability { id: "262D", source: "Argath Thadalfus" } # Note: adding a larger sync in case there's a push here just to be safe. -4064.3 "--sync--" sync / 14:[^:]*:Argath Thadalfus:2622:/ window 100,10 +4064.3 "--sync--" StartsUsing { id: "2622", source: "Argath Thadalfus" } window 100,10 4067.3 "Trepidation" Ability { id: "2622", source: "Argath Thadalfus" } 4075.8 "Unrelenting" Ability { id: "262B", source: "Argath Thadalfus" } 4077.3 "Rail Of The Rat 1" Ability { id: "2624", source: "Argath Thadalfus" } @@ -313,7 +313,7 @@ hideall "--start--" # Can early push (before Trepidation) to Judgment Blade. # TODO: is this an HP push? or is this a bug? I see this in <5% of logs atmost. -4099.0 "--sync--" sync / 14:[^:]*:Argath Thadalfus:2629:/ window 100,10 +4099.0 "--sync--" StartsUsing { id: "2629", source: "Argath Thadalfus" } window 100,10 4102.0 "Judgment Blade" Ability { id: "2629", source: "Argath Thadalfus" } 4108.3 "Crippling Blow" Ability { id: "262D", source: "Argath Thadalfus" } 4110.4 "--sync--" Ability { id: "2625", source: "Argath Thadalfus" } @@ -322,20 +322,20 @@ hideall "--start--" 4129.2 "Royal Blood" #Ability { id: "261E", source: "Argath Thadalfus" } ## Phase 2: Shades and Shards (percentage push to this, 72%?) -4500.0 "--sync--" sync / 14:[^:]*:Argath Thadalfus:261E:/ window 500,0 +4500.0 "--sync--" StartsUsing { id: "261E", source: "Argath Thadalfus" } window 500,0 4505.0 "Royal Blood" Ability { id: "261E", source: "Argath Thadalfus" } 4505.3 "--Shade Adds--" 4515.2 "Crippling Blow" Ability { id: "262D", source: "Argath Thadalfus" } 4525.4 "Unrelenting" Ability { id: "262B", source: "Argath Thadalfus" } # => variable amount of time until all shades are dead or explode -4600.0 "--sync--" sync / 14:[^:]*:Argath Thadalfus:261F:/ window 600,0 +4600.0 "--sync--" StartsUsing { id: "261F", source: "Argath Thadalfus" } window 600,0 4605.0 "Empty Soul" Ability { id: "261F", source: "Argath Thadalfus" } 4605.9 "--Shard Adds--" 4607.1 "--sync--" Ability { id: "270B", source: "Argath Thadalfus" } # => variable amount of time until all shards are dead or you wipe -4700.0 "--sync--" sync / 14:[^:]*:Argath Thadalfus:2620:/ window 700,0 +4700.0 "--sync--" StartsUsing { id: "2620", source: "Argath Thadalfus" } window 700,0 4702.5 "Dark Ultima" Ability { id: "2620", source: "Argath Thadalfus" } 4715.4 "Mask Of Lies" Ability { id: "2619", source: "Argath Thadalfus" } 4723.4 "The Word" Ability { id: "24A0", source: "Argath Thadalfus" } diff --git a/ui/raidboss/data/04-sb/dungeon/ala_mhigo.txt b/ui/raidboss/data/04-sb/dungeon/ala_mhigo.txt index dc92ba4855..cb46ad4a50 100644 --- a/ui/raidboss/data/04-sb/dungeon/ala_mhigo.txt +++ b/ui/raidboss/data/04-sb/dungeon/ala_mhigo.txt @@ -51,7 +51,7 @@ hideall "--sync--" 1099.8 "Order to Charge" #Ability { id: "2057", source: "Aulus mal Asina" } # Intermission at <= 60% HP -1500.0 "--sync--" sync / 14:[^:]*:Aulus Mal Asina:2050:/ window 500,1 +1500.0 "--sync--" StartsUsing { id: "2050", source: "Aulus Mal Asina" } window 500,1 1503.0 "Magitek Disruptor" Ability { id: "2050", source: "Aulus mal Asina" } 1508.0 "Mindjack" Ability { id: "204E", source: "Aulus mal Asina" } 1509.2 "--sync--" Ability { id: "2053", source: "Prototype Bit" } diff --git a/ui/raidboss/data/04-sb/dungeon/castrum_abania.txt b/ui/raidboss/data/04-sb/dungeon/castrum_abania.txt index 68e1b35081..90d4476f3a 100644 --- a/ui/raidboss/data/04-sb/dungeon/castrum_abania.txt +++ b/ui/raidboss/data/04-sb/dungeon/castrum_abania.txt @@ -41,7 +41,7 @@ hideall "--sync--" # Post Wild Speed loop -> back into Wild Speed loop 70.2 "--targetable--" -70.2 "--sync--" sync / 14:[^:]*:Magna Roader:1F16:/ window 40,10 +70.2 "--sync--" StartsUsing { id: "1F16", source: "Magna Roader" } window 40,10 73.2 "Magitek Fire III" Ability { id: "1F16", source: "Magna Roader" } 77.3 "Wheel" Ability { id: "1F14", source: "Magna Roader" } window 47,10 # can jump here instead after being hit with the cannons 84.8 "Magitek Fire II" Ability { id: "1F15", source: "Magna Roader" } @@ -78,9 +78,9 @@ hideall "--sync--" # Project Aegis will be sealed off 1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:791:/ window 10000,0 -1008.3 "--sync--" sync / 14:[^:]*:Subject Number XXIV:82A9:/ window 10,10 jump 1095.0 # fire phase first -1008.3 "--sync--" sync / 14:[^:]*:Subject Number XXIV:82A8:/ window 10,10 jump 1144.7 # ice phase first -1008.3 "--sync--" sync / 14:[^:]*:Subject Number XXIV:82AA:/ window 10,10 jump 1193.6 # thunder phase first +1008.3 "--sync--" StartsUsing { id: "82A9", source: "Subject Number XXIV" } window 10,10 jump 1095.0 # fire phase first +1008.3 "--sync--" StartsUsing { id: "82A8", source: "Subject Number XXIV" } window 10,10 jump 1144.7 # ice phase first +1008.3 "--sync--" StartsUsing { id: "82AA", source: "Subject Number XXIV" } window 10,10 jump 1193.6 # thunder phase first 1013.2 "Elemental Overload (Random)" # fire phase 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 10a1086b3e..3be759f75b 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 @@ -49,7 +49,7 @@ hideall "--sync--" 1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:93C:/ window 1000,5 1009.2 "Mystic Light" Ability { id: "2657", source: "The Old One" } 1015.0 "Mystic Flame" Ability { id: "2658", source: "The Old One" } -1018.1 "Order To Detonate (cast)" sync / 14:[^:]*:The Old One:265B:/ window 18.1,5 duration 19.7 +1018.1 "Order To Detonate (cast)" StartsUsing { id: "265B", source: "The Old One" } window 18.1,5 duration 19.7 1037.8 "Order To Detonate?" # Ability { id: "265B", source: "The Old One" } 1040.6 "Self-Detonate?" # Ability { id: "265C", source: "Subservient" } 1047.7 "Mystic Flame" Ability { id: "2658", source: "The Old One" } window 20,20 @@ -61,12 +61,12 @@ hideall "--sync--" 1128.7 "Mystic Flame" 1139.8 "Mystic Light" -1200.0 "--sync--" sync / 14:[^:]*:The Old One:265A:/ window 200,10 +1200.0 "--sync--" StartsUsing { id: "265A", source: "The Old One" } window 200,10 1202.7 "Shifting Light" Ability { id: "265A", source: "The Old One" } -1205.8 "Order To Detonate (cast)" sync / 14:[^:]*:The Old One:265B:/ duration 19.7 +1205.8 "Order To Detonate (cast)" StartsUsing { id: "265B", source: "The Old One" } duration 19.7 # 1225.5 "Order To Detonate?" Ability { id: "265B", source: "The Old One" } 1228.3 "Self-Detonate?" # Ability { id: "265C", source: "Subservient" } -1232.6 "--sync--" sync / 14:[^:]*:The Old One:2657:/ window 32.6,5 +1232.6 "--sync--" StartsUsing { id: "2657", source: "The Old One" } window 32.6,5 1236.3 "Mystic Light" Ability { id: "2657", source: "The Old One" } 1244.1 "Mystic Flame" Ability { id: "2658", source: "The Old One" } 1252.2 "Mystic Light" Ability { id: "2657", source: "The Old One" } @@ -77,12 +77,12 @@ hideall "--sync--" 1309.5 "Mystic Flame" 1317.6 "Mystic Light" -1400.0 "--sync--" sync / 14:[^:]*:The Old One:265A:/ window 190,5 +1400.0 "--sync--" StartsUsing { id: "265A", source: "The Old One" } window 190,5 1402.7 "Shifting Light" Ability { id: "265A", source: "The Old One" } -1405.8 "Order To Detonate (cast)" sync / 14:[^:]*:The Old One:265B:/ duration 19.7 +1405.8 "Order To Detonate (cast)" StartsUsing { id: "265B", source: "The Old One" } duration 19.7 # 1425.5 "Order To Detonate?" Ability { id: "265B", source: "The Old One" } 1428.3 "Self-Detonate?" # Ability { id: "265C", source: "Subservient" } -1432.6 "--sync--" sync / 14:[^:]*:The Old One:2657:/ window 32.6,5 +1432.6 "--sync--" StartsUsing { id: "2657", source: "The Old One" } window 32.6,5 1436.3 "Mystic Light" Ability { id: "2657", source: "The Old One" } 1444.1 "Mystic Flame" Ability { id: "2658", source: "The Old One" } 1452.2 "Mystic Light" Ability { id: "2657", source: "The Old One" } diff --git a/ui/raidboss/data/04-sb/dungeon/fractal_continuum_hard.txt b/ui/raidboss/data/04-sb/dungeon/fractal_continuum_hard.txt index f3dd853f94..4724c251f9 100644 --- a/ui/raidboss/data/04-sb/dungeon/fractal_continuum_hard.txt +++ b/ui/raidboss/data/04-sb/dungeon/fractal_continuum_hard.txt @@ -171,5 +171,5 @@ hideall "--sync--" 2226.3 "Aether Bend/Death Spin" -3000.0 "--sync--" sync / 14:[^:]*:The Ultima Beast:27B3:/ window 1000,5 +3000.0 "--sync--" StartsUsing { id: "27B3", source: "The Ultima Beast" } window 1000,5 3039.7 "Demi Ultima (Enrage)" Ability { id: "27B3", source: "The Ultima Beast" } diff --git a/ui/raidboss/data/04-sb/dungeon/ghimlyt_dark.txt b/ui/raidboss/data/04-sb/dungeon/ghimlyt_dark.txt index f8d0b6c78a..73fa69dfb7 100644 --- a/ui/raidboss/data/04-sb/dungeon/ghimlyt_dark.txt +++ b/ui/raidboss/data/04-sb/dungeon/ghimlyt_dark.txt @@ -217,10 +217,10 @@ hideall "--sync--" # Enrage after two intermissions. -# 2597.3 "--sync--" sync / 14:[^:]*:Julia Quo Soranus:372F:/ window 597.3 -2597.3 "Artificial Boost" sync / 14:[^:]*:Annia Quo Soranus:3730:/ window 597.3 +# 2597.3 "--sync--" StartsUsing { id: "372F", source: "Julia Quo Soranus" } window 597.3 +2597.3 "Artificial Boost" StartsUsing { id: "3730", source: "Annia Quo Soranus" } window 597.3 # 2600.0 "--sync--" Ability { id: "372F", source: "Julia Quo Soranus" } window 600,5 2600.0 "Artificial Boost" Ability { id: "3730", source: "Annia Quo Soranus" } window 600,5 -# 2603.2 "--sync--" sync / 14:[^:]*:Julia Quo Soranus:3731:/ -2603.2 "Imperial Authority" sync / 14:[^:]*:Annia Quo Soranus:3732:/ duration 39.7 +# 2603.2 "--sync--" StartsUsing { id: "3731", source: "Julia Quo Soranus" } +2603.2 "Imperial Authority" StartsUsing { id: "3732", source: "Annia Quo Soranus" } duration 39.7 2642.9 "Imperial Authority Enrage" Ability { id: "3732", source: "Annia Quo Soranus" } diff --git a/ui/raidboss/data/04-sb/dungeon/ghimlyt_dark64.txt b/ui/raidboss/data/04-sb/dungeon/ghimlyt_dark64.txt index 644a0429e3..3b9bfb8318 100644 --- a/ui/raidboss/data/04-sb/dungeon/ghimlyt_dark64.txt +++ b/ui/raidboss/data/04-sb/dungeon/ghimlyt_dark64.txt @@ -217,10 +217,10 @@ hideall "--sync--" # Enrage after two intermissions. -# 2597.3 "--sync--" sync / 14:[^:]*:Julia Quo Soranus:372F:/ window 597.3 -2597.3 "Artificial Boost" sync / 14:[^:]*:Annia Quo Soranus:3730:/ window 597.3 +# 2597.3 "--sync--" StartsUsing { id: "372F", source: "Julia Quo Soranus" } window 597.3 +2597.3 "Artificial Boost" StartsUsing { id: "3730", source: "Annia Quo Soranus" } window 597.3 # 2600.0 "--sync--" Ability { id: "372F", source: "Julia Quo Soranus" } window 600,5 2600.0 "Artificial Boost" Ability { id: "3730", source: "Annia Quo Soranus" } window 600,5 -# 2603.2 "--sync--" sync / 14:[^:]*:Julia Quo Soranus:3731:/ -2603.2 "Imperial Authority" sync / 14:[^:]*:Annia Quo Soranus:3732:/ duration 39.7 +# 2603.2 "--sync--" StartsUsing { id: "3731", source: "Julia Quo Soranus" } +2603.2 "Imperial Authority" StartsUsing { id: "3732", source: "Annia Quo Soranus" } duration 39.7 2642.9 "Imperial Authority Enrage" Ability { id: "3732", source: "Annia Quo Soranus" } diff --git a/ui/raidboss/data/04-sb/dungeon/shisui_of_the_violet_tides.txt b/ui/raidboss/data/04-sb/dungeon/shisui_of_the_violet_tides.txt index c2aeb6a084..51b3d32ccb 100644 --- a/ui/raidboss/data/04-sb/dungeon/shisui_of_the_violet_tides.txt +++ b/ui/raidboss/data/04-sb/dungeon/shisui_of_the_violet_tides.txt @@ -53,7 +53,7 @@ hideall "--sync--" 1041.9 "Tornadogenesis" #Ability { id: "1F7F", source: "Ruby Princess" } # Phase 2: 90% -> 75%, one seduce, more mini busters -1100.0 "--sync--" sync / 14:[^:]*:Ruby Princess:1F7A:/ window 100,0 +1100.0 "--sync--" StartsUsing { id: "1F7A", source: "Ruby Princess" } window 100,0 1107.0 "Seduce" Ability { id: "1F7A", source: "Ruby Princess" } 1115.1 "Coriolis Kick" Ability { id: "1F7B", source: "Ruby Princess" } 1121.3 "Tornadogenesis" Ability { id: "1F7F", source: "Ruby Princess" } window 20,20 @@ -64,7 +64,7 @@ hideall "--sync--" 1146.8 "Tornadogenesis" #Ability { id: "1F7F", source: "Ruby Princess" } # Phase 3: 75% -> 60%, introduction to chasing AOE -1200.0 "--sync--" sync / 14:[^:]*:Ruby Princess:1F7C:/ window 200,0 +1200.0 "--sync--" StartsUsing { id: "1F7C", source: "Ruby Princess" } window 200,0 1203.0 "Abyssal Volcano" Ability { id: "1F7C", source: "Ruby Princess" } 1203.8 "Geothermal Flatulence x11" Ability { id: "24D7", source: "Ruby Princess" } duration 8.1 1217.2 "Coriolis Kick" Ability { id: "1F7B", source: "Ruby Princess" } @@ -78,7 +78,7 @@ hideall "--sync--" 1274.2 "Tornadogenesis" #Ability { id: "1F7F", source: "Ruby Princess" } # Phase 4: 60% -> 0%, seduce loop -1400.0 "--sync--" sync / 14:[^:]*:Ruby Princess:1F7A:/ window 290,0 +1400.0 "--sync--" StartsUsing { id: "1F7A", source: "Ruby Princess" } window 290,0 1407.0 "Seduce" Ability { id: "1F7A", source: "Ruby Princess" } 1415.1 "Coriolis Kick" Ability { id: "1F7B", source: "Ruby Princess" } 1423.3 "Tornadogenesis" Ability { id: "1F7F", source: "Ruby Princess" } @@ -130,7 +130,7 @@ hideall "--sync--" 2048.2 "Foul Nail" #Ability { id: "1F87", source: "Shisui Yohi" } # Phase 2: 90% -> 75%, one (1) thick fog -2100.0 "--sync--" sync / 14:[^:]*:Shisui Yohi:1F80:/ window 100,0 +2100.0 "--sync--" StartsUsing { id: "1F80", source: "Shisui Yohi" } window 100,0 2105.0 "Thick Fog" Ability { id: "1F80", source: "Shisui Yohi" } 2108.1 "--untargetable--" 2128.3 "Black Tide" Ability { id: "1F81", source: "Shisui Yohi" } window 30,30 @@ -162,7 +162,7 @@ hideall "--sync--" 2350.2 "Foul Nail" #Ability { id: "1F87", source: "Shisui Yohi" } # Phase 4: 60% -> 0%, thick fog and adds loop -2400.0 "--sync--" sync / 14:[^:]*:Shisui Yohi:1F80:/ window 100,0 +2400.0 "--sync--" StartsUsing { id: "1F80", source: "Shisui Yohi" } window 100,0 2405.0 "Thick Fog" Ability { id: "1F80", source: "Shisui Yohi" } 2408.1 "--untargetable--" 2428.3 "Black Tide" Ability { id: "1F81", source: "Shisui Yohi" } diff --git a/ui/raidboss/data/04-sb/dungeon/sirensong_sea.txt b/ui/raidboss/data/04-sb/dungeon/sirensong_sea.txt index c37ec4537a..25669cce7d 100644 --- a/ui/raidboss/data/04-sb/dungeon/sirensong_sea.txt +++ b/ui/raidboss/data/04-sb/dungeon/sirensong_sea.txt @@ -44,10 +44,10 @@ hideall "--sync--" 1042.8 "Enter Night" Ability { id: "1F60", source: "The Governor" } window 10,10 # Enter Night can take 12-17 seconds. There is added delay when the mechanic # is failed due to Shadowstrike (1F5D) attacks. -1055.9 "--sync--" sync / 14:[^:]*:The Governor:1F5C:/ window 10,10 +1055.9 "--sync--" StartsUsing { id: "1F5C", source: "The Governor" } window 10,10 1059.9 "Bloodburst" Ability { id: "1F5C", source: "The Governor" } # There is potential delay before Shadow Split due to the boss moving to the middle. -1065.0 "--sync--" sync / 14:[^:]*:The Governor:1F61:/ window 10,10 +1065.0 "--sync--" StartsUsing { id: "1F61", source: "The Governor" } window 10,10 1068.0 "Shadow Split" Ability { id: "1F61", source: "The Governor" } 1076.2 "Shadowflow" Ability { id: "1F5E", source: "The Governor" } 1076.7 "--sync--" Ability { id: "1F5F", source: "The Governor" } @@ -55,9 +55,9 @@ hideall "--sync--" 1093.4 "Bloodburst" Ability { id: "1F5C", source: "The Governor" } 1102.6 "Enter Night" Ability { id: "1F60", source: "The Governor" } window 30,30 jump 1042.8 -1115.7 "--sync--" #sync / 14:[^:]*:The Governor:1F5C:/ window 10,10 +1115.7 "--sync--" #StartsUsing { id: "1F5C", source: "The Governor" } window 10,10 1119.7 "Bloodburst" #Ability { id: "1F5C", source: "The Governor" } -1124.8 "--sync--" #sync / 14:[^:]*:The Governor:1F61:/ window 10,10 +1124.8 "--sync--" #StartsUsing { id: "1F61", source: "The Governor" } window 10,10 1127.8 "Shadow Split" #Ability { id: "1F61", source: "The Governor" } 1136.0 "Shadowflow" #Ability { id: "1F5E", source: "The Governor" } 1136.5 "--sync--" #Ability { id: "1F5F", source: "The Governor" } diff --git a/ui/raidboss/data/04-sb/dungeon/swallows_compass.txt b/ui/raidboss/data/04-sb/dungeon/swallows_compass.txt index 8f9a2a6956..52f3c97d09 100644 --- a/ui/raidboss/data/04-sb/dungeon/swallows_compass.txt +++ b/ui/raidboss/data/04-sb/dungeon/swallows_compass.txt @@ -137,7 +137,7 @@ hideall "--sync--" # This is a safe sync. The usage immediately after the intermission is 2BB2 from Dasheng. # -2590.3 "--sync--" sync / 14:[^:]*:Shadow Of The Sage:2BB3:/ window 2590.3,10 +2590.3 "--sync--" StartsUsing { id: "2BB3", source: "Shadow Of The Sage" } window 2590.3,10 2600.0 "Splitting Hairs" Ability { id: "2BB3", source: "Shadow Of The Sage" } window 2600,5 2608.0 "Equal Of Heaven" Ability { id: "2BB4", source: "Qitian Dasheng" } 2610.0 "Five-Fingered Punishment?" Ability { id: "2BB0", source: "Shadow Of The Sage" } jump 2451.1 diff --git a/ui/raidboss/data/04-sb/eureka/eureka_hydatos.txt b/ui/raidboss/data/04-sb/eureka/eureka_hydatos.txt index ef6540502e..117e25785e 100644 --- a/ui/raidboss/data/04-sb/eureka/eureka_hydatos.txt +++ b/ui/raidboss/data/04-sb/eureka/eureka_hydatos.txt @@ -117,11 +117,11 @@ hideall "--sync--" 3013.0 "Spirits of the Fallen" Ability { id: "387A", source: "Raiden" } # drift -0.041 3023.0 "Shingan" Ability { id: "387B", source: "Raiden" } # drift 0.05 3034.1 "Thundercall" Ability { id: "387F", source: "Raiden" } -3044.2 "--sync--" sync / 14:[^:]*:Raiden:3868:/ window 10,10 +3044.2 "--sync--" StartsUsing { id: "3868", source: "Raiden" } window 10,10 3048.7 "Ame-no-Sakahoko" Ability { id: "3868", source: "Raiden" } 3051.7 "--sync--" Ability { id: "3869", source: "Raiden" } 3058.3 "Whirling Zantetsuken" Ability { id: "386A", source: "Raiden" } -3065.4 "--sync--" sync / 14:[^:]*:Raiden:3868:/ window 10,10 +3065.4 "--sync--" StartsUsing { id: "3868", source: "Raiden" } window 10,10 3069.9 "Ame-no-Sakahoko" Ability { id: "3868", source: "Raiden" } 3072.9 "--sync--" Ability { id: "3869", source: "Raiden" } 3079.5 "Whirling Zantetsuken" Ability { id: "386A", source: "Raiden" } @@ -134,7 +134,7 @@ hideall "--sync--" 3109.8 "Spirits of the Fallen" Ability { id: "387A", source: "Raiden" } 3118.9 "Lancing Bolt" Ability { id: "3876", source: "Raiden" } 3124.4 "Streak Lightning" #Ability { id: "3877", source: "Streak Lightning" } -3134.9 "Ultimate Zantetsuken" sync / 14:[^:]*:Raiden:3878:/ duration 20 +3134.9 "Ultimate Zantetsuken" StartsUsing { id: "3878", source: "Raiden" } duration 20 3154.9 "--sync--" sync / 17:[^:]*:Raiden:3878:/ window 40,0 3164.9 "Spirits of the Fallen" Ability { id: "387A", source: "Raiden" } window 40,5 @@ -156,7 +156,7 @@ hideall "--sync--" 3308.5 "--sync--" Ability { id: "386D", source: "Ball Lightning" } window 100,10 3310.7 "Streak Lightning" Ability { id: "3877", source: "Streak Lightning" } # drift 0.043 3316.0 "Lateral Zantetsuken" Ability { id: "386[BC]", source: "Raiden" } -3321.7 "Ultimate Zantetsuken" sync / 14:[^:]*:Raiden:3878:/ duration 20 +3321.7 "Ultimate Zantetsuken" StartsUsing { id: "3878", source: "Raiden" } duration 20 3341.7 "--sync--" sync / 17:[^:]*:Raiden:3878:/ window 40,0 3347.7 "Spirits of the Fallen" Ability { id: "387A", source: "Raiden" } window 40,5 @@ -415,5 +415,5 @@ hideall "--sync--" ### Star Form Enrage -6200.0 "--sync--" sync / 14:[^:]*:Proto Ozma:396D:/ window 300,0 +6200.0 "--sync--" StartsUsing { id: "396D", source: "Proto Ozma" } window 300,0 6210.0 "Shooting Star Enrage" Ability { id: "396D", source: "Proto Ozma" } diff --git a/ui/raidboss/data/04-sb/raid/o10s.txt b/ui/raidboss/data/04-sb/raid/o10s.txt index bdd156e773..965d2ff88a 100644 --- a/ui/raidboss/data/04-sb/raid/o10s.txt +++ b/ui/raidboss/data/04-sb/raid/o10s.txt @@ -197,7 +197,7 @@ hideall "--sync--" 615.8 "Time Immemorial" # Enrage -700.0 "--sync--" sync / 14:[^:]*:Midgardsormr:3247:/ window 700,3000 +700.0 "--sync--" StartsUsing { id: "3247", source: "Midgardsormr" } window 700,3000 704.9 "Enrage Hit 1" 707.2 "Enrage Hit 2" 708.5 "Enrage Hit 3" diff --git a/ui/raidboss/data/04-sb/raid/o11n.txt b/ui/raidboss/data/04-sb/raid/o11n.txt index a4e159badd..9c9e850a7f 100644 --- a/ui/raidboss/data/04-sb/raid/o11n.txt +++ b/ui/raidboss/data/04-sb/raid/o11n.txt @@ -49,12 +49,12 @@ hideall "--sync--" 570.6 "Executable 2" Ability { id: "35A8", source: "Level Checker" } 574.6 "Reset" Ability { id: "35AA", source: "Level Checker" } 578.6 "Reformat" Ability { id: "35A9", source: "Level Checker" } -587.6 "--sync--" sync / 14:[^:]*:Level Checker:327A:/ +587.6 "--sync--" StartsUsing { id: "327A", source: "Level Checker" } 611.6 "Force Quit" Ability { id: "327A", source: "Level Checker" } ## Delta Attack 1000.0 "--sync--" sync / 00:0044:Omega:Program failure detected/ window 1500,100 -1007.0 "--sync--" sync / 14:[^:]*:Omega:327B:/ window 1500,100 +1007.0 "--sync--" StartsUsing { id: "327B", source: "Omega" } window 1500,100 1037.0 "Delta Attack" Ability { id: "327B", source: "Omega" } window 1500,100 1048.4 "--targetable--" diff --git a/ui/raidboss/data/04-sb/raid/o11s.txt b/ui/raidboss/data/04-sb/raid/o11s.txt index 65677e2cb3..96ffd5154a 100644 --- a/ui/raidboss/data/04-sb/raid/o11s.txt +++ b/ui/raidboss/data/04-sb/raid/o11s.txt @@ -9,7 +9,7 @@ hideall "--sync--" # Phase 1 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1 -8.0 "--sync--" sync / 14:[^:]*:Omega:326C:/ window 8,8 +8.0 "--sync--" StartsUsing { id: "326C", source: "Omega" } window 8,8 12.0 "Atomic Ray" Ability { id: "326C", source: "Omega" } 24.0 "Mustard Bomb" Ability { id: "326D", source: "Omega" } 30.0 "Flamethrower" Ability { id: "325C", source: "Omega" } @@ -17,12 +17,12 @@ hideall "--sync--" 39.5 "Starboard/Larboard Cannon" Ability { id: "326[24]", source: "Omega" } 45.0 "Starboard/Larboard Cannon" Ability { id: "326[35]", source: "Omega" } # Note: this looks like it can push early. -53.5 "--sync--" sync / 14:[^:]*:Omega:324A:/ window 60,10 +53.5 "--sync--" StartsUsing { id: "324A", source: "Omega" } window 60,10 56.5 "Peripheral Synthesis" Ability { id: "324A", source: "Omega" } 72.5 "Mustard Bomb" Ability { id: "326D", source: "Omega" } ### Phase 2: Tower Dance -87.5 "--sync--" sync / 14:[^:]*:Omega:3251:/ window 90,10 +87.5 "--sync--" StartsUsing { id: "3251", source: "Omega" } window 90,10 91.5 "--untargetable--" 91.5 "Program Loop" Ability { id: "3251", source: "Omega" } 101.6 "--targetable--" @@ -44,7 +44,7 @@ hideall "--sync--" 185.9 "Force Quit Enrage" ### Phase 3 -300.0 "--sync--" sync / 14:[^:]*:Omega:325B:/ window 200,200 +300.0 "--sync--" StartsUsing { id: "325B", source: "Omega" } window 200,200 310.0 "Delta Attack" Ability { id: "325B", source: "Omega" } 321.4 "--targetable--" 330.1 "Ballistic Missile" Ability { id: "325F", source: "Omega" } @@ -57,7 +57,7 @@ hideall "--sync--" 368.9 "Blaster" Ability { id: "3261", source: "Omega" } 377.0 "Atomic Ray" Ability { id: "326C", source: "Omega" } -387.0 "--sync--" sync / 14:[^:]*:Omega:324A:/ window 90,10 +387.0 "--sync--" StartsUsing { id: "324A", source: "Omega" } window 90,10 390.0 "Peripheral Synthesis" Ability { id: "324A", source: "Omega" } 403.0 "Rush" Ability { id: "3250", source: "Rocket Punch" } 410.0 "Electric Slide" Ability { id: "326B", source: "Omega" } diff --git a/ui/raidboss/data/04-sb/raid/o2s.txt b/ui/raidboss/data/04-sb/raid/o2s.txt index 966e67af35..ba151a564b 100644 --- a/ui/raidboss/data/04-sb/raid/o2s.txt +++ b/ui/raidboss/data/04-sb/raid/o2s.txt @@ -133,5 +133,5 @@ hideall "--Reset--" 623.5 "Tremblor" #Ability { id: "2373", source: "Catastrophe" } 632.0 "Earthquake" Ability { id: "2374", source: "Catastrophe" } -633.3 "--sync--" sync / 14:[^:]*:Catastrophe:25A2:/ +633.3 "--sync--" StartsUsing { id: "25A2", source: "Catastrophe" } 643.3 "Gravitational Wave Enrage" Ability { id: "25A2", source: "Catastrophe" } diff --git a/ui/raidboss/data/04-sb/raid/o4n.txt b/ui/raidboss/data/04-sb/raid/o4n.txt index db656bc959..822db34535 100644 --- a/ui/raidboss/data/04-sb/raid/o4n.txt +++ b/ui/raidboss/data/04-sb/raid/o4n.txt @@ -103,5 +103,5 @@ hideall "--sync--" # Enrage. Exdeath is untargetable at this point. # "Nothingness is my weapon, and nothingness alone can strike me down!" -1000.0 "--sync--" sync / 14:[^:]*:Exdeath:24C7:/ window 1000,0 +1000.0 "--sync--" StartsUsing { id: "24C7", source: "Exdeath" } window 1000,0 1005.0 "Meteor Enrage" Ability { id: "24C7", source: "Exdeath" } diff --git a/ui/raidboss/data/04-sb/raid/o4s.txt b/ui/raidboss/data/04-sb/raid/o4s.txt index 08d3875c49..94a86660a0 100644 --- a/ui/raidboss/data/04-sb/raid/o4s.txt +++ b/ui/raidboss/data/04-sb/raid/o4s.txt @@ -80,7 +80,7 @@ hideall "--sync--" # -p 242C:1116 242D:1339.5 2426:1652.1 # Neo Exdeath -1002.0 "--sync--" sync / 14:[^:]*:Neo Exdeath:2417:/ window 1002,5 +1002.0 "--sync--" StartsUsing { id: "2417", source: "Neo Exdeath" } window 1002,5 1007.7 "Almagest" Ability { id: "2417", source: "Neo Exdeath" } window 1008,5 1016.7 "Aero III" Ability { id: "2419", source: "Neo Exdeath" } 1026.7 "Delta Attack" Ability { id: "241E", source: "Neo Exdeath" } diff --git a/ui/raidboss/data/04-sb/raid/o5n.txt b/ui/raidboss/data/04-sb/raid/o5n.txt index 62690f15a0..0d9e8c8818 100644 --- a/ui/raidboss/data/04-sb/raid/o5n.txt +++ b/ui/raidboss/data/04-sb/raid/o5n.txt @@ -12,7 +12,7 @@ hideall "--sync--" 0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1 -8 "--sync--" sync / 14:[^:]*:Wroth Ghost:28AE:/ window 8,3 +8 "--sync--" StartsUsing { id: "28AE", source: "Wroth Ghost" } window 8,3 13 "Encumber" Ability { id: "28AE", source: "Wroth Ghost" } 27 "Head On" Ability { id: "28AF", source: "Phantom Train" } 38 "Ghost Beams" Ability { id: "28AA", source: "Phantom Train" } diff --git a/ui/raidboss/data/04-sb/raid/o5s.txt b/ui/raidboss/data/04-sb/raid/o5s.txt index 01396dca49..17b604c302 100644 --- a/ui/raidboss/data/04-sb/raid/o5s.txt +++ b/ui/raidboss/data/04-sb/raid/o5s.txt @@ -95,5 +95,5 @@ hideall "--sync--" 828 "Tether Whistle" Ability { id: "28A5", source: "Phantom Train" } # 10:00 enrage, final phase length depends on add phase time -821 "--sync--" sync / 14:[^:]*:Phantom Train:2A87:/ window 821,500 +821 "--sync--" StartsUsing { id: "2A87", source: "Phantom Train" } window 821,500 831 "Saintly Beam" Ability { id: "2A87", source: "Phantom Train" } diff --git a/ui/raidboss/data/04-sb/raid/o6s.txt b/ui/raidboss/data/04-sb/raid/o6s.txt index 13abde12e0..6c53ba3e1f 100644 --- a/ui/raidboss/data/04-sb/raid/o6s.txt +++ b/ui/raidboss/data/04-sb/raid/o6s.txt @@ -99,5 +99,5 @@ hideall "--sync--" 622 "Demonic Howl" Ability { id: "282B", source: "Demon Chadarnook" } 626 "Featherlance" Ability { id: "283E", source: "Easterly" } -626 "--sync--" sync / 14:[^:]*:Demon Chadarnook:284D:/ +626 "--sync--" StartsUsing { id: "284D", source: "Demon Chadarnook" } 641 "Enrage" diff --git a/ui/raidboss/data/04-sb/raid/o7s.txt b/ui/raidboss/data/04-sb/raid/o7s.txt index b9efd415d1..a0b530a45c 100644 --- a/ui/raidboss/data/04-sb/raid/o7s.txt +++ b/ui/raidboss/data/04-sb/raid/o7s.txt @@ -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--" sync / 14:[^:]*:Guardian:(275C|2773):/ 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" @@ -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--" sync / 14:[^:]*:Guardian:(275C|2773):/ 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" @@ -182,7 +182,7 @@ hideall "--sync--" 693 "Plane Laser" duration 2 699 "Diffractive Plasma" Ability { id: "278B", source: "Guardian" } -700 "--sync--" sync / 14:[^:]*:Guardian:2791:/ window 100,100 +700 "--sync--" StartsUsing { id: "2791", source: "Guardian" } window 100,100 715 "Enrage" Ability { id: "2791", source: "Guardian" } jump 0 ###################################### @@ -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--" sync / 14:[^:]*:Guardian:(275C|2773):/ 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" @@ -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--" sync / 14:[^:]*:Guardian:(275C|2773):/ 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" @@ -375,5 +375,5 @@ hideall "--sync--" 1706 "Diffractive Plasma" Ability { id: "278B", source: "Guardian" } # Enrage -1711 "--sync--" sync / 14:[^:]*:Guardian:2791:/ window 100,100 +1711 "--sync--" StartsUsing { id: "2791", source: "Guardian" } window 100,100 1726 "Enrage" Ability { id: "2791", source: "Guardian" } jump 0 diff --git a/ui/raidboss/data/04-sb/raid/o8s.txt b/ui/raidboss/data/04-sb/raid/o8s.txt index 06d3cace6b..5e69762ec3 100644 --- a/ui/raidboss/data/04-sb/raid/o8s.txt +++ b/ui/raidboss/data/04-sb/raid/o8s.txt @@ -17,7 +17,7 @@ hideall "--sync--" # First Graven 71 "Graven Image" Ability { id: "28D7", source: "Kefka" } -73 "--untargetable--" sync / 14:[^:]*:Kefka:2B34:/ +73 "--untargetable--" StartsUsing { id: "2B34", source: "Kefka" } 75 "Inexorable Will" Ability { id: "28DA", source: "Graven Image" } 76 "Wave Cannon" Ability { id: "28DC", source: "Graven Image" } 79 "Inexorable Will" Ability { id: "28DA", source: "Graven Image" } @@ -42,7 +42,7 @@ hideall "--sync--" # Third Graven 178 "Graven Image" Ability { id: "28D7", source: "Kefka" } -181 "--untargetable--" sync / 14:[^:]*:Kefka:2B34:/ +181 "--untargetable--" StartsUsing { id: "2B34", source: "Kefka" } 183 "Gravitas" Ability { id: "28E0", source: "Graven Image" } 186 "Vitrophyre" Ability { id: "28E2", source: "Graven Image" } 190 "Half Arena" Ability { id: "28D(E|F)", source: "Graven Image" } @@ -66,7 +66,7 @@ hideall "--sync--" # Fifth Graven 288 "Graven Image" Ability { id: "28D7", source: "Kefka" } # drift 0.259 -290 "--untargetable--" sync / 14:[^:]*:Kefka:2B34:/ +290 "--untargetable--" StartsUsing { id: "2B34", source: "Kefka" } 293 "Inexorable Will" Ability { id: "28DA", source: "Graven Image" } 293 "Statue Gaze" #Ability { id: "28E(3|4)", source: "Graven Image" } 308 "Statue Gaze" Ability { id: "28E(3|4)", source: "Graven Image" } # drift -0.387 @@ -98,7 +98,7 @@ hideall "--sync--" 1000 "Start" 1001 "--sync--" Ability { id: "28EC", source: "Kefka" } window 1001,0 -1006 "--sync--" sync / 14:[^:]*:Kefka:28FA:/ window 10,0 +1006 "--sync--" StartsUsing { id: "28FA", source: "Kefka" } window 10,0 1010 "Heartless Angel" Ability { id: "28FA", source: "Kefka" } 1016 "Ultima" Ability { id: "2911", source: "Kefka" } 1023 "Hyperdrive" Ability { id: "2912", source: "Kefka" } @@ -108,7 +108,7 @@ hideall "--sync--" 1041 "Ultima" Ability { id: "2911", source: "Kefka" } # Forsaken 1 -1048 "--sync--" sync / 14:[^:]*:Kefka:28E9:/ window 120,60 +1048 "--sync--" StartsUsing { id: "28E9", source: "Kefka" } window 120,60 1053 "Forsaken #1" Ability { id: "28E9", source: "Kefka" } 1064 "Heartless Archangel" Ability { id: "28FB", source: "Kefka" } 1067 "Soak" Ability { id: "28EA", source: "Light Of Consecration" } @@ -129,7 +129,7 @@ hideall "--sync--" 1189 "Ultima" Ability { id: "2911", source: "Kefka" } # Forsaken 2 -1201 "--sync--" sync / 14:[^:]*:Kefka:28E9:/ window 120,60 +1201 "--sync--" StartsUsing { id: "28E9", source: "Kefka" } window 120,60 1206 "Forsaken #2" Ability { id: "28E9", source: "Kefka" } 1214 "Starstrafe" Ability { id: "2902", source: "Kefka" } 1221 "Past/Future End" Ability { id: "28F(5|8)", source: "Kefka" } @@ -151,7 +151,7 @@ hideall "--sync--" 1328 "Ultima" Ability { id: "2911", source: "Kefka" } # Forsaken 3 -1340 "--sync--" sync / 14:[^:]*:Kefka:28E9:/ window 120,60 +1340 "--sync--" StartsUsing { id: "28E9", source: "Kefka" } window 120,60 1345 "Forsaken #3" Ability { id: "28E9", source: "Kefka" } 1358 "Ultima" Ability { id: "2911", source: "Kefka" } 1359 "Knockback Tethers" Ability { id: "28DD", source: "Graven Image" } @@ -180,7 +180,7 @@ hideall "--sync--" 1512 "Ultima" Ability { id: "2911", source: "Kefka" } # Forsaken 4 (repeats #3) -1525 "--sync--" sync / 14:[^:]*:Kefka:28E9:/ window 120,60 +1525 "--sync--" StartsUsing { id: "28E9", source: "Kefka" } window 120,60 1530 "Forsaken #4" Ability { id: "28E9", source: "Kefka" } 1543 "Ultima" Ability { id: "2911", source: "Kefka" } 1544 "Knockback Tethers" Ability { id: "28DD", source: "Graven Image" } @@ -201,5 +201,5 @@ hideall "--sync--" 1610 "Ultima" Ability { id: "283D", source: "Kefka" } 1618 "Ultima" Ability { id: "283D", source: "Kefka" } 1626 "Ultima" Ability { id: "283D", source: "Kefka" } -1630 "--sync--" sync / 14:[^:]*:Kefka:2A52:/ +1630 "--sync--" StartsUsing { id: "2A52", source: "Kefka" } 1640 "Enrage" Ability { id: "2A52", source: "Kefka" } jump 0 diff --git a/ui/raidboss/data/04-sb/raid/o9s.txt b/ui/raidboss/data/04-sb/raid/o9s.txt index 29aefcb7f5..b6b1f5206c 100644 --- a/ui/raidboss/data/04-sb/raid/o9s.txt +++ b/ui/raidboss/data/04-sb/raid/o9s.txt @@ -8,8 +8,8 @@ hideall "--sync--" 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1 ## Branch between Fire/Water paths -10.7 "--sync--" sync / 14:[^:]*:Chaos:317(2|3):/ window 12,12 jump 2010.1 # Long/lat means water path -10.7 "--sync--" sync / 14:[^:]*:Chaos:3171:/ window 12,12 jump 1010.7 # Edict means fire path +10.7 "--sync--" StartsUsing { id: "317(2|3)", source: "Chaos" } window 12,12 jump 2010.1 # Long/lat means water path +10.7 "--sync--" StartsUsing { id: "3171", source: "Chaos" } window 12,12 jump 1010.7 # Edict means fire path # Fake water path 15.7 "Long/Lat Implosion?" diff --git a/ui/raidboss/data/04-sb/trial/lakshmi-ex.txt b/ui/raidboss/data/04-sb/trial/lakshmi-ex.txt index 70690f3915..ca12a1e0ff 100644 --- a/ui/raidboss/data/04-sb/trial/lakshmi-ex.txt +++ b/ui/raidboss/data/04-sb/trial/lakshmi-ex.txt @@ -59,7 +59,7 @@ hideall "Alluring Arm" 2041.5 "--targetable--" ### Chanchala #2 -2041.7 "--sync--" sync / 14:[^:]*:Lakshmi:2148:/ window 50,10 +2041.7 "--sync--" StartsUsing { id: "2148", source: "Lakshmi" } window 50,10 2044.7 "Chanchala #2" Ability { id: "2148", source: "Lakshmi" } 2058.5 "Divine Doubt" Ability { id: "214A", source: "Lakshmi" } 2073.9 "The Path Of Light" Ability { id: "215B", source: "Lakshmi" } @@ -99,5 +99,5 @@ hideall "Alluring Arm" ### Chanchala #4 2332.8 "Chanchala #4" Ability { id: "2148", source: "Lakshmi" } -2335.0 "--sync--" sync / 14:[^:]*:Lakshmi:2560:/ window 1000,1000 +2335.0 "--sync--" StartsUsing { id: "2560", source: "Lakshmi" } window 1000,1000 2350.0 "Divine Denial Enrage" Ability { id: "2560", source: "Lakshmi" } diff --git a/ui/raidboss/data/04-sb/trial/seiryu.txt b/ui/raidboss/data/04-sb/trial/seiryu.txt index 2a02a53809..d0f5b22e5b 100644 --- a/ui/raidboss/data/04-sb/trial/seiryu.txt +++ b/ui/raidboss/data/04-sb/trial/seiryu.txt @@ -36,7 +36,7 @@ hideall "--sync--" 123.8 "1x Numa-No-Shiki" ### Final Phase -200.0 "--sync--" sync / 14:[^:]*:Seiryu:37C9:/ window 200,0 +200.0 "--sync--" StartsUsing { id: "37C9", source: "Seiryu" } window 200,0 205.0 "Strength Of Spirit" Ability { id: "37C9", source: "Seiryu" } 208.1 "--sync--" Ability { id: "37CA", source: "Seiryu" } 232.1 "Dragon's Wake" Ability { id: "3800", 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 117a84001e..0d348b6e7c 100644 --- a/ui/raidboss/data/04-sb/trial/shinryu-ex.txt +++ b/ui/raidboss/data/04-sb/trial/shinryu-ex.txt @@ -13,7 +13,7 @@ hideall "--sync--" ### PHASE 1: Elemental carousel ### 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1 -11.3 "--sync--" sync / 14:[^:]*:Shinryu:25FD:/ window 20,20 +11.3 "--sync--" StartsUsing { id: "25FD", source: "Shinryu" } window 20,20 21.3 "Earthen Fury" Ability { id: "25DE", source: "Shinryu" } 36.4 "--Tethers--" # Burning Chains (301) effect 44.5 "Tidal Wave" Ability { id: "25F9", source: "Shinryu" } @@ -76,7 +76,7 @@ hideall "--sync--" ### PHASE 2: Adds, explosions, dramatic tail climbing ### -500.0 "--Phase 2--" sync / 14:[^:]*:Shinryu:25E7:/ window 500,500 +500.0 "--Phase 2--" StartsUsing { id: "25E7", source: "Shinryu" } window 500,500 503.0 "Dark Matter" Ability { id: "25E7", source: "Shinryu" } 513.0 "TAP BUTTON OR ELSE" duration 5 540.7 "Touchdown" Ability { id: "2613", source: "Shinryu" } @@ -91,14 +91,14 @@ hideall "--sync--" ### PHASE 3: Anticlimax ### -800.0 "--Phase 3--" sync / 14:[^:]*:Shinryu:25E4:/ window 500,500 +800.0 "--Phase 3--" StartsUsing { id: "25E4", source: "Shinryu" } window 500,500 806.0 "Protostar" Ability { id: "25E4", source: "Shinryu" } 813.1 "Tail Spit" Ability { id: "2615", source: "Shinryu" } 837.4 "Shatter" Ability { id: "2617", source: "Shinryu" } window 50,50 843.4 "--targetable--" # Loop 1 -855.5 "--sync--" sync / 14:[^:]*:Shinryu:264B:/ window 20,20 +855.5 "--sync--" StartsUsing { id: "264B", source: "Shinryu" } window 20,20 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" } @@ -118,7 +118,7 @@ hideall "--sync--" ### PHASE 4: Race to the finish! ### -1046.0 "--sync--" sync / 14:[^:]*:Shinryu:264E:/ window 300,300 +1046.0 "--sync--" StartsUsing { id: "264E", source: "Shinryu" } window 300,300 1085.0 "First Wing" # 35 second cast, starts 4 seconds later, 2718/2719 1090.0 "Second Wing" # 35 second cast, starts 9 seconds later, 2719/2718 1116.0 "Tidal Wave" Ability { id: "264E", source: "Shinryu" } # 70 second cast diff --git a/ui/raidboss/data/04-sb/trial/shinryu.txt b/ui/raidboss/data/04-sb/trial/shinryu.txt index 14bbd1d5aa..6b29742b7e 100644 --- a/ui/raidboss/data/04-sb/trial/shinryu.txt +++ b/ui/raidboss/data/04-sb/trial/shinryu.txt @@ -23,16 +23,16 @@ hideall "--sync--" # Intermission. # The given times for Meteor Impact are the latest they can occur. 119.0 "--sync--" Ability { id: "1F8A", source: "Shinryu" } window 120,5 -125.4 "--sync--" sync / 14:[^:]*:Cocoon:1F96:/ window 10,5 +125.4 "--sync--" StartsUsing { id: "1F96", source: "Cocoon" } window 10,5 129.1 "Meteor Impact" Ability { id: "1F96", source: "Cocoon" } 130.6 "--adds spawn--" Ability { id: "2142", source: "Cocoon" } -146.2 "--sync--" sync / 14:[^:]*:Cocoon:1F96:/ window 15,5 +146.2 "--sync--" StartsUsing { id: "1F96", source: "Cocoon" } window 15,5 150.9 "Meteor Impact" Ability { id: "1F96", source: "Cocoon" } 152.5 "--adds spawn--" Ability { id: "2142", source: "Cocoon" } -176.1 "--sync--" sync / 14:[^:]*:Cocoon:1F96:/ window 25,5 +176.1 "--sync--" StartsUsing { id: "1F96", source: "Cocoon" } window 25,5 180.8 "Meteor Impact" Ability { id: "1F96", source: "Cocoon" } 182.4 "--adds spawn--" Ability { id: "2142", source: "Cocoon" } -219.7 "--sync--" sync / 14:[^:]*:Shinryu:1F95:/ window 220,5 +219.7 "--sync--" StartsUsing { id: "1F95", source: "Shinryu" } window 220,5 225.2 "Protostar" Ability { id: "1F95", source: "Shinryu" } 234.3 "Dark Matter" Ability { id: "1F98", source: "Shinryu" } 240.5 "--sync--" Ability { id: "2128", source: "Shinryu" } diff --git a/ui/raidboss/data/04-sb/trial/tsukuyomi-ex.txt b/ui/raidboss/data/04-sb/trial/tsukuyomi-ex.txt index 12726803ef..55bf4fbea3 100644 --- a/ui/raidboss/data/04-sb/trial/tsukuyomi-ex.txt +++ b/ui/raidboss/data/04-sb/trial/tsukuyomi-ex.txt @@ -10,7 +10,7 @@ hideall "--Reset--" # Timings get slightly off if there's lead or steel first, so do a split. 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1 -10.8 "--sync--" sync / 14:[^:]*:Tsukuyomi:2BBA:/ window 30,30 +10.8 "--sync--" StartsUsing { id: "2BBA", source: "Tsukuyomi" } window 30,30 14.8 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" } 25.0 "Nightfall (gun/spear)" Ability { id: "2BB[CD]", source: "Tsukuyomi" } 25.0 "--sync--" Ability { id: "2BBC", source: "Tsukuyomi" } window 30,30 jump 225 @@ -92,7 +92,7 @@ hideall "--Reset--" 1246.3 "Lead Of The Underworld/Steel Of The Underworld" Ability { id: "2BBE", source: "Tsukuyomi" } # Torment Unto Death can be delayed by ~2s if it's Steel -1257.5 "--sync--" sync / 14:[^:]*:Tsukuyomi:2BBB:/ window 10,10 +1257.5 "--sync--" StartsUsing { id: "2BBB", source: "Tsukuyomi" } window 10,10 1262.5 "Torment Unto Death" Ability { id: "2BBB", source: "Tsukuyomi" } 1273.8 "Supreme Selenomancy" Ability { id: "2EB0", source: "Tsukuyomi" } 1282.8 "Lunar Halo" Ability { id: "2BD6", source: "Moonlight" } diff --git a/ui/raidboss/data/04-sb/trial/tsukuyomi.txt b/ui/raidboss/data/04-sb/trial/tsukuyomi.txt index 576ab6c6c3..c2b0eb88f9 100644 --- a/ui/raidboss/data/04-sb/trial/tsukuyomi.txt +++ b/ui/raidboss/data/04-sb/trial/tsukuyomi.txt @@ -8,7 +8,7 @@ hideall "--Reset--" ### Phase 1 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1 -10.2 "--sync--" sync / 14:[^:]*:Tsukuyomi:2BE3:/ window 20,20 +10.2 "--sync--" StartsUsing { id: "2BE3", source: "Tsukuyomi" } window 20,20 14.2 "Torment Unto Death" Ability { id: "2BE3", source: "Tsukuyomi" } 24.3 "Zashiki-Asobi" Ability { id: "2BEC", source: "Tsukuyomi" } 30.4 "Nightfall" Ability { id: "2BE5", source: "Tsukuyomi" } @@ -44,7 +44,7 @@ hideall "--Reset--" ### Phase 3: Selenomancy -500.0 "--sync--" sync / 14:[^:]*:Tsukuyomi:2CB0:/ window 500,0 +500.0 "--sync--" StartsUsing { id: "2CB0", source: "Tsukuyomi" } window 500,0 504.0 "Nightbloom" Ability { id: "2CB0", source: "Tsukuyomi" } 509.9 "--targetable--" 524.4 "Selenomancy" Ability { id: "2BF1", source: "Tsukuyomi" } diff --git a/ui/raidboss/data/04-sb/trial/yojimbo.txt b/ui/raidboss/data/04-sb/trial/yojimbo.txt index 41a101d4d9..2cda825b30 100644 --- a/ui/raidboss/data/04-sb/trial/yojimbo.txt +++ b/ui/raidboss/data/04-sb/trial/yojimbo.txt @@ -79,7 +79,7 @@ hideall "--sync--" 229.1 "Bitter End" #Ability { id: "382E", source: "Embodiment" } # ??? -296.0 "--sync--" sync / 14:[^:]*:Gilgamesh:383D:/ window 100,0 +296.0 "--sync--" StartsUsing { id: "383D", source: "Gilgamesh" } window 100,0 300.0 "Ame-no-Murakumo" Ability { id: "383D", source: "Gilgamesh" } window 300,300 316.4 "Giga Jump" Ability { id: "383E", source: "Yojimbo" } # drift -0.048 316.4 "--targetable--" diff --git a/ui/raidboss/data/04-sb/ultimate/ultima_weapon_ultimate.txt b/ui/raidboss/data/04-sb/ultimate/ultima_weapon_ultimate.txt index 78a3fcb25b..bae569ccd8 100644 --- a/ui/raidboss/data/04-sb/ultimate/ultima_weapon_ultimate.txt +++ b/ui/raidboss/data/04-sb/ultimate/ultima_weapon_ultimate.txt @@ -15,7 +15,7 @@ hideall "--Reset--" ### Phase 1: Garuda ### 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1 -6.3 "--sync--" sync / 14:[^:]*:Garuda:2B53:/ window 10,10 +6.3 "--sync--" StartsUsing { id: "2B53", source: "Garuda" } window 10,10 8.8 "Slipstream" Ability { id: "2B53", source: "Garuda" } 11.4 "Mistral Song" Ability { id: "2B42", source: "Garuda" } 17.5 "Great Whirlwind" Ability { id: "2B41", source: "Garuda" } @@ -55,7 +55,7 @@ hideall "--Reset--" ### Phase 2: Ifrit ### -300.0 "--sync--" sync / 14:[^:]*:Ifrit:2B5F:/ window 300,0 +300.0 "--sync--" StartsUsing { id: "2B5F", source: "Ifrit" } window 300,0 303.0 "Crimson Cyclone" Ability { id: "2B5F", source: "Ifrit" } 304.0 "Radiant Plume" Ability { id: "2B61", source: "Ifrit" } 307.1 "--targetable--" @@ -73,7 +73,7 @@ hideall "--Reset--" 354.8 "Eruption 4" #Ability { id: "2B5A", source: "Ifrit" } 365.7 "--untargetable--" 369.9 "--targetable--" -369.9 "--sync--" sync / 14:[^:]*:Ifrit:2B5E:/ window 10,10 +369.9 "--sync--" StartsUsing { id: "2B5E", source: "Ifrit" } window 10,10 372.9 "Hellfire" Ability { id: "2B5E", source: "Ifrit" } 381.2 "Inferno Howl 1" Ability { id: "2B5B", source: "Ifrit" } duration 30 387.3 "Eruption 1" #Ability { id: "2B5A", source: "Ifrit" } @@ -102,7 +102,7 @@ hideall "--Reset--" ### Phase 3: Titan ### -600.0 "--sync--" sync / 14:[^:]*:Titan:2CFD:/ window 600,0 +600.0 "--sync--" StartsUsing { id: "2CFD", source: "Titan" } window 600,0 603.0 "Geocrush" Ability { id: "2CFD", source: "Titan" } 605.3 "--targetable--" 608.3 "Earthen Fury" Ability { id: "2B90", source: "Titan" } @@ -157,25 +157,25 @@ hideall "--Reset--" ### Phase 4: Snacks ### 800.0 "Freefire" sync / 1[56]:[^:]*:[^:]*:2CF5:/ window 800,0 802.0 "--targetable--" -803.0 "--sync--" sync / 14:[^:]*:Magitek Bit:2B72:/ +803.0 "--sync--" StartsUsing { id: "2B72", source: "Magitek Bit" } 815.0 "Self-detonate" Ability { id: "2B72", source: "Magitek Bit" } 815.2 "Blight" Ability { id: "2B73", source: "Lahabrea" } window 50,10 -824.2 "--sync--" sync / 14:[^:]*:Lahabrea:2B74:/ window 50,10 +824.2 "--sync--" StartsUsing { id: "2B74", source: "Lahabrea" } window 50,10 841.2 "Dark IV" Ability { id: "2B74", source: "Lahabrea" } window 50,10 -845.4 "--sync--" sync / 14:[^:]*:The Ultima Weapon:2B8B:/ window 50,10 +845.4 "--sync--" StartsUsing { id: "2B8B", source: "The Ultima Weapon" } window 50,10 850.4 "Ultima" Ability { id: "2B8B", source: "The Ultima Weapon" } window 50,10 forcejump 960.3 ### Phase 5: Ultima ### 960.3 "Ultima" Ability { id: "2B8B", source: "The Ultima Weapon" } -1000 "--targetable--" sync / 14:[^:]*:The Ultima Weapon:2B87:/ window 1000,100 +1000 "--targetable--" StartsUsing { id: "2B87", source: "The Ultima Weapon" } window 1000,100 1004.0 "Tank Purge" Ability { id: "2B87", source: "The Ultima Weapon" } 1006.3 "--apply viscous--" Ability { id: "2B79", source: "The Ultima Weapon" } 1012.4 "Homing Lasers" Ability { id: "2B7B", source: "The Ultima Weapon" } 1017.4 "Viscous Aetheroplasm" Ability { id: "2B7A", source: "The Ultima Weapon" } ## Ultimate Predation -1020.5 "--sync--" sync / 14:[^:]*:The Ultima Weapon:2B76:/ window 30,30 +1020.5 "--sync--" StartsUsing { id: "2B76", source: "The Ultima Weapon" } window 30,30 1023.5 "Ultimate Predation" Ability { id: "2B76", source: "The Ultima Weapon" } 1027.9 "--untargetable--" 1038.2 "Landslide" Ability { id: "2B70", source: "Titan" } @@ -209,7 +209,7 @@ hideall "--Reset--" 1096.2 "Feather Rain" Ability { id: "2B4D", source: "Garuda" } ## Ultimate Annihilation -1098.8 "--sync--" sync / 14:[^:]*:The Ultima Weapon:2D4C:/ window 30,30 +1098.8 "--sync--" StartsUsing { id: "2D4C", source: "The Ultima Weapon" } window 30,30 1101.8 "Ultimate Annihilation" Ability { id: "2D4C", source: "The Ultima Weapon" } 1106.2 "--untargetable--" 1110.4 "--targetable--" @@ -250,7 +250,7 @@ hideall "--Reset--" 1190 "Diffractive Laser" ## Ultimate Suppression (50%) -1192.0 "--sync--" sync / 14:[^:]*:The Ultima Weapon:2D4D:/ window 1200,100 +1192.0 "--sync--" StartsUsing { id: "2D4D", source: "The Ultima Weapon" } window 1200,100 1195.0 "Ultimate Suppression" Ability { id: "2D4D", source: "The Ultima Weapon" } 1199.4 "--untargetable--" 1205.7 "Rock Throw" Ability { id: "2B6B", source: "Titan" } diff --git a/ui/raidboss/data/04-sb/ultimate/unending_coil_ultimate.txt b/ui/raidboss/data/04-sb/ultimate/unending_coil_ultimate.txt index bbe1f04c2c..6c1f69caa6 100644 --- a/ui/raidboss/data/04-sb/ultimate/unending_coil_ultimate.txt +++ b/ui/raidboss/data/04-sb/ultimate/unending_coil_ultimate.txt @@ -22,7 +22,7 @@ hideall "--sync--" ### Twintania P2: 75% -> 45% 47.5 "Liquid Hell x5" duration 4.5 Ability { id: "26AD", source: "Twintania" } window 50,0 -53.0 "--sync--" sync / 14:[^:]*:Twintania:26AE:/ window 53,10 +53.0 "--sync--" StartsUsing { id: "26AE", source: "Twintania" } window 53,10 56.0 "Generate" Ability { id: "26AE", source: "Twintania" } 59.1 "Liquid Hell x5" duration 4.5 #Ability { id: "26AD", source: "Twintania" } 70.6 "Death Sentence" Ability { id: "26A9", source: "Twintania" } @@ -35,7 +35,7 @@ hideall "--sync--" ### Twintania P3: 45% -> 0% 106.4 "Liquid Hell x5" duration 4.5 #Ability { id: "26AD", source: "Twintania" } -111.9 "--sync--" sync / 14:[^:]*:Twintania:26AE:/ window 30,10 +111.9 "--sync--" StartsUsing { id: "26AE", source: "Twintania" } window 30,10 114.9 "Generate x2" Ability { id: "26AE", source: "Twintania" } 118.0 "Targeted Fire x5" duration 4.5 #Ability { id: "26AD", source: "Twintania" } 124.6 "Fireball" Ability { id: "26AC", source: "Twintania" } window 70,10