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.

Sign up for GitHub

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

Jump to bottom

raidboss: timeline netregex for idGroups #6041

Merged
merged 1 commit into from
Dec 15, 2023
Merged

raidboss: timeline netregex for idGroups #6041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions ui/raidboss/data/02-arr/trial/ultima-ex.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,9 @@ hideall "--sync--"
1015.6 "Homing Lasers" Ability { id: "5E1", source: "The Ultima Weapon" }
1019.9 "Ceruleum Vent" Ability { id: "5E0", source: "The Ultima Weapon" }
1023.1 "Viscous Aetheroplasm" Ability { id: "5DF", source: "The Ultima Weapon" }
1034.1 "Magitek Ray 1" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" }
1037.1 "Magitek Ray 2" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" }
1040.1 "Magitek Ray 3" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" }
1034.1 "Magitek Ray 1" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" }
1037.1 "Magitek Ray 2" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" }
1040.1 "Magitek Ray 3" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" }

1042.7 "--sync--" StartsUsing { id: "5EA", source: "The Ultima Weapon" } window 45,45
1045.9 "Tank Purge" Ability { id: "5EA", source: "The Ultima Weapon" }
Expand All @@ -254,17 +254,17 @@ hideall "--sync--"
1054.8 "Homing Lasers" Ability { id: "5E1", source: "The Ultima Weapon" } window 20,20
1059.1 "Ceruleum Vent" Ability { id: "5E0", source: "The Ultima Weapon" }
1062.4 "Viscous Aetheroplasm" Ability { id: "5DF", source: "The Ultima Weapon" }
1070.5 "Magitek Ray 1" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" } window 15,1
1073.5 "Magitek Ray 2" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" }
1076.5 "Magitek Ray 3" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" }
1070.5 "Magitek Ray 1" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" } window 15,1
1073.5 "Magitek Ray 2" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" }
1076.5 "Magitek Ray 3" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" }
1080.8 "Viscous Aetheroplasm" Ability { id: "5DF", source: "The Ultima Weapon" }
1084.1 "Diffractive Laser" Ability { id: "5E2", source: "The Ultima Weapon" } window 10,20
1086.4 "Homing Lasers" Ability { id: "5E1", source: "The Ultima Weapon" } window 10,20
1090.7 "Ceruleum Vent" Ability { id: "5E0", source: "The Ultima Weapon" }
1094.0 "Viscous Aetheroplasm" Ability { id: "5DF", source: "The Ultima Weapon" }
1105.1 "Magitek Ray 1" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" } window 15,1
1108.1 "Magitek Ray 2" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" }
1111.0 "Magitek Ray 3" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" }
1105.1 "Magitek Ray 1" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" } window 15,1
1108.1 "Magitek Ray 2" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" }
1111.0 "Magitek Ray 3" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" }

1113.6 "--sync--" StartsUsing { id: "5EA", source: "The Ultima Weapon" } window 45,45 jump 1042.7
1116.8 "Tank Purge" Ability { id: "5EA", source: "The Ultima Weapon" }
Expand All @@ -273,9 +273,9 @@ hideall "--sync--"
1125.8 "Homing Lasers" Ability { id: "5E1", source: "The Ultima Weapon" }
1130.1 "Ceruleum Vent" Ability { id: "5E0", source: "The Ultima Weapon" }
1133.4 "Viscous Aetheroplasm" Ability { id: "5DF", source: "The Ultima Weapon" }
1141.5 "Magitek Ray 1" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" }
1144.5 "Magitek Ray 2" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" }
1147.5 "Magitek Ray 3" Ability { id: "(5E3|5E4|5E5)", source: "The Ultima Weapon" }
1141.5 "Magitek Ray 1" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" }
1144.5 "Magitek Ray 2" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" }
1147.5 "Magitek Ray 3" Ability { id: ["5E3", "5E4", "5E5"], source: "The Ultima Weapon" }
1151.8 "Viscous Aetheroplasm" Ability { id: "5DF", source: "The Ultima Weapon" }


