From 82d283376db1282d8a9cbde19997faadfde3ae4f Mon Sep 17 00:00:00 2001 From: Anthony Samms Date: Thu, 11 Sep 2025 13:33:31 -0400 Subject: [PATCH] add genre below song name --- libs/utils.py | 1 + scenes/game.py | 6 ++++-- scenes/song_select.py | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/utils.py b/libs/utils.py index 7f16d2a..b804daa 100644 --- a/libs/utils.py +++ b/libs/utils.py @@ -209,6 +209,7 @@ class Modifiers: class SessionData: selected_difficulty: int = 0 song_title: str = '' + genre_index: int = 0 result_score: int = 0 result_good: int = 0 result_ok: int = 0 diff --git a/scenes/game.py b/scenes/game.py index 22197ff..79b538a 100644 --- a/scenes/game.py +++ b/scenes/game.py @@ -91,7 +91,7 @@ class GameScreen: ray.set_shader_value_texture(self.mask_shader, ray.get_shader_location(self.mask_shader, "texture1"), tex.textures['balloon']['rainbow'].texture) self.load_sounds() self.init_tja(global_data.selected_song, session_data.selected_difficulty) - self.song_info = SongInfo(session_data.song_title, 'TEST') + self.song_info = SongInfo(session_data.song_title, session_data.genre_index) self.result_transition = ResultTransition(global_data.player_num) self.bpm = 120 if self.tja is not None: @@ -1281,7 +1281,7 @@ class ScoreCounterAnimation: tex.draw_texture('lane', 'score_number', frame=int(counter[i]), x=start_x + (i * margin), y=y, color=self.color) class SongInfo: - def __init__(self, song_name: str, genre: str): + def __init__(self, song_name: str, genre: int): self.song_name = song_name self.genre = genre self.song_title = OutlinedText(song_name, 40, ray.WHITE, ray.BLACK, outline_thickness=5) @@ -1298,6 +1298,8 @@ class SongInfo: dest = ray.Rectangle(text_x, text_y, self.song_title.texture.width, self.song_title.texture.height) self.song_title.draw(self.song_title.default_src, dest, ray.Vector2(0, 0), 0, ray.fade(ray.WHITE, 1 - self.fade.attribute)) + tex.draw_texture('song_info', 'genre', fade=1 - self.fade.attribute, frame=self.genre) + class ResultTransition: def __init__(self, player_num: int): self.player_num = player_num diff --git a/scenes/song_select.py b/scenes/song_select.py index 06880eb..d98d216 100644 --- a/scenes/song_select.py +++ b/scenes/song_select.py @@ -101,6 +101,7 @@ class SongSelectScreen: if self.navigator.items != []: global_data.selected_song = self.navigator.get_current_item().path session_data.selected_difficulty = self.selected_difficulty + session_data.genre_index = self.navigator.get_current_item().box.texture_index self.reset_demo_music() self.navigator.reset_items() audio.unload_all_sounds() @@ -494,11 +495,11 @@ class SongSelectScreen: if self.modifier_selector is not None: self.modifier_selector.draw() + self.indicator.draw(410, 575) + if self.game_transition is not None: self.game_transition.draw() - self.indicator.draw(410, 575) - def draw_3d(self): pass