diff --git a/NS.py b/NS.py index 8cba4d9..c89c248 100644 --- a/NS.py +++ b/NS.py @@ -11,6 +11,7 @@ from serial.tools import list_ports from time import sleep from PIL import Image +import pygame from pygame import Surface, Color, mixer from pygame.event import clear from pygame.mixer import Sound @@ -47,6 +48,7 @@ class NS(Game, Animation): NO_RESET_TIMEOUT = 3000 def __init__(self): + pygame.mixer.pre_init(44100, -16, 2, 1024) Game.__init__(self) self.get_configuration().type_declarations.add_chart( { @@ -65,10 +67,11 @@ class NS(Game, Animation): } }) Animation.__init__(self, self) - mixer.init(44100, -16, self.CHANNEL_COUNT, 4096) self.subscribe(self.respond, KEYDOWN) self.subscribe(self.respond, KEYUP) self.subscribe(self.respond) + for bgm in self.audio.bgm.values(): + bgm.volume = 0.65 ds = self.get_display_surface() self.background = Surface(ds.get_size()) self.background.fill((0, 0, 0)) @@ -498,6 +501,7 @@ class Title(Animation): platform.set_glowing(platform.get_buttons_from_edges([self.UNLOCK_MOVES[self.unlock_index]])) self.get_game().chemtrails.activate() self.get_game().tony.set_frameset("static") + self.get_audio().play_bgm("title") def deactivate(self): self.active = False @@ -1520,6 +1524,7 @@ class Boss(Animation): dialogue.set_name("Spoopy") self.spoopy.unhide() self.spoopy.set_frameset("normal") + self.get_audio().play_bgm(f"level_{index}") self.play(self.show_introduction_dialogue, delay=3000, play_once=True) self.get_game().platform.activate() self.get_game().chemtrails.activate() @@ -2089,6 +2094,7 @@ class Ending(Animation): dialogue.set_name("???") dialogue.show_text("") self.play(self.start_wipe, delay=20000, play_once=True) + self.get_audio().play_bgm("end") def start(self): self.advance_prompt.cancel_first_press() diff --git a/lib/pgfw b/lib/pgfw index 619a7da..88ccb8d 160000 --- a/lib/pgfw +++ b/lib/pgfw @@ -1 +1 @@ -Subproject commit 619a7dab3fe318d162bd747436b4bfd02c1b17bb +Subproject commit 88ccb8d68131a053975be4db10cde59440aaf6c1 diff --git a/resource/bgm/end.ogg b/resource/bgm/end.ogg new file mode 100644 index 0000000..6ce1d39 Binary files /dev/null and b/resource/bgm/end.ogg differ diff --git a/resource/bgm/level_0.ogg b/resource/bgm/level_0.ogg new file mode 100644 index 0000000..f2f874d Binary files /dev/null and b/resource/bgm/level_0.ogg differ diff --git a/resource/bgm/level_1.ogg b/resource/bgm/level_1.ogg new file mode 100644 index 0000000..7166c46 Binary files /dev/null and b/resource/bgm/level_1.ogg differ diff --git a/resource/bgm/level_2.ogg b/resource/bgm/level_2.ogg new file mode 100644 index 0000000..7c70fbe Binary files /dev/null and b/resource/bgm/level_2.ogg differ diff --git a/resource/bgm/title.ogg b/resource/bgm/title.ogg new file mode 100644 index 0000000..38d1d8d Binary files /dev/null and b/resource/bgm/title.ogg differ diff --git a/resource/scores b/resource/scores index 0c26504..33e4231 100644 --- a/resource/scores +++ b/resource/scores @@ -8,13 +8,3 @@ 5999999 5999999 5999999 -242000 -242000 -242000 -242000 -242000 -242000 -242000 -242000 -242000 -242000