triggers build: raidboss: update ARR/HW/SB timelines to use InCombat …

…lines (#5555) Intending this PR to finish out the remaining work from #5440 . Marked as draft pending discussion below. Right now, it includes timeline updates for everything in 02-arr, using 0x104 lines to start the timeline vs. engage or zone-seal messages where it makes sense. There's a few of the coils fights where there are various pre-boss add encounters, so using 0x104 lines -- at least by themselves -- will produce inaccurate results. I've added comments where needed. Before I start tackling later expansions, this issue of using 0x104 lines in encounters with pre-boss adds will become a more common issue, particularly in dungeon and alliance content (some of the alex raids as well, and doubtless there are others). There's probably at least two options, maybe more, but wanted to discuss approach before I dig in further: 1. Continue to use engage or zone-seal messages (as-is) where 0x104 lines have the potential to start the timeline early. (Easiest) 2. Use a combination of engage/zone-seal messages for the initial timeline encounter, and use 0x104 lines with large windows for later encounters. While this might be viable in some current content where spacing between bosses and mobs is at least somewhat predictable, it becomes inaccurate as soon as the content can be unsync'd (if not sooner). It would also require a pretty intensive re-look at older fight content to try to figure out exactly how to space out the timeline entries between combat and what appropriate look-back windows for 0x104 lines would be. TLDR: leaning toward option 1 since I *think* this is nice-to-have work and not break-fix? a44b96f
quisquous · Jun 19, 2023 · be474a2 · be474a2
1 parent f449263
commit be474a2
Show file tree

Hide file tree

Showing 123 changed files with 140 additions and 598 deletions.
diff --git a/02-arr/raid/t10.txt b/02-arr/raid/t10.txt
@@ -1,14 +1,14 @@
 # Turn 10
 # -ii B5A B5C B60 B66 B68 B64 B59 B58 B65 B61 B57 -p B5D:200 B5E:500
 
+# Note: Use zone seal message instead of 0x104 line to start timeline
+# as there are pre-boss adds to start the encounter.
+
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 # Initial Phase: Tankbuster, Charge, Repeat
 0.0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
 0.0 "--sync--" sync / 00:0839::The Alpha Concourse will be sealed off/ window 5,5
 8.0 "Crackle Hiss" sync / 1[56]:[^:]*:Imdugud:B55:/
 16.0 "Critical Rip" sync / 1[56]:[^:]*:Imdugud:B56:/

diff --git a/02-arr/raid/t11.txt b/02-arr/raid/t11.txt
@@ -1,17 +1,16 @@
 ### Turn 11
 # -ii B70 B6A B75 B74 B80 B7C -p B6F:200 B78:600 B7A:1208
 
+# Note: Use zone seal message instead of 0x104 line to start timeline
+# as there are pre-boss adds to start the encounter.
+
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
 ### Phase 1
 0.0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
 0.0 "--sync--" sync / 00:0839::The Core Override will be sealed off/ window 10,10
-2.5 "--sync--" sync / 1[56]:[^:]*:Kaliya:B6A:/ window 3,0
-9.4 "Resonance" sync / 1[56]:[^:]*:Kaliya:B6B:/
+9.4 "Resonance" sync / 1[56]:[^:]*:Kaliya:B6B:/ window 10,10
 
 19.7 "Nerve Gas"
 24.9 "Nerve Gas"

diff --git a/02-arr/raid/t12.txt b/02-arr/raid/t12.txt
@@ -6,14 +6,11 @@ hideall "--sync--"
 hideall "Summon"
 hideall "Scorched Pinion"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 ### Phase 1: Blackfire/Whitefire
 0.0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-2.5 "--sync--" sync / 1[56]:[^:]*:Phoenix:368:/ window 3,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 9.0 "Bennu Add"
-18.0 "Revelation" sync / 1[56]:[^:]*:Phoenix:B87:/
+18.0 "Revelation" sync / 1[56]:[^:]*:Phoenix:B87:/ window 18,10
 32.1 "Blackfire" sync / 1[56]:[^:]*:Phoenix:B8C:/
 42.1 "--sync--" sync / 1[56]:[^:]*:Phoenix:B8F:/
 43.6 "Whitefire" sync / 1[56]:[^:]*:Phoenix:B90:/

diff --git a/02-arr/raid/t13.txt b/02-arr/raid/t13.txt
@@ -4,12 +4,9 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 ### Phase 1: Megaflare Warmup
 0.0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-1.0 "--sync--" sync / 1[56]:[^:]*:Bahamut Prime:BAC:/ window 2,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 7.0 "Flare Breath" sync / 1[56]:[^:]*:Bahamut Prime:BAD:/ window 7,10
 15.1 "Megaflare" sync / 1[56]:[^:]*:Bahamut Prime:BAF:/ window 80,80
 18.8 "MF Spread" #sync / 1[56]:[^:]*:Bahamut Prime:BB0:/

diff --git a/02-arr/raid/t5.txt b/02-arr/raid/t5.txt
@@ -8,12 +8,9 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
 ### Phase 1
 0.0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-0.0 "--sync--" sync / 00:0839::The Right Hand of Bahamut will be sealed off/ window 10,10
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 7.5 "Plummet" sync / 1[56]:[^:]*:Twintania:4D8:/ window 10,5
 21.6 "Death Sentence" sync / 1[56]:[^:]*:Twintania:5B2:/ window 22,10
 25.7 "Plummet" sync / 1[56]:[^:]*:Twintania:4D8:/

diff --git a/02-arr/raid/t6.txt b/02-arr/raid/t6.txt
@@ -4,11 +4,11 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# Note: Use zone seal message instead of 0x104 line to start timeline
+# as there are pre-boss adds to start the encounter.
 
 ### Phase 1
 0.0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
 0.0 "--sync--" sync / 00:0839::Scar's Edge will be sealed off/ window 10,10
 7.5 "Bloody Caress" sync / 1[56]:[^:]*:Rafflesia:797:/ window 8,8
 11.5 "Thorn Whip" sync / 1[56]:[^:]*:Rafflesia:879:/

diff --git a/02-arr/raid/t7.txt b/02-arr/raid/t7.txt
@@ -4,10 +4,10 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# Note: Use zone seal message instead of 0x104 line to start timeline
+# as there are pre-boss adds to start the encounter.
 
 ### Phase 1 (100%)
-0.0 "--sync--" sync /:Engage!/ window 0,1
 0.0 "--sync--" sync / 00:0839::Bioweapon Storage will be sealed off/ window 10,10
 6.4 "Tail Slap" sync / 1[56]:[^:]*:Melusine:7A8:/ window 7,0
 12.3 "Cursed Voice" sync / 1[56]:[^:]*:Melusine:7AC:/

diff --git a/02-arr/raid/t8.txt b/02-arr/raid/t8.txt
@@ -4,16 +4,15 @@
 # Note: sadly there's nothing in the logs about towers and so
 # there's no way to really include them here.
 
+# Note: Use zone seal message instead of 0x104 line to start timeline
+# as there are pre-boss adds to start the encounter.
+
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
 ### Phase 1: introduction to towers
 0.0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
 0.0 "--sync--" sync / 00:0839::The central bow will be sealed off/ window 10,10
-3.5 "--sync--" sync / 1[56]:[^:]*:The Avatar:7C[01]:/ window 3.5,0
 6.1 "Diffusion Ray" sync / 1[56]:[^:]*:The Avatar:7C2:/ window 7,10
 26.0 "Homing Missile" sync / 1[56]:[^:]*:The Avatar:7C7:/
 27.2 "Diffusion Ray" sync / 1[56]:[^:]*:The Avatar:7C2:/

diff --git a/02-arr/raid/t9.txt b/02-arr/raid/t9.txt
@@ -4,13 +4,10 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 ### Phase 1
 # This phase really doesn't seem to loop anywhere.
 0.0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-2.5 "--sync--" sync / 1[56]:[^:]*:Nael deus Darnus:367:/ window 3,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 5.5 "Ravensclaw" sync / 1[56]:[^:]*:Nael deus Darnus:7D5:/ window 6,5
 16.6 "Ravensclaw" sync / 1[56]:[^:]*:Nael deus Darnus:7D5:/
 

diff --git a/02-arr/trial/cape_westwind.js b/02-arr/trial/cape_westwind.js
diff --git a/02-arr/trial/cape_westwind.txt b/02-arr/trial/cape_westwind.txt
diff --git a/02-arr/trial/ifrit-nm.txt b/02-arr/trial/ifrit-nm.txt
@@ -4,11 +4,9 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 # 0%
 0.0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 1.2 "Incinerate" sync / 1[56]:[^:]*:Ifrit:1C5:/ window 10,10
 9.1 "Vulcan Burst" sync / 1[56]:[^:]*:Ifrit:1C6:/
 17.1 "Incinerate" sync / 1[56]:[^:]*:Ifrit:1C5:/

diff --git a/02-arr/trial/levi-ex.txt b/02-arr/trial/levi-ex.txt
@@ -35,12 +35,9 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 ### Phase 1: Literally Just Autos (100% -> 90%)
 0.0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-2.7 "--sync--" sync / 1[56]:[^:]*:Leviathan:822:/ window 3,1
+0.0 "--sync--" sync / 104:[^:]*: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/02-arr/trial/shiva-ex.txt b/02-arr/trial/shiva-ex.txt
@@ -34,10 +34,8 @@
 hideall "--sync--"
 hideall "--Reset--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 # Phase 1: Literally Just Autos (100% -> 95%)
-0.0 "--sync--" sync /:Engage!/ window 0,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 2.0 "--sync--" sync / 1[56]:[^:]*:Shiva:BE4:/ window 10,10
 
 # jump to staff

diff --git a/02-arr/trial/shiva-hm.txt b/02-arr/trial/shiva-hm.txt
@@ -29,10 +29,8 @@
 hideall "--sync--"
 hideall "--Reset--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 # Phase 1: Literally Just Autos (100% -> 95%)
-0.0 "--sync--" sync /:Engage!/ window 0,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 2.0 "--sync--" sync / 1[56]:[^:]*:Shiva:99A:/ window 10,10
 
 # jump to staff