feat(game): update music

This commit is contained in:
Kristofers Solo 2024-01-07 17:31:20 +02:00
parent f85b72a150
commit c58bf61603
6 changed files with 13 additions and 10 deletions

BIN
assets/music/background.mp3 Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,5 +1,5 @@
[General]
pause = ["esc", "F1"]
pause = ["escape", "F1"] # WIP
quit = ["q"]
[Movement]
@ -18,7 +18,7 @@ ccw = [
] # counter-clockwise
[Action]
hold = ["shift", "c", "keypad 0"]
hold = ["left shift", "right shift", "c", "keypad 0"] # WIP
drop = ["space", "keypad 5"]
[Volume.Music]

View File

@ -30,6 +30,7 @@ class Game(BaseScreen):
def __init__(self, game_mode: GameMode, settings: dict[str, Any]) -> None:
self.game_mode = game_mode
self.settings = settings
self.paused = False
self._initialize_game_components()
self._start_background_music()

View File

@ -69,7 +69,7 @@ class Tetris(BaseScreen):
"""Run a single iteration of the game loop."""
self.draw()
self._timer_update()
self.handle_event()
self.handle_events()
def draw(self) -> None:
"""Draw the game surface and its components."""
@ -83,7 +83,7 @@ class Tetris(BaseScreen):
self._update_display_surface()
self.sprites.update()
def handle_event(self) -> None:
def handle_events(self) -> None:
"""Handle player input events."""
keys: pygame.key.ScancodeWrapper = pygame.key.get_pressed()
@ -366,12 +366,12 @@ class Tetris(BaseScreen):
See `settings.toml` for the default key bindings.
"""
right_keys = [
right_keys: list[int] = [
pygame.key.key_code(key) for key in self.settings["Movement"]["right"]
]
right_key_pressed = any(keys[key] for key in right_keys)
left_keys = [
left_keys: list[int] = [
pygame.key.key_code(key) for key in self.settings["Movement"]["left"]
]
left_key_pressed = any(keys[key] for key in left_keys)
@ -390,10 +390,12 @@ class Tetris(BaseScreen):
See `settings.toml` for the default key bindings.
"""
cw_keys = [pygame.key.key_code(key) for key in self.settings["Rotation"]["cw"]]
cw_keys: list[int] = [
pygame.key.key_code(key) for key in self.settings["Rotation"]["cw"]
]
cw_key_pressed = any(keys[key] for key in cw_keys)
ccw_keys = [
ccw_keys: list[int] = [
pygame.key.key_code(key) for key in self.settings["Rotation"]["ccw"]
]
ccw_key_pressed = any(keys[key] for key in ccw_keys)
@ -413,7 +415,7 @@ class Tetris(BaseScreen):
See `settings.toml` for the default key bindings.
"""
down_keys = [
down_keys: list[int] = [
pygame.key.key_code(key) for key in self.settings["Movement"]["down"]
]
down_key_pressed = any(keys[key] for key in down_keys)

View File

@ -61,7 +61,7 @@ class Window:
@define
class Music:
background: Path = BASE_PATH / "assets" / "music" / "background.wav"
background: Path = BASE_PATH / "assets" / "music" / "background.mp3"
landing: Path = BASE_PATH / "assets" / "music" / "landing.wav"