Expand Down
2 changes: 1 addition & 1 deletion ui/raidboss/data/03-hw/alliance/dun_scaith.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ hideall "--sync--"
3013.1 "Thirty Thorns" Ability { id: "1D2B", source: "Scathach" }
3030.2 "Thirty Arrows" Ability { id: "1D2F", source: "Scathach" } window 30,5
3037.4 "Manos" Ability { id: "1CD3", source: "Scathach" } window 30,5
3047.7 "--sync--" Ability { id: "(1D1[EF])", source: "Scathach" }
3047.7 "--sync--" Ability { id: ["1D1[EF]"], source: "Scathach" }
3049.0 "Shadespin" Ability { id: "1D20", source: "Scathach" }
3052.8 "Thirty Sickles" Ability { id: "1D31", source: "Scathach" }
3056.0 "Soar" Ability { id: "1D1B", source: "Scathach" }
Expand Down
26 changes: 13 additions & 13 deletions ui/raidboss/data/03-hw/raid/a10n.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ hideall "--sync--"
37.5 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" }
45.6 "Gobrush Rushgob" Ability { id: "1ACF", source: "Lamebrix Strikebocks" }
49.7 "Gobsway Rumblerocks" Ability { id: "1AD0", source: "Lamebrix Strikebocks" }
56.7 "Trap" Ability { id: "(1AB0|1AB1)", source: "Lamebrix Strikebocks" } window 56.7,5
56.7 "Trap" Ability { id: ["1AB0", "1AB1"], source: "Lamebrix Strikebocks" } window 56.7,5
58.0 "--sync--" Ability { id: "1AA2", source: "Lamebrix Strikebocks" }
61.1 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" }
61.7 "Frostbite/Impact" Ability { id: "(1AC7|1AC6)", source: ["Blizzard Arrow", "Weight of the World"] }
69.0 "Trap" Ability { id: "(1AB0|1AB1)", source: "Lamebrix Strikebocks" }
61.7 "Frostbite/Impact" Ability { id: ["1AC7", "1AC6"], source: ["Blizzard Arrow", "Weight of the World"] }
69.0 "Trap" Ability { id: ["1AB0", "1AB1"], source: "Lamebrix Strikebocks" }
70.3 "--sync--" Ability { id: "1AA2", source: "Lamebrix Strikebocks" }
74.0 "Impact/Frostbite" Ability { id: "(1AC7|1AC6)", source: ["Blizzard Arrow", "Weight of the World"] }
74.0 "Impact/Frostbite" Ability { id: ["1AC7", "1AC6"], source: ["Blizzard Arrow", "Weight of the World"] }
74.9 "Illuminati Hand Cannon" Ability { id: "1AD2", source: "Lamebrix Strikebocks" }
78.0 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" }
87.1 "Gobslash Slicetops" Ability { id: "1AD1", source: "Lamebrix Strikebocks" }
Expand Down Expand Up @@ -62,15 +62,15 @@ hideall "--sync--"
309.2 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" } window 200,10
317.3 "Gobrush Rushgob" Ability { id: "1ACF", source: "Lamebrix Strikebocks" }

