Cleaned up implementation, added variables to grab rest of osu data

ABBA.osu

@@ -0,0 +1,55 @@
+osu file format v128
+
+[General]
+AudioFilename: audio.mp3
+AudioLeadIn: 0
+PreviewTime: -1
+Countdown: 0
+SampleSet: Normal
+StackLeniency: 0.7
+Mode: 1
+LetterboxInBreaks: 0
+WidescreenStoryboard: 1
+
+[Editor]
+DistanceSpacing: 1
+BeatDivisor: 4
+GridSize: 0
+TimelineZoom: 1
+
+[Metadata]
+Title: Dancing Queen
+TitleUnicode: Dancing Queen
+Artist: ABBA
+ArtistUnicode: ABBA
+Creator: Guest
+Version: New Difficulty
+
+[Difficulty]
+HPDrainRate: 5
+CircleSize: 5
+OverallDifficulty: 5
+ApproachRate: 5
+SliderMultiplier: 1.4
+SliderTickRate: 1
+
+[Events]
+
+[TimingPoints]
+0,468.7499999999998,4,1,0,100,1,0
+
+[Colours]
+Combo1: 255,192,0,255
+Combo2: 0,202,0,255
+Combo3: 18,124,255,255
+Combo4: 242,24,57,255
+
+[HitObjects]
+256,192,3749,1,0,1:0:0:0:
+256,192,4218,1,2,1:0:0:0:
+256,192,4687,1,4,1:0:0:0:
+256,192,5156,1,6,1:0:0:0:
+256,192,5624,1,8,1:0:0:0:
+256,192,6093,1,12,1:0:0:0:
+256,192,6562,2,0,L|257:193,1,839.8506666666669,1:0:0:0:
+256,192,10312,8,0,13124,1:0:0:0:

osz.py

@@ -19,10 +19,22 @@ osu_file = Path("./Renatus.osu")
 contents = osu_file.open(mode='r', encoding='utf-8').read()
 
 class OsuParser:
-    def __init__(self):
+    def __init__(self, osu_file):
+        self.general = self.read_osu_data(osu_file, target_header="General", is_dict=True)
+        self.editor = self.read_osu_data(osu_file, target_header="Editor", is_dict=True)
+        self.metadata = self.read_osu_data(osu_file, target_header="Metadata", is_dict=True)
+        self.difficulty = self.read_osu_data(osu_file, target_header="Difficulty", is_dict=True)
+        self.events = self.read_osu_data(osu_file, target_header="Events")
+        self.timing_points = self.read_osu_data(osu_file, target_header="TimingPoints")
+        #self.general = self.read_osu_data(osu_file, target_header="Colours", is_dict=True)
+        self.hit_objects = self.read_osu_data(osu_file, target_header="HitObjects")
 
-    def read_osu_data(self, file_path, target_header="HitObjects"):
+        self.osu_NoteList = self.note_data_to_NoteList(self.hit_objects)
+
+    def read_osu_data(self, file_path, target_header="HitObjects", is_dict = False):
         data = []
+        if is_dict:
+            data = {}
         current_header = None
 
         with file_path.open(mode='r', encoding='utf-8') as f:
@@ -40,10 +52,10 @@ class OsuParser:
                         int_array = [float(num_str) for num_str in string_array]
                         data.append(int_array)
 
-                    if re.match(r'\w*\:\s(\w*.?\w*)', line): # General, Editor, Metadata, Difficulty
+                    if re.match(r'(\w*)\:\s?(\w*.?\w*)', line): # General, Editor, Metadata, Difficulty
-                        match = re.search(r'\w*\:\s(\w*.?\w*)', line)
+                        match = re.search(r'(\w*)\:\s?(\w*.?\w*)', line)
                         if match:
-                            data.append(match.group(1))
+                            data[match.group(1)] = match.group(2)
 
                 else:
                     continue
@@ -53,8 +65,10 @@ class OsuParser:
     def note_data_to_NoteList(self, note_data):
         osu_NoteList = NoteList()
         counter = 0
+
         for line in note_data:
