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: normalize timelines in preparation for conversion #5975

Merged
merged 2 commits into from
Dec 2, 2023

Conversation

quisquous
Copy link
Owner

  • Various sync fixes where it is clearly broken.
  • Various sync massaging to look like other syncs.
  • Break apart any (source1:id1|source2:id2) into (source1|source2):(id1:id2)
  • Adjust LakshmiEx timeline to avoid sync /.*/ by adding filler.

- Various sync fixes where it is clearly broken.
- Various sync massaging to look like other syncs.
- Break apart any (source1:id1|source2:id2) into (source1|source2):(id1:id2)
- Adjust LakshmiEx timeline to avoid sync /.*/ by adding filler.
@quisquous
Copy link
Owner Author

These are all manual changes, so need a careful eye. @JLGarber do you have any time to do a review of this and double check my work?

This is all to make #5977 work more easily.

Comment on lines +12 to +22
7.5 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:12EE:/
11.6 "Splash x3" duration 3 #sync / 1[56]:[^:]*:Living Liquid:12EF:/
19.9 "Protean Wave" sync / 1[56]:[^:]*:Living Liquid:12F0:/
23.5 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:12EE:/
27.6 "Splash x3" duration 3 #sync / 1[56]:[^:]*:Living Liquid:12EF:/
32.9 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:12EE:/
39.0 "Sluice" sync / 1[56]:[^:]*:Living Liquid:12F2:/
42.0 "--sync--" sync / 1[56]:[^:]*:Living Liquid:12F3:/
44.0 "--sync--" sync / 1[56]:[^:]*:Living Liquid:12F4:/
47.2 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:12EE:/
53.3 "Splash x3" duration 3 #sync / 1[56]:[^:]*:Living Liquid:12EF:/
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm genuinely surprised these weren't correct at the time. I updated make_timeline something like two weeks before this was merged!

ui/raidboss/data/04-sb/raid/o6s.txt Outdated Show resolved Hide resolved
936.2 "Chorus Of The Lost" sync / 1[56]:[^:]*:416C:Hades:/
936.2 "Chorus Of The Lost" sync / 1[56]:[^:]*:Hades:416C:/
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same situation here, I think this should be 14: etc.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this one seems unlikely, as there is a 14 line at 906.5, and 906.5/936.2 parallels the later 1068.5/1098.2.

ui/raidboss/data/05-shb/ultimate/the_epic_of_alexander.txt Outdated Show resolved Hide resolved
@quisquous quisquous merged commit 6a11df5 into main Dec 2, 2023
6 checks passed
@quisquous quisquous deleted the timeline_normalize branch December 2, 2023 17:14
github-actions bot pushed a commit that referenced this pull request Dec 2, 2023
…ersion (#5975)

- Various sync fixes where it is clearly broken.
- Various sync massaging to look like other syncs.
- Break apart any (source1:id1|source2:id2) into
(source1|source2):(id1:id2)
- Adjust LakshmiEx timeline to avoid sync /.*/ by adding filler. 6a11df5
github-actions bot pushed a commit that referenced this pull request Dec 2, 2023
…ersion (#5975)

- Various sync fixes where it is clearly broken.
- Various sync massaging to look like other syncs.
- Break apart any (source1:id1|source2:id2) into
(source1|source2):(id1:id2)
- Adjust LakshmiEx timeline to avoid sync /.*/ by adding filler. 6a11df5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants