raidboss: timeline netregex for InCombat (#6019)

/sync\s*\/ 104:\[\^:\]\*:(?<inGameCombat>\w)$\$\|:$\// Done by running #5977.
quisquous · Dec 15, 2023 · 3627ea1 · 3627ea1
1 parent 39744ed
commit 3627ea1
Show file tree

Hide file tree

Showing 146 changed files with 146 additions and 146 deletions.
diff --git a/ui/raidboss/data/02-arr/raid/t12.txt b/ui/raidboss/data/02-arr/raid/t12.txt
@@ -8,7 +8,7 @@ hideall "Scorched Pinion"
 
 ### Phase 1: Blackfire/Whitefire
 0.0 "Start"
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 9.0 "Bennu Add"
 18.0 "Revelation" Ability { id: "B87", source: "Phoenix" } window 18,10
 32.1 "Blackfire" Ability { id: "B8C", source: "Phoenix" }

diff --git a/ui/raidboss/data/02-arr/raid/t13.txt b/ui/raidboss/data/02-arr/raid/t13.txt
@@ -6,7 +6,7 @@ hideall "--sync--"
 
 ### Phase 1: Megaflare Warmup
 0.0 "Start"
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 7.0 "Flare Breath" Ability { id: "BAD", source: "Bahamut Prime" } window 7,10
 15.1 "Megaflare" Ability { id: "BAF", source: "Bahamut Prime" } window 80,80
 18.8 "MF Spread" #Ability { id: "BB0", source: "Bahamut Prime" }

diff --git a/ui/raidboss/data/02-arr/raid/t5.txt b/ui/raidboss/data/02-arr/raid/t5.txt
@@ -10,7 +10,7 @@ hideall "--sync--"
 
 ### Phase 1
 0.0 "Start"
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 7.5 "Plummet" Ability { id: "4D8", source: "Twintania" } window 10,5
 21.6 "Death Sentence" Ability { id: "5B2", source: "Twintania" } window 22,10
 25.7 "Plummet" Ability { id: "4D8", source: "Twintania" }

diff --git a/ui/raidboss/data/02-arr/raid/t9.txt b/ui/raidboss/data/02-arr/raid/t9.txt
@@ -7,7 +7,7 @@ hideall "--sync--"
 ### Phase 1
 # This phase really doesn't seem to loop anywhere.
 0.0 "Start"
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 5.5 "Ravensclaw" Ability { id: "7D5", source: "Nael deus Darnus" } window 6,5
 16.6 "Ravensclaw" Ability { id: "7D5", source: "Nael deus Darnus" }
 

diff --git a/ui/raidboss/data/02-arr/trial/ifrit-nm.txt b/ui/raidboss/data/02-arr/trial/ifrit-nm.txt
@@ -6,7 +6,7 @@ hideall "--sync--"
 
 # 0%
 0.0 "Start"
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 1.2 "Incinerate" Ability { id: "1C5", source: "Ifrit" } window 10,10
 9.1 "Vulcan Burst" Ability { id: "1C6", source: "Ifrit" }
 17.1 "Incinerate" Ability { id: "1C5", source: "Ifrit" }

diff --git a/ui/raidboss/data/02-arr/trial/levi-ex.txt b/ui/raidboss/data/02-arr/trial/levi-ex.txt
@@ -37,7 +37,7 @@ hideall "--sync--"
 
 ### Phase 1: Literally Just Autos (100% -> 90%)
 0.0 "Start"
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 25.8 "--untargetable--" sync / 22:........:Leviathan:........:Leviathan:00/ window 30,10
 
 ### Phase 2: One Set of Orbs (90% -> 50%?)

diff --git a/ui/raidboss/data/02-arr/trial/shiva-ex.txt b/ui/raidboss/data/02-arr/trial/shiva-ex.txt
@@ -35,7 +35,7 @@ hideall "--sync--"
 hideall "--Reset--"
 
 # Phase 1: Literally Just Autos (100% -> 95%)
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 2.0 "--sync--" Ability { id: "BE4", source: "Shiva" } window 10,10
 
 # jump to staff

diff --git a/ui/raidboss/data/02-arr/trial/shiva-hm.txt b/ui/raidboss/data/02-arr/trial/shiva-hm.txt
@@ -30,7 +30,7 @@ hideall "--sync--"
 hideall "--Reset--"
 
 # Phase 1: Literally Just Autos (100% -> 95%)
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 2.0 "--sync--" Ability { id: "99A", source: "Shiva" } window 10,10
 
 # jump to staff

diff --git a/ui/raidboss/data/02-arr/trial/titan-ex.txt b/ui/raidboss/data/02-arr/trial/titan-ex.txt
@@ -10,7 +10,7 @@ hideall "--sync--"
 
 ### Phase 1: 100->85%
 0.0 "Start"
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 
 10.0 "Landslide" Ability { id: "5BB", source: "Titan" } window 10,10
 18.7 "Weight Of The Land" Ability { id: "5BE", source: "Titan" } window 20,5

diff --git a/ui/raidboss/data/02-arr/trial/titan-hm.txt b/ui/raidboss/data/02-arr/trial/titan-hm.txt
@@ -13,7 +13,7 @@ hideall "--sync--"
 
 ### Phase 1: 100->90%
 0.0 "Start"
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 
 5.0 "Rock Buster" Ability { id: "550", source: "Titan" } window 5,50
 11.2 "Landslide" Ability { id: "554", source: "Titan" }

diff --git a/ui/raidboss/data/02-arr/trial/titan-nm.txt b/ui/raidboss/data/02-arr/trial/titan-nm.txt
@@ -6,7 +6,7 @@ hideall "--sync--"
 
 ### Phase 1 100 -> 85%
 0.0 "Start"
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 5.0 "Rock Buster" Ability { id: "281", source: "Titan" } window 5,5
 7.0 "Tumult" Ability { id: "282", source: "Titan" }
 16.1 "Tumult" Ability { id: "282", source: "Titan" }

diff --git a/ui/raidboss/data/02-arr/trial/ultima-ex.txt b/ui/raidboss/data/02-arr/trial/ultima-ex.txt
@@ -4,7 +4,7 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 
 # Phase 1: 100% - 85%
 3.2 "Viscous Aetheroplasm" Ability { id: "5DF", source: "The Ultima Weapon" } window 3.2,10

diff --git a/ui/raidboss/data/03-hw/raid/a10s.txt b/ui/raidboss/data/03-hw/raid/a10s.txt
@@ -8,7 +8,7 @@ hideall "--Reset--"
 hideall "--sync--"
 
 ### Phase 1
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 6.5 "Goblin Rush" Ability { id: "1A16", source: "Lamebrix Strikebocks" } window 7,2.5
 9.6 "Gobsway Rumblerocks" Ability { id: "1AA0", source: "Lamebrix Strikebocks" }
 14.7 "Gobsway Rumblerocks" Ability { id: "1AA0", source: "Lamebrix Strikebocks" }

diff --git a/ui/raidboss/data/03-hw/raid/a11s.txt b/ui/raidboss/data/03-hw/raid/a11s.txt
@@ -10,7 +10,7 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 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" }
 

diff --git a/ui/raidboss/data/03-hw/raid/a12n.txt b/ui/raidboss/data/03-hw/raid/a12n.txt
@@ -6,7 +6,7 @@ hideall "--sync--"
 
 # -ii 1AE2 1AE6 1AF1
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 6.4 "Divine Spear" Ability { id: "1AE3", source: "Alexander Prime" } window 6.4,5
 14.5 "Mega Holy" Ability { id: "1AE7", source: "Alexander Prime" }
 22.6 "Punishing Heat" Ability { id: "1AE4", source: "Alexander Prime" }

diff --git a/ui/raidboss/data/03-hw/raid/a12s.txt b/ui/raidboss/data/03-hw/raid/a12s.txt
@@ -8,7 +8,7 @@ hideall "--Reset--"
 hideall "--sync--"
 
 ### Phase 1
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 7.0 "Divine Spear" Ability { id: "19E8", source: "Alexander Prime" } window 7,10
 14.1 "Punishing Heat" Ability { id: "19E9", source: "Alexander Prime" }
 17.3 "Divine Spear" Ability { id: "19E8", source: "Alexander Prime" }

diff --git a/ui/raidboss/data/03-hw/raid/a2s.txt b/ui/raidboss/data/03-hw/raid/a2s.txt
@@ -13,7 +13,7 @@ hideall "--Reset--"
 hideall "--sync--"
 
 # Wave 1 (pull)
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 0.0 "Soldier x2 (NW)"
 
 

diff --git a/ui/raidboss/data/03-hw/raid/a3s.txt b/ui/raidboss/data/03-hw/raid/a3s.txt
@@ -11,7 +11,7 @@ hideall "--Reset--"
 hideall "--sync--"
 
 ### Phase 1: Jiggly
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 7.0 "Fluid Swing" Ability { id: "EF3", source: "Living Liquid" }
 17.2 "Protean Wave" Ability { id: "EF5", source: "Living Liquid" }
 18.8 "Protean Wave" Ability { id: "EF6", source: "Living Liquid" }

diff --git a/ui/raidboss/data/03-hw/raid/a4s.txt b/ui/raidboss/data/03-hw/raid/a4s.txt
@@ -9,7 +9,7 @@
 #       So, I applied that to all perpetual rays.
 
 ### Leg 1
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 3.0 "Hydrothermal Missile" Ability { id: "F5B", source: "The Manipulator" } window 3,13
 14.1 "Discoid" Ability { id: "F61", source: "The Manipulator" }
 21.2 "Seed Of The Sky" Ability { id: "13D0", source: "The Manipulator" }

diff --git a/ui/raidboss/data/03-hw/raid/a7s.txt b/ui/raidboss/data/03-hw/raid/a7s.txt
@@ -55,7 +55,7 @@ hideall "--sync--"
 ##############################################################
 ################# Intro
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 8 "Hammertime x2"
 21 "Sizzlebeam"
 31 "Sizzlespark"

diff --git a/ui/raidboss/data/03-hw/raid/a8n.txt b/ui/raidboss/data/03-hw/raid/a8n.txt
@@ -14,7 +14,7 @@ hideall "Brute Force"
 # ending with a Final Judgment sword drop.
 
 # ONSLAUGHTER
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 5.4 "Hydrothermal Missile" Ability { id: "172F", source: "Onslaughter" } window 5.4,5
 12.6 "Mega Beam" Ability { id: "1732", source: "Onslaughter" }
 

diff --git a/ui/raidboss/data/03-hw/raid/a8s.txt b/ui/raidboss/data/03-hw/raid/a8s.txt
@@ -10,7 +10,7 @@ hideall "Magicked Mark"
 hideall "Brute Force"
 
 ### Phase 1: Onslaughter: Execution and Legislation
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 6.7 "Hydrothermal Missile" Ability { id: "162A", source: "Onslaughter" } window 7,5
 15.9 "Seed Of The Sky" Ability { id: "162D", source: "Onslaughter" }
 17.9 "Mega Beam" Ability { id: "162E", source: "Onslaughter" }

diff --git a/ui/raidboss/data/03-hw/trial/ravana-ex.txt b/ui/raidboss/data/03-hw/trial/ravana-ex.txt
@@ -9,7 +9,7 @@ hideall "--sync--"
 # The meter also increases passively during all phases except the opening block.
 # Any displayed phase lengths are the maximum that could occur with no "extra" Bloodlust.
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 7.1 "Blinding Blade" Ability { id: "E9F", source: "Ravana" } window 7.1,10
 11.9 "The Seeing" Ability { id: "EA[012]", source: "Ravana" }
 16.0 "Atma-Linga" Ability { id: "EA6", source: "Ravana" }

diff --git a/ui/raidboss/data/03-hw/trial/sephirot-ex.txt b/ui/raidboss/data/03-hw/trial/sephirot-ex.txt
@@ -7,7 +7,7 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 7.1 "Triple Trial" Ability { id: "1566", source: "Sephirot" } window 7.1,5
 11.2 "Tiferet" Ability { id: "1568", source: "Sephirot" }
 17.4 "Tiferet" Ability { id: "1568", source: "Sephirot" }

diff --git a/ui/raidboss/data/03-hw/trial/sophia-ex.txt b/ui/raidboss/data/03-hw/trial/sophia-ex.txt
@@ -12,7 +12,7 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 12.0 "Thunder II" Ability { id: "19B0", source: "Sophia" } window 12,5
 22.4 "Gnosis" Ability { id: "19C2", source: "Barbelo" }
 41.4 "Arms Of Wisdom?" Ability { id: "19C4", source: "Sophia" } # May be skipped depending on DPS

diff --git a/ui/raidboss/data/03-hw/trial/thordan-ex.txt b/ui/raidboss/data/03-hw/trial/thordan-ex.txt
@@ -8,7 +8,7 @@ hideall "--Reset--"
 hideall "--sync--"
 
 # Phase 1. Pushes at 70% HP?
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 5.0 "Ascalon's Might" Ability { id: "147E", source: "King Thordan" }
 14.8 "Meteorain" Ability { id: "1483", source: "King Thordan" }
 15.1 "--sync--" Ability { id: "1484", source: "King Thordan" } # Meteorain

diff --git a/ui/raidboss/data/03-hw/trial/zurvan-ex.txt b/ui/raidboss/data/03-hw/trial/zurvan-ex.txt
@@ -17,7 +17,7 @@ hideall "--Reset--"
 hideall "--sync--"
 
 # Preliminary phase. No pushes.
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 6.4 "Metal Cutter" Ability { id: "1E3F", source: "Zurvan" } window 6.5,2.5
 10.5 "Metal Cutter" Ability { id: "1E3F", source: "Zurvan" }
 16.6 "Flare Star (circles)" Ability { id: "1C4E", source: "Zurvan" }

diff --git a/ui/raidboss/data/04-sb/raid/o10n.txt b/ui/raidboss/data/04-sb/raid/o10n.txt
@@ -6,7 +6,7 @@ hideall "--sync--"
 
 ## Common start
 0.0 "Start"
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 13.1 "Spin" Ability { id: "31C7", source: "Midgardsormr" } window 14,5
 19.2 "Spin" Ability { id: "31C9", source: "Midgardsormr" }
 22.9 "Out" Ability { id: "31CD", source: "Midgardsormr" }

diff --git a/ui/raidboss/data/04-sb/raid/o10s.txt b/ui/raidboss/data/04-sb/raid/o10s.txt
@@ -4,7 +4,7 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 12.3 "Flip" Ability { id: "31AD", source: "Midgardsormr" } window 13,10
 23.5 "Spin" Ability { id: "31AE", source: "Midgardsormr" }
 27.4 "Cardinals" Ability { id: "31B3", source: "Midgardsormr" } # X hit, not sure of sync yet

diff --git a/ui/raidboss/data/04-sb/raid/o11n.txt b/ui/raidboss/data/04-sb/raid/o11n.txt
@@ -4,7 +4,7 @@ hideall "--Reset--"
 hideall "--sync--"
 
 ## Common start
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 12.8 "Atomic Ray" Ability { id: "3286", source: "Omega" } window 20,80
 24.9 "Mustard Bomb" Ability { id: "3287", source: "Omega" }
 27.0 "Ballistic Missile?" Ability { id: "327E", source: "Omega" } window 30,40 jump 227.0

diff --git a/ui/raidboss/data/04-sb/raid/o11s.txt b/ui/raidboss/data/04-sb/raid/o11s.txt
@@ -8,7 +8,7 @@ hideall "--Reset--"
 hideall "--sync--"
 
 # Phase 1
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 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" }

diff --git a/ui/raidboss/data/04-sb/raid/o12n.txt b/ui/raidboss/data/04-sb/raid/o12n.txt
@@ -6,7 +6,7 @@ hideall "--sync--"
 
 ### Phase 1 (loops until low%)
 0.0 "Start"
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 15.3 "Solar Ray" Ability { id: "330F", source: "Omega-M" } window 16,3
 20.4 "Program Alpha" Ability { id: "3308", source: "Omega-M" }
 23.5 "Floodlight" Ability { id: "3309", source: "Omega-M" }

diff --git a/ui/raidboss/data/04-sb/raid/o1n.txt b/ui/raidboss/data/04-sb/raid/o1n.txt
@@ -5,7 +5,7 @@
 # Enrage is approximately 13:40. Yes, Normal has an enrage.
 # -ii 1ED9 1EDA 23D7 23D9 2583
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 6.6 "Wyrm Tail" Ability { id: "23D6", source: "Alte Roite" } window 6.6,2.5
 12.8 "Wyrm Tail" Ability { id: "23D6", source: "Alte Roite" }
 19.0 "Flame" Ability { id: "23DD", source: "Alte Roite" } window 19,10

diff --git a/ui/raidboss/data/04-sb/raid/o1s.txt b/ui/raidboss/data/04-sb/raid/o1s.txt
@@ -10,7 +10,7 @@ hideall "Flame"
 ###### 1st Classical Elements
 # spread: knockback => in => spread+lightning
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 6.9 "Wyrm Tail" Ability { id: "1ECE", source: "Alte Roite" } window 7,3
 13.0 "Wyrm Tail" Ability { id: "1ECE", source: "Alte Roite" }
 20.1 "Twin Bolt" Ability { id: "1ECF", source: "Alte Roite" }

diff --git a/ui/raidboss/data/04-sb/raid/o2n.txt b/ui/raidboss/data/04-sb/raid/o2n.txt
@@ -7,7 +7,7 @@ hideall "--sync--"
 # Unlike O1N and O3N, Catastrophe has no enrage.
 # -ii 24E8 24FC 2500 2501 2505 2514 2515 2516
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 5.6 "Tremblor" Ability { id: "2511", source: "Catastrophe" } window 5.6,2
 9.2 "Tremblor" Ability { id: "2511", source: "Catastrophe" }
 17.8 "Earthquake" Ability { id: "2512", source: "Catastrophe" }

diff --git a/ui/raidboss/data/04-sb/raid/o2s.txt b/ui/raidboss/data/04-sb/raid/o2s.txt
@@ -8,7 +8,7 @@
 hideall "--sync--"
 hideall "--Reset--"
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 5.0 "Tremblor" Ability { id: "2373", source: "Catastrophe" } window 5,2.5
 8.7 "Tremblor" Ability { id: "2373", source: "Catastrophe" }
 17.4 "Earthquake" Ability { id: "2374", source: "Catastrophe" } window 18,10

diff --git a/ui/raidboss/data/04-sb/raid/o3n.txt b/ui/raidboss/data/04-sb/raid/o3n.txt
@@ -5,7 +5,7 @@
 # Enrage is approximately 13:10-13:30, depending on intermission length. Yes, Normal has an enrage.
 # -ii 230C 2470 2472 2473
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 9.7 "Ribbit (avoid)" Ability { id: "2466", source: "Halicarnassus" } window 9.7,10
 17.3 "Spellblade Thunder III" Ability { id: "2462", source: "Halicarnassus" }
 22.4 "Spellblade Holy" Ability { id: "22EF", source: "Halicarnassus" }

diff --git a/ui/raidboss/data/04-sb/raid/o3s.txt b/ui/raidboss/data/04-sb/raid/o3s.txt
@@ -6,7 +6,7 @@ hideall "--sync--"
 
 # -ii 22EA 22FE 2309 230C 230F 2315
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 10.7 "Critical Hit" Ability { id: "22EB", source: "Halicarnassus" } window 10.7,5
 19.7 "Spellblade Holy" Ability { id: "22EF", source: "Halicarnassus" }
 25.4 "Pole Shift" # Ability { id: "22F[23]", source: "Halicarnassus" }

diff --git a/ui/raidboss/data/04-sb/raid/o4n.txt b/ui/raidboss/data/04-sb/raid/o4n.txt
@@ -9,7 +9,7 @@ hideall "--sync--"
 
 # -ii 24BA 24BC 24BE 24C3 24C5
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 9.5 "Doom" Ability { id: "24B7", source: "Exdeath" } window 9.5,5
 19.1 "Blizzard/Fire III" Ability { id: "24B[9B]", source: "Exdeath" }
 28.8 "Thunder III (Buster)" Ability { id: "24BD", source: "Exdeath" }

diff --git a/ui/raidboss/data/04-sb/raid/o5n.txt b/ui/raidboss/data/04-sb/raid/o5n.txt
@@ -11,7 +11,7 @@ hideall "--sync--"
 
 0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 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" }

diff --git a/ui/raidboss/data/04-sb/raid/o5s.txt b/ui/raidboss/data/04-sb/raid/o5s.txt
@@ -11,7 +11,7 @@ hideall "--sync--"
 
 0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 11 "Encumber" Ability { id: "28B6", source: "Wroth Ghost" } window 11,5
 18 "Saintly Beam" duration 10
 31 "Knockback Whistle" Ability { id: "28A5", source: "Phantom Train" }

diff --git a/ui/raidboss/data/04-sb/raid/o6n.txt b/ui/raidboss/data/04-sb/raid/o6n.txt
@@ -6,7 +6,7 @@ hideall "--sync--"
 # Note: Although there is a 18 sec. delay between the chatlog line and the boss being targetable
 # the player's InCombat status is changed at nearly the same time and can be reliably used to start the timeline.
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 18 "--targetable--"
 21 "Demonic Howl" Ability { id: "282C", source: "Demon Chadarnook" } window 21,2.5
 30 "Demonic Shear" Ability { id: "282A", source: "Demon Chadarnook" }

diff --git a/ui/raidboss/data/04-sb/raid/o6s.txt b/ui/raidboss/data/04-sb/raid/o6s.txt
@@ -6,7 +6,7 @@ hideall "--sync--"
 # Note: Although there is a 18 sec. delay between the chatlog line and the boss being targetable
 # the player's InCombat status is changed at nearly the same time and can be reliably used to start the timeline.
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 18 "--targetable--"
 21 "Demonic Howl" Ability { id: "282B", source: "Demon Chadarnook" } window 21,0
 31 "Demonic Shear" Ability { id: "2829", source: "Demon Chadarnook" }

diff --git a/ui/raidboss/data/04-sb/raid/o7n.txt b/ui/raidboss/data/04-sb/raid/o7n.txt
@@ -3,7 +3,7 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
 11 "Magitek Ray" Ability { id: "276B", source: "Guardian" } window 11,10
 21 "Arm And Hammer" Ability { id: "276C", source: "Guardian" }
 31 "Prey" Ability { id: "276D", source: "Guardian" }