From 8cac7ea2bd79f4fba8c546924249e6bd214deb25 Mon Sep 17 00:00:00 2001 From: Adrienne Walker Date: Fri, 15 Dec 2023 12:06:07 -0800 Subject: [PATCH] raidboss: timeline netregex for gainsEffectWithTarget `/sync\s*\/ 1A:(?[^:]*):(?[^:]*):\[\^:\]\*:\[\^:\]\*:\[\^:\]\*:\[\^:\]\*:(?[^:]*):\//` Done by running #5977. --- ui/raidboss/data/04-sb/raid/o7n.txt | 8 ++++---- ui/raidboss/data/04-sb/raid/o7s.txt | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ui/raidboss/data/04-sb/raid/o7n.txt b/ui/raidboss/data/04-sb/raid/o7n.txt index 3acdda1105..70bb8c9402 100644 --- a/ui/raidboss/data/04-sb/raid/o7n.txt +++ b/ui/raidboss/data/04-sb/raid/o7n.txt @@ -10,7 +10,7 @@ hideall "--sync--" 39 "Load" Ability { id: "275C", source: "Guardian" } # Ultros -200 "--sync--" sync / 1A:5D1:Ultros Simulation:[^:]*:[^:]*:[^:]*:[^:]*:Guardian:/ window 2000,2000 +200 "--sync--" GainsEffect { effectId: "5D1", effect: "Ultros Simulation", target: "Guardian" } window 2000,2000 203 "Ink" Ability { id: "275D", source: "Guardian" } 209 "Diffractive Plasma" Ability { id: "276E", source: "Guardian" } 219 "Tentacle Simulation" Ability { id: "275E", source: "Guardian" } @@ -27,7 +27,7 @@ hideall "--sync--" 284 "Load" Ability { id: "275C", source: "Guardian" } # Dadaluma -400 "--sync--" sync / 1A:5D3:Dadaluma Simulation:[^:]*:[^:]*:[^:]*:[^:]*:Guardian:/ window 2000,2000 +400 "--sync--" GainsEffect { effectId: "5D3", effect: "Dadaluma Simulation", target: "Guardian" } window 2000,2000 404 "Shockwave" Ability { id: "2766", source: "Guardian" } 415 "--sync--" Ability { id: "276B", source: "Guardian" } jump 1215 # rare version 424 "Chakra Burst" Ability { id: "276A", source: "Guardian" } @@ -38,7 +38,7 @@ hideall "--sync--" 460 "Load" Ability { id: "275C", source: "Guardian" } # Air Force -600 "--sync--" sync / 1A:5D2:Air Force Simulation:[^:]*:[^:]*:[^:]*:[^:]*:Guardian:/ window 2000,2000 +600 "--sync--" GainsEffect { effectId: "5D2", effect: "Air Force Simulation", target: "Guardian" } window 2000,2000 604 "Diffractive Laser" Ability { id: "2761", source: "Guardian" } 613 "Missile Simulation" Ability { id: "2764", source: "Guardian" } 614 "--sync--" Ability { id: "276F", source: "Guardian" } jump 1014 # rare version @@ -52,7 +52,7 @@ hideall "--sync--" 688 "Load" Ability { id: "275C", source: "Guardian" } # Bibliotaph -800 "--sync--" sync / 1A:5D4:Bibliotaph Simulation:[^:]*:[^:]*:[^:]*:[^:]*:Guardian:/ window 2000,2000 +800 "--sync--" GainsEffect { effectId: "5D4", effect: "Bibliotaph Simulation", target: "Guardian" } window 2000,2000 817 "Demon Simulation" Ability { id: "2752", source: "Guardian" } 824 "Run Program" Ability { id: "276F", source: "Guardian" } 838 "Burst/Darkness" Ability { id: "29(BF|C0)", source: "Bibliotaph" } diff --git a/ui/raidboss/data/04-sb/raid/o7s.txt b/ui/raidboss/data/04-sb/raid/o7s.txt index 474afca5fe..2860aed4ea 100644 --- a/ui/raidboss/data/04-sb/raid/o7s.txt +++ b/ui/raidboss/data/04-sb/raid/o7s.txt @@ -8,7 +8,7 @@ hideall "--sync--" 31 "Atomic Ray" Ability { id: "278D", source: "Guardian" } 40 "Prey" Ability { id: "278A", source: "Guardian" } 49 "Load?" Ability { id: "275C", source: "Guardian" } -50 "--sync--" sync / 1A:5D3:Dadaluma Simulation:[^:]*:[^:]*:[^:]*:[^:]*:Guardian:/ jump 1050 +50 "--sync--" GainsEffect { effectId: "5D3", effect: "Dadaluma Simulation", target: "Guardian" } jump 1050 52 "Shockwave?" # This is Version A of the encounter, with Bibliotaph first @@ -92,8 +92,8 @@ hideall "--sync--" # Divergence point 509 "Load/Skip?" Ability { id: "(275C|2773)", source: "Guardian" } -510 "--sync--" sync / 1A:5D4:Bibliotaph Simulation:[^:]*:[^:]*:[^:]*:[^:]*:Guardian:/ jump 2510 # Bibliotaph buff, jump to A1 -510 "--sync--" sync / 1A:5D3:Dadaluma Simulation:[^:]*:[^:]*:[^:]*:[^:]*:Guardian:/ jump 3510 # Dadaluma buff, jump to A2 +510 "--sync--" GainsEffect { effectId: "5D4", effect: "Bibliotaph Simulation", target: "Guardian" } jump 2510 # Bibliotaph buff, jump to A1 +510 "--sync--" GainsEffect { effectId: "5D3", effect: "Dadaluma Simulation", target: "Guardian" } jump 3510 # Dadaluma buff, jump to A2 512 "Shockwave?" 519 "Demon Simulation?" @@ -274,8 +274,8 @@ hideall "--sync--" # Divergence point 1481 "Load/Skip?" Ability { id: "(275C|2773)", source: "Guardian" } -1482 "--sync--" sync / 1A:5D4:Bibliotaph Simulation:[^:]*:[^:]*:[^:]*:[^:]*:Guardian:/ jump 4482 # Bibliotaph buff, jump to B1 -1482 "--sync--" sync / 1A:5D3:Dadaluma Simulation:[^:]*:[^:]*:[^:]*:[^:]*:Guardian:/ jump 5482 # Dadaluma buff, jump to B2 +1482 "--sync--" GainsEffect { effectId: "5D4", effect: "Bibliotaph Simulation", target: "Guardian" } jump 4482 # Bibliotaph buff, jump to B1 +1482 "--sync--" GainsEffect { effectId: "5D3", effect: "Dadaluma Simulation", target: "Guardian" } jump 5482 # Dadaluma buff, jump to B2 1484 "Shockwave?" 1491 "Demon Simulation?"