321.4 "--sync--" Ability { id: "(1AB8|1AB9)", source: "Lamebrix Strikebocks" }
321.4 "--sync--" Ability { id: ["1AB8", "1AB9"], source: "Lamebrix Strikebocks" }
324.6 "--sync--" Ability { id: "1A97", source: "Lamebrix Strikebocks" }
325.5 "Gobspin Whooshdrops/Gobswipe Conklops" Ability { id: "(1ACB|1ACC)", source: "Lamebrix Strikebocks" } window 25,10
325.5 "Gobspin Whooshdrops/Gobswipe Conklops" Ability { id: ["1ACB", "1ACC"], source: "Lamebrix Strikebocks" } window 25,10
331.6 "Gobsway Rumblerocks" Ability { id: "1AD0", source: "Lamebrix Strikebocks" }
335.6 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" }
339.7 "Gobsway Rumblerocks" Ability { id: "1AD0", source: "Lamebrix Strikebocks" }
344.7 "--sync--" Ability { id: "(1AB8|1AB9)", source: "Lamebrix Strikebocks" }
344.7 "--sync--" Ability { id: ["1AB8", "1AB9"], source: "Lamebrix Strikebocks" }
347.9 "--sync--" Ability { id: "1A97", source: "Lamebrix Strikebocks" }
348.8 "Gobswipe Conklops/Gobspin Whooshdrops" Ability { id: "(1ACB|1ACC)", source: "Lamebrix Strikebocks" } window 10,10
348.8 "Gobswipe Conklops/Gobspin Whooshdrops" Ability { id: ["1ACB", "1ACC"], source: "Lamebrix Strikebocks" } window 10,10
355.9 "Gobsway Rumblerocks" Ability { id: "1AD0", source: "Lamebrix Strikebocks" }
360.0 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" }
368.1 "Gobrush Rushgob" Ability { id: "1ACF", source: "Lamebrix Strikebocks" }
Expand All @@ -81,11 +81,11 @@ hideall "--sync--"
385.3 "Gobsway Rumblerocks" Ability { id: "1AD0", source: "Lamebrix Strikebocks" }
389.3 "Gobsway Rumblerocks" Ability { id: "1AD0", source: "Lamebrix Strikebocks" }
393.3 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" }
398.2 "Trap #1" Ability { id: "(1AB0|1AB1)", source: "Lamebrix Strikebocks" } window 100,2.5
402.3 "Trap #2" Ability { id: "(1AB0|1AB1)", source: "Lamebrix Strikebocks" }
403.2 "Frostbite/Impact" Ability { id: "(1AC7|1AC6)", source: ["Blizzard Arrow", "Weight of the World"] }
398.2 "Trap #1" Ability { id: ["1AB0", "1AB1"], source: "Lamebrix Strikebocks" } window 100,2.5
402.3 "Trap #2" Ability { id: ["1AB0", "1AB1"], source: "Lamebrix Strikebocks" }
403.2 "Frostbite/Impact" Ability { id: ["1AC7", "1AC6"], source: ["Blizzard Arrow", "Weight of the World"] }
403.6 "--sync--" Ability { id: "1AA2", source: "Lamebrix Strikebocks" }
407.3 "Impact/Frostbite" Ability { id: "(1AC7|1AC6)", source: ["Blizzard Arrow", "Weight of the World"] }
407.3 "Impact/Frostbite" Ability { id: ["1AC7", "1AC6"], source: ["Blizzard Arrow", "Weight of the World"] }
408.9 "Illuminati Hand Cannon" Ability { id: "1AD2", source: "Lamebrix Strikebocks" }
418.1 "Gobslash Slicetops" Ability { id: "1AD1", source: "Lamebrix Strikebocks" }
422.1 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" }
Expand All @@ -101,7 +101,7 @@ hideall "--sync--"
467.2 "Gobrush Rushgob" Ability { id: "1ACF", source: "Lamebrix Strikebocks" }
470.3 "Gobsway Rumblerocks" Ability { id: "1AD0", source: "Lamebrix Strikebocks" }

474.4 "--sync--" Ability { id: "(1AB8|1AB9)", source: "Lamebrix Strikebocks" } window 30,10 jump 321.4
474.4 "--sync--" Ability { id: ["1AB8", "1AB9"], source: "Lamebrix Strikebocks" } window 30,10 jump 321.4
477.6 "Single Charge"
478.5 "Gobspin Whooshdrops/Gobswipe Conklops"
484.6 "Gobsway Rumblerocks"
Expand Down
4 changes: 2 additions & 2 deletions ui/raidboss/data/03-hw/raid/a3n.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ hideall "--sync--"
326.6 "Sluice" Ability { id: "12F2", source: "Living Liquid" }
329.6 "--sync--" Ability { id: "12F3", source: "Living Liquid" }
331.6 "--sync--" Ability { id: "12F4", source: "Living Liquid" }
335.9 "Magnetism/Repel" Ability { id: "(1307|1309)", source: "Living Liquid" }
335.9 "Magnetism/Repel" Ability { id: ["1307", "1309"], source: "Living Liquid" }
344.0 "Fluid Swing" Ability { id: "12F5", source: "Living Liquid" } window 17.4,2.5
346.1 "Splash x4" # Ability { id: "12EF", source: "Living Liquid" }
350.5 "Fluid Swing" Ability { id: "12F5", source: "Living Liquid" }
359.8 "Magnetism/Repel" Ability { id: "(1307|1309)", source: "Living Liquid" }
359.8 "Magnetism/Repel" Ability { id: ["1307", "1309"], source: "Living Liquid" }
365.9 "Fluid Swing" Ability { id: "12F5", source: "Living Liquid" } window 10,2.5
372.0 "Sluice" Ability { id: "12F2", source: "Living Liquid" }
375.0 "--sync--" Ability { id: "12F3", source: "Living Liquid" }
Expand Down
4 changes: 2 additions & 2 deletions ui/raidboss/data/03-hw/raid/a6n.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
1000.0 "--sync--" SystemLogMessage { id: "7DC", param1: "6B8" } window 1000,0
1008.7 "Magicked Mark" Ability { id: "1715", source: "Brawler" } window 8.7,5
1010.8 "Attachment" Ability { id: "1601", source: "Brawler" }
1017.0 "Single Buster/Double Buster/Rocket Drill" Ability { id: "(1717|1718|1719)", source: "Brawler" }
1017.0 "Single Buster/Double Buster/Rocket Drill" Ability { id: ["1717", "1718", "1719"], source: "Brawler" }

