diff --git a/Fruit_Jam/Larsio_Paint_Music/sound_manager.py b/Fruit_Jam/Larsio_Paint_Music/sound_manager.py index 5746f873b..5520669d5 100755 --- a/Fruit_Jam/Larsio_Paint_Music/sound_manager.py +++ b/Fruit_Jam/Larsio_Paint_Music/sound_manager.py @@ -141,37 +141,37 @@ class SoundManager: try: # Channel 1 samples self.samples = { - 59: audiocore.WaveFile("/samples/larso_B3.wav"), # B3 - 60: audiocore.WaveFile("/samples/larso_C4.wav"), # C4 - 62: audiocore.WaveFile("/samples/larso_D4.wav"), # D4 - 64: audiocore.WaveFile("/samples/larso_E4.wav"), # E4 - 65: audiocore.WaveFile("/samples/larso_F4.wav"), # F4 - 67: audiocore.WaveFile("/samples/larso_G4.wav"), # G4 - 69: audiocore.WaveFile("/samples/larso_A4.wav"), # A4 - 71: audiocore.WaveFile("/samples/larso_B4.wav"), # B4 - 72: audiocore.WaveFile("/samples/larso_C5.wav"), # C5 - 74: audiocore.WaveFile("/samples/larso_D5.wav"), # D5 - 76: audiocore.WaveFile("/samples/larso_E5.wav"), # E5 - 77: audiocore.WaveFile("/samples/larso_F5.wav"), # F5 - 79: audiocore.WaveFile("/samples/larso_G5.wav"), # G5 + 59: audiocore.WaveFile("samples/larso_B3.wav"), # B3 + 60: audiocore.WaveFile("samples/larso_C4.wav"), # C4 + 62: audiocore.WaveFile("samples/larso_D4.wav"), # D4 + 64: audiocore.WaveFile("samples/larso_E4.wav"), # E4 + 65: audiocore.WaveFile("samples/larso_F4.wav"), # F4 + 67: audiocore.WaveFile("samples/larso_G4.wav"), # G4 + 69: audiocore.WaveFile("samples/larso_A4.wav"), # A4 + 71: audiocore.WaveFile("samples/larso_B4.wav"), # B4 + 72: audiocore.WaveFile("samples/larso_C5.wav"), # C5 + 74: audiocore.WaveFile("samples/larso_D5.wav"), # D5 + 76: audiocore.WaveFile("samples/larso_E5.wav"), # E5 + 77: audiocore.WaveFile("samples/larso_F5.wav"), # F5 + 79: audiocore.WaveFile("samples/larso_G5.wav"), # G5 } print("Loaded channel 1 WAV samples") # Load samples for channel 2 self.heart_samples = { - 59: audiocore.WaveFile("/samples/musicnote16_B3.wav"), # B3 - 60: audiocore.WaveFile("/samples/musicnote16_C4.wav"), # C4 - 62: audiocore.WaveFile("/samples/musicnote16_D4.wav"), # D4 - 64: audiocore.WaveFile("/samples/musicnote16_E4.wav"), # E4 - 65: audiocore.WaveFile("/samples/musicnote16_F4.wav"), # F4 - 67: audiocore.WaveFile("/samples/musicnote16_G4.wav"), # G4 - 69: audiocore.WaveFile("/samples/musicnote16_A4.wav"), # A4 - 71: audiocore.WaveFile("/samples/musicnote16_B4.wav"), # B4 - 72: audiocore.WaveFile("/samples/musicnote16_C5.wav"), # C5 - 74: audiocore.WaveFile("/samples/musicnote16_D5.wav"), # D5 - 76: audiocore.WaveFile("/samples/musicnote16_E5.wav"), # E5 - 77: audiocore.WaveFile("/samples/musicnote16_F5.wav"), # F5 - 79: audiocore.WaveFile("/samples/musicnote16_G5.wav"), # G5 + 59: audiocore.WaveFile("samples/musicnote16_B3.wav"), # B3 + 60: audiocore.WaveFile("samples/musicnote16_C4.wav"), # C4 + 62: audiocore.WaveFile("samples/musicnote16_D4.wav"), # D4 + 64: audiocore.WaveFile("samples/musicnote16_E4.wav"), # E4 + 65: audiocore.WaveFile("samples/musicnote16_F4.wav"), # F4 + 67: audiocore.WaveFile("samples/musicnote16_G4.wav"), # G4 + 69: audiocore.WaveFile("samples/musicnote16_A4.wav"), # A4 + 71: audiocore.WaveFile("samples/musicnote16_B4.wav"), # B4 + 72: audiocore.WaveFile("samples/musicnote16_C5.wav"), # C5 + 74: audiocore.WaveFile("samples/musicnote16_D5.wav"), # D5 + 76: audiocore.WaveFile("samples/musicnote16_E5.wav"), # E5 + 77: audiocore.WaveFile("samples/musicnote16_F5.wav"), # F5 + 79: audiocore.WaveFile("samples/musicnote16_G5.wav"), # G5 } print("Loaded channel 2 WAV samples") @@ -179,19 +179,19 @@ class SoundManager: self.drum_samples = {} try: self.drum_samples = { - 59: audiocore.WaveFile("/samples/kick_01.wav"), - 60: audiocore.WaveFile("/samples/kick_01.wav"), - 62: audiocore.WaveFile("/samples/kick_01.wav"), - 64: audiocore.WaveFile("/samples/snare_01.wav"), - 65: audiocore.WaveFile("/samples/snare_01.wav"), - 67: audiocore.WaveFile("/samples/snare_01.wav"), - 69: audiocore.WaveFile("/samples/chat_01.wav"), - 71: audiocore.WaveFile("/samples/chat_01.wav"), - 72: audiocore.WaveFile("/samples/chat_01.wav"), - 74: audiocore.WaveFile("/samples/ohat_01.wav"), - 76: audiocore.WaveFile("/samples/ohat_01.wav"), - 77: audiocore.WaveFile("/samples/crash_01.wav"), - 79: audiocore.WaveFile("/samples/crash_01.wav"), + 59: audiocore.WaveFile("samples/kick_01.wav"), + 60: audiocore.WaveFile("samples/kick_01.wav"), + 62: audiocore.WaveFile("samples/kick_01.wav"), + 64: audiocore.WaveFile("samples/snare_01.wav"), + 65: audiocore.WaveFile("samples/snare_01.wav"), + 67: audiocore.WaveFile("samples/snare_01.wav"), + 69: audiocore.WaveFile("samples/chat_01.wav"), + 71: audiocore.WaveFile("samples/chat_01.wav"), + 72: audiocore.WaveFile("samples/chat_01.wav"), + 74: audiocore.WaveFile("samples/ohat_01.wav"), + 76: audiocore.WaveFile("samples/ohat_01.wav"), + 77: audiocore.WaveFile("samples/crash_01.wav"), + 79: audiocore.WaveFile("samples/crash_01.wav"), } print("Loaded channel 3 WAV samples (drums)") except Exception as e: @@ -204,7 +204,7 @@ class SoundManager: print(f"Error loading WAV samples: {e}") # Fallback to basic samples if there's an error self.samples = { - 65: audiocore.WaveFile("/samples/musicnote01.wav"), # Default sample + 65: audiocore.WaveFile("samples/musicnote01.wav"), # Default sample } self.heart_samples = self.samples # Use same samples as fallback self.drum_samples = self.samples # Use same samples as fallback diff --git a/Fruit_Jam/Larsio_Paint_Music/sprite_manager.py b/Fruit_Jam/Larsio_Paint_Music/sprite_manager.py index 1e6a513c9..644a77ca5 100755 --- a/Fruit_Jam/Larsio_Paint_Music/sprite_manager.py +++ b/Fruit_Jam/Larsio_Paint_Music/sprite_manager.py @@ -80,21 +80,21 @@ class SpriteManager: try: # Load the Lars note bitmap for channel 1 notes self.mario_head, self.mario_palette = adafruit_imageload.load( - "/sprites/lars_note.bmp" + "sprites/lars_note.bmp" ) # Make the background color transparent (not just the same color) self.mario_palette.make_transparent(0) # Load the Heart note bitmap for channel 2 notes self.heart_note, self.heart_palette = adafruit_imageload.load( - "/sprites/heart_note.bmp" + "sprites/heart_note.bmp" ) # Make the background color transparent self.heart_palette.make_transparent(0) # Load the Drum note bitmap for channel 3 notes self.drum_note, self.drum_palette = adafruit_imageload.load( - "/sprites/drum_note.bmp" + "sprites/drum_note.bmp" ) # Make the background color transparent self.drum_palette.make_transparent(0) @@ -102,18 +102,18 @@ class SpriteManager: # Load the new sprites for channels 4, 5, and 6 # Meatball for channel 4 self.meatball_note, self.meatball_palette = adafruit_imageload.load( - "/sprites/meatball.bmp" + "sprites/meatball.bmp" ) self.meatball_palette.make_transparent(0) # Star for channel 5 self.star_note, self.star_palette = adafruit_imageload.load( - "/sprites/star.bmp" + "sprites/star.bmp" ) self.star_palette.make_transparent(0) # Bot for channel 6 - self.bot_note, self.bot_palette = adafruit_imageload.load("/sprites/bot.bmp") + self.bot_note, self.bot_palette = adafruit_imageload.load("sprites/bot.bmp") self.bot_palette.make_transparent(0) except Exception as e: @@ -171,45 +171,45 @@ class SpriteManager: try: # Load play button images self.play_up, self.play_up_palette = adafruit_imageload.load( - "/sprites/play_up.bmp" + "sprites/play_up.bmp" ) self.play_up_palette.make_transparent(0) self.play_down, self.play_down_palette = adafruit_imageload.load( - "/sprites/play_down.bmp" + "sprites/play_down.bmp" ) self.play_down_palette.make_transparent(0) # Load stop button images self.stop_up, self.stop_up_palette = adafruit_imageload.load( - "/sprites/stop_up.bmp" + "sprites/stop_up.bmp" ) self.stop_up_palette.make_transparent(0) self.stop_down, self.stop_down_palette = adafruit_imageload.load( - "/sprites/stop_down.bmp" + "sprites/stop_down.bmp" ) self.stop_down_palette.make_transparent(0) # Load loop button images self.loop_up, self.loop_up_palette = adafruit_imageload.load( - "/sprites/loop_up.bmp" + "sprites/loop_up.bmp" ) self.loop_up_palette.make_transparent(0) self.loop_down, self.loop_down_palette = adafruit_imageload.load( - "/sprites/loop_down.bmp" + "sprites/loop_down.bmp" ) self.loop_down_palette.make_transparent(0) # Load clear button images self.clear_up, self.clear_up_palette = adafruit_imageload.load( - "/sprites/clear_up.bmp" + "sprites/clear_up.bmp" ) self.clear_up_palette.make_transparent(0) self.clear_down, self.clear_down_palette = adafruit_imageload.load( - "/sprites/clear_down.bmp" + "sprites/clear_down.bmp" ) self.clear_down_palette.make_transparent(0)