-            if line[3] == 1 and line[4] == 0: # DON
+
+            if (line[3] == 1 or line[3] == 4 or line[3] == 5 or line[3] == 6) and line[4] == 0: # DON
                 don = Note()
                 don.type = NoteType(1)
                 don.hit_ms = line[2]
@@ -65,8 +79,10 @@ class OsuParser:
                 don.index = counter
                 counter = counter + 1
                 don.moji = 0
+
                 osu_NoteList.play_notes.append(don)
-            if line[3] == 1 and line[4] != 0: # KAT
+
+            if (line[3] == 1 or line[3] == 4 or line[3] == 5 or line[3] == 6) and (line[4] == 2 or line[4] == 8): # KAT
                 kat = Note()
                 kat.type = NoteType(2)
                 kat.hit_ms = line[2]
@@ -77,13 +93,75 @@ class OsuParser:
                 kat.index = counter
                 counter = counter + 1
                 kat.moji = 1
+
                 osu_NoteList.play_notes.append(kat)
+
+            if (line[3] == 1 or line[3] == 4 or line[3] == 5 or line[3] == 6) and line[4] == 4: # L-DON
+                don = Note()
+                don.type = NoteType(3)
+                don.hit_ms = line[2]
+                don.bpm = 207
+                don.scroll_x = 1
+                don.scroll_y = 0
+                don.display = True
+                don.index = counter
+                counter = counter + 1
+                don.moji = 0
+
+                osu_NoteList.play_notes.append(don)
+
+            if (line[3] == 1 or line[3] == 4 or line[3] == 5 or line[3] == 6) and (line[4] == 6 or line[4] == 12): # L-KAT
+                kat = Note()
+                kat.type = NoteType(4)
+                kat.hit_ms = line[2]
+                kat.bpm = 207
+                kat.scroll_x = 1
+                kat.scroll_y = 0
+                kat.display = True
+                kat.index = counter
+                counter = counter + 1
+                kat.moji = 1
+
+                osu_NoteList.play_notes.append(kat)
+
+            if (line[3] == 2): # Drum Roll
+                source = Note()
+                slider = Drumroll(source)
+
+            if (line[3] == 8): # Balloon
+                print(line)
+                source = Note()
+                source.type = NoteType(7)
+                source.hit_ms = line[2]
+                source.bpm = 207
+                source.scroll_x = 1
+                source.scroll_y = 0
+                source.display = True
+                source.index = counter
+                counter = counter + 1
+                #kat.moji = 1
+
+                balloon = Balloon(source)
+                balloon.type = NoteType(8)
+                balloon.hit_ms = line[5]
+                balloon.bpm = 207
+                balloon.scroll_x = 1
+                balloon.scroll_y = 0
+                balloon.display = True
+                balloon.index = counter
+                counter = counter + 1
+                #kat.moji = 1
+                balloon.count = 999
+
+                osu_NoteList.play_notes.append(balloon)
+
         osu_NoteList.draw_notes = osu_NoteList.play_notes.copy()
+
         return osu_NoteList
 
 
-myparse = OsuParser()
+myparse = OsuParser(osu_file)
 
-print(myparse.read_osu_data(osu_file, target_header="TimingPoints"))
+#print(myparse.osu_NoteList)
 
 

scenes/game.py

@@ -418,9 +418,9 @@ class Player:
 
 ###from libs.osz import OsuParser
     def reset_chart(self):
-        myparse = OsuParser()
         #notes, self.branch_m, self.branch_e, self.branch_n = self.tja.notes_to_position(self.difficulty)
-        notes = myparse.note_data_to_NoteList(myparse.read_osu_data(Path("./PNames.osu")))
+        myparse = OsuParser(Path("./PNames.osu"))
+        notes = myparse.osu_NoteList
         self.branch_m, self.branch_e, self.branch_n = [], [], []
         self.play_notes, self.draw_note_list, self.draw_bar_list = deque(apply_modifiers(notes, self.modifiers)[0]), deque(apply_modifiers(notes, self.modifiers)[1]), deque(apply_modifiers(notes, self.modifiers)[2])