1022.1 "Magicked Mark" Ability { id: "1715", source: "Brawler" }
1024.2 "Attachment" Ability { id: "1601", source: "Brawler" } window 5,5
1030.3 "Single Buster/Double Buster/Rocket Drill" Ability { id: "(1717|1718|1719)", source: "Brawler" }
1030.3 "Single Buster/Double Buster/Rocket Drill" Ability { id: ["1717", "1718", "1719"], source: "Brawler" }

1035.4 "Magicked Mark" Ability { id: "1715", source: "Brawler" } jump 1022.1
1037.5 "Attachment"
Expand Down
8 changes: 4 additions & 4 deletions ui/raidboss/data/03-hw/raid/a8s.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ hideall "Brute Force"
322.4 "Mind Blast?" #Ability { id: "1639", source: "Blaster" } # 3 second cast, interruptible
324.5 "Brute Force" #Ability { id: "1638", source: "Blaster Mirage" }
325.6 "Brute Force" Ability { id: "1638", source: "Blaster" }
326.0 "Brawler Mechanic" Ability { id: "(163D|163E|163F|1640)", source: "Brawler" }
326.0 "Brawler Mechanic" Ability { id: ["163D", "163E", "163F", "1640"], source: "Brawler" }

329.4 "Swindler (east)" #NameToggle { name: "Swindler", toggle: "01" }
330.1 "Auxiliary Power" Ability { id: "164B", source: "Brawler" }
Expand All @@ -90,7 +90,7 @@ hideall "Brute Force"

352.4 "Vortexer (south)" #NameToggle { name: "Vortexer", toggle: "01" }
354.6 "Magicked Mark" Ability { id: "1646", source: "Swindler" }
355.5 "Brawler Mechanic" Ability { id: "(163D|163E|163F|1640)", source: "Brawler" }
355.5 "Brawler Mechanic" Ability { id: ["163D", "163E", "163F", "1640"], source: "Brawler" }
359.6 "Auxiliary Power" Ability { id: "164B", source: "Brawler" }
360.4 "Brute Force" Ability { id: "164D", source: "Vortexer" }
363.7 "Magicked Mark" Ability { id: "163B", source: "Brawler" }
Expand All @@ -99,11 +99,11 @@ hideall "Brute Force"
375.9 "Auxiliary Power" Ability { id: "164B", source: "Brawler" }
379.0 "Attachment" Ability { id: "163C", source: "Brawler" }
380.5 "Brute Force" Ability { id: "164D", source: "Vortexer" }
385.0 "Brawler Mechanic" Ability { id: "(163D|163E|163F|1640)", source: "Brawler" }
385.0 "Brawler Mechanic" Ability { id: ["163D", "163E", "163F", "1640"], source: "Brawler" }
390.2 "Auxiliary Power" Ability { id: "164B", source: "Brawler" }
390.6 "Brute Force" Ability { id: "164D", source: "Vortexer" }
393.4 "Attachment" Ability { id: "163C", source: "Brawler" }
399.5 "Brawler Mechanic" Ability { id: "(163D|163E|163F|1640)", source: "Brawler" }
399.5 "Brawler Mechanic" Ability { id: ["163D", "163E", "163F", "1640"], source: "Brawler" }
400.7 "Brute Force" Ability { id: "164D", source: "Vortexer" }
403.6 "Auxiliary Power" Ability { id: "164B", source: "Brawler" }
407.7 "Magicked Mark" Ability { id: "163B", source: "Brawler" }
Expand Down
Loading