Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

raidboss: timeline netregex for gameLogNoName #6026

Merged
merged 1 commit into from
Dec 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ui/raidboss/data/00-misc/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@
hideall "--Reset--"
hideall "--sync--"

0 "--Reset--" sync / 00:001D:[^:]*:You bid farewell to the striking dummy/ window 10000 jump 0
0 "--Reset--" GameLog { code: "001D", line: "You bid farewell to the striking dummy.*?" } window 10000 jump 0

# two examples with different quoting which should both be supported
0 "--sync--" GameLog { line: 'testNetRegexTimeline' } window 100000,100000
0 "--sync--" GameLog { "line": "testNetRegexTimeline" } window 100000,100000

0 "--sync--" sync / 00:0039:[^:]*:Engage!/ window 100000,100000
0 "--sync--" sync / 00:001D:[^:]*:You bow courteously to the striking dummy/ window 0,1
0 "--sync--" GameLog { code: "0039", line: "Engage!.*?" } window 100000,100000
0 "--sync--" GameLog { code: "001D", line: "You bow courteously to the striking dummy.*?" } window 0,1
3 "Almagest"
6 "Angry Dummy"
10 "Long Castbar" duration 10
15 "Final Sting"
18 "Pentacle Sac (DPS)"
25 "Super Tankbuster" sync / 00:0038:[^:]*:test sync1/ window 30,30
25 "Super Tankbuster" GameLog { code: "0038", line: "test sync1.*?" } window 30,30
30 "Dummy Stands Still"
40 "Death"

50 "--sync--" sync / 00:0038:[^:]*:test sync2/ window 100,1 forcejump "loop"
50 "--sync--" GameLog { code: "0038", line: "test sync2.*?" } window 100,1 forcejump "loop"

# Loop test!
100 label "loop"
Expand All @@ -44,5 +44,5 @@ hideall "--sync--"
106 "Six"
110 "Ten" #duration 100
115 "Fifteen"
118 "Force Jump Three" sync / 00:0038:[^:]*:test sync3/ window 10,10 forcejump "three"
120 "Invisible" sync / 00:0038:[^:]*:test sync4/ forcejump 1000
118 "Force Jump Three" GameLog { code: "0038", line: "test sync3.*?" } window 10,10 forcejump "three"
120 "Invisible" GameLog { code: "0038", line: "test sync4.*?" } forcejump 1000
2 changes: 1 addition & 1 deletion ui/raidboss/data/04-sb/alliance/orbonne_monastery.txt
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ hideall "--sync--"
6371.3 "Flare IV"

### Phase 3: 15% off Demi-Virgo Combo Platter
6500.0 "--sync--" sync / 00:0044:[^:]*:I see it now/ window 500,0
6500.0 "--sync--" GameLog { code: "0044", line: "I see it now.*?" } window 500,0

6503.0 "Demi-Virgo Line/Tether" Ability { id: "38C2", source: "Ultima, the High Seraph" } window 8,8
6509.1 "Redemption" Ability { id: "38AA", source: "Ultima, the High Seraph" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ hideall "--start--"
2208.3 "--lock out--" # ??? from video

# 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
2400.0 "--sync--" GameLog { code: "0044", line: "The heavens tremble in my wake.*?" } window 500,0
2417.6 "--sync--" StartsUsing { id: "268A", source: "Rofocale" } window 500,10
2421.1 "Heavenly Subjugation"
2433.5 "Embrace" Ability { id: "2685", source: "Rofocale" }
Expand Down
2 changes: 1 addition & 1 deletion ui/raidboss/data/04-sb/raid/o12n.txt
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ hideall "--sync--"


### Phase 4: Laser Show Forever
1800.0 "Enrage" sync / 00:0044:[^:]*:\<blip\> Warning\. Calculations indicate/ window 1800,0
1800.0 "Enrage" GameLog { code: "0044", line: "\<blip\> Warning\. Calculations indicate.*?" } window 1800,0

1806.0 "Laser Shower Enrage" Ability { id: "3311", source: "Omega-M" } window 20,20
1806.0 "Laser Shower Enrage" Ability { id: "3312", source: "Omega" } window 20,20
Expand Down
2 changes: 1 addition & 1 deletion ui/raidboss/data/04-sb/raid/o12s.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ hideall "--sync--"
# Use autos/chatlog instead of InCombat lines to start timelines for door & final boss
# as timeline resets out of combat.

0.0 "Start" sync / 00:0044:[^:]*:I am the Omega/ window 1,0
0.0 "Start" GameLog { code: "0044", line: "I am the Omega.*?" } window 1,0
2.4 "--sync--" Ability { id: "337D", source: "Omega-M" } window 2.4,0.5 # first auto
11.7 "Synthetic Shield" Ability { id: "32FD", source: "Omega-M" } window 12,5
19.7 "Suppression" Ability { id: "3345", source: "Omega-M" }
Expand Down
2 changes: 1 addition & 1 deletion ui/raidboss/data/06-ew/trial/endsinger.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ hideall "--sync--"
1101.1 "Katastrophe"
1112.2 "Katastrophe"
1123.3 "Katastrophe"
1200.0 "--sync--" sync / 00:0039:[^:]*:10 seconds until oblivion is sealed/ window 200,0
1200.0 "--sync--" GameLog { code: "0039", line: "10 seconds until oblivion is sealed.*?" } window 200,0
1212.2 "Ultimate Fate" Ability { id: "6B59", source: "The Endsinger" } window 10,10
1218.9 "--targetable--"

Expand Down