do a better job at ignoring other than bpm

Jakads · Nov 8, 2019 · ff6a938 · ff6a938
1 parent 325aedf
commit ff6a938
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/catch.py b/src/catch.py
@@ -105,7 +105,7 @@ def randosu(path, content):
 
             # If factor is too high, corner the object, but only if it's truly impossible
             prevx = randnotes[i-1]['x']
-            if abs(diffx) * minsf > max([prevx, 512-prevx]):
+            if abs(diffx) * minsf > max(prevx, 512-prevx):
                 if randx < 0:
                     randx = 0
                 if randx > 512:

diff --git a/src/mania.py b/src/mania.py
@@ -27,13 +27,14 @@ def randosu(path, content):
 
         # Parse BPMs from the next row of [TimingPoints] to [HitObjects]
         for c in content[bpmindex+1:objindex]:
-            # Ignore comments and blanks
-            if c.startswith('//') or c == '\n':
-                continue
-
             # BPM Points: ms,60000/BPM,[],[],[],[],1,[]
             # 60000/BPM = ms per beat
             content_split = c.split(',')
+
+            # Ignore comments and others
+            if c.startswith('//') or len(content_split) != 8:
+                continue
+
             if content_split[6] == '1':
                 bpms.append({
                     # {ms, mpb}

diff --git a/src/std.py b/src/std.py
@@ -27,20 +27,21 @@ def randosu(path, content):
 
         # Parse BPMs from the next row of [TimingPoints] to [HitObjects]
         for c in content[bpmindex+1:objindex]:
-            # Ignore comments and blanks
-            if c.startswith('//') or c == '\n':
-                continue
-
             # BPM Points: ms,60000/BPM,[],[],[],[],1,[]
             # 60000/BPM = ms per beat
             content_split = c.split(',')
+
+            # Ignore comments and others
+            if c.startswith('//') or len(content_split) != 8:
+                continue
+
             if content_split[6] == '1':
                 bpms.append({
                     # {ms, mpb}
                     'ms': float(content_split[0]),
                     'mpb': float(content_split[1])
                 })
-        print('h')
+
         # Parse notes from the next row of [HitObjects] to EOF
         for c in content[objindex+1:]:
             # Ignore comments and blanks