Sansan/MusicPlayer
1
0 Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 7 Wiki Activity

Name popups *Popup and give scripts, scenes and classes matching names

Browse Source 
Every popup is now called *Popup instead of *Window in its file, root node,
node name, class and variable, and PopupWindow becomes BasePopup. Player is
PlayerRow, SongListObject is SongRow and Character is CharacterCard. Script
files are snake_case and scene files PascalCase, each matching its class or
root node, and LightGrayTheme.tres is light_gray_theme.tres.
This commit is contained in:
Sansan committed 2026-10-06 11:22:39 +02:00
1 parent b7d67b573e
commit 390da577d7
78 files changed
+281 -258
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

quiz.gd
+42 -42
View File
@@ -18,7 +18,7 @@ signal event_logged(text: String)
var open_button: Button = $Open
@onready
var fileDialog: FileDialog = $FileDialog
var file_dialog: FileDialog = $FileDialog
@onready
var inspiration_list: InspirationList = $InspirationList
@@ -33,10 +33,10 @@ var players_panel: PlayersPanel = $PlayersPanel
var toolbar: QuizToolbar = $QuizToolbar
@onready
var settings_window: SettingsPopup = $SettingsWindow
var settings_popup: SettingsPopup = $SettingsPopup
@onready
var winner_window: WinnerPopup = %WinnerWindow
var winner_popup: WinnerPopup = %WinnerPopup
@onready
var song_controls: SongControls = $SongControls
@@ -48,16 +48,16 @@ var song_loader: SongLoader = $SongLoader
var music_list_panel: MusicListPanel = $MusicListPanel
@onready
var new_character_select: CharacterSelectPopup = %NewCharacterSelect
var character_select_popup: CharacterSelectPopup = %CharacterSelectPopup
@onready
var music_player_container: MusicPlayer = $MusicPlayer
var music_player: MusicPlayer = $MusicPlayer
@onready
var debug_label: Label = $DebugLabel
var songs: Array= []
var current_player: Node
var current_player_row: PlayerRow
## True while statistics are off because a player won, until points are reset.
var stats_paused_by_win: bool = false
@@ -72,51 +72,51 @@ func _ready() -> void:
GameLog.debug("is_debug")
debug_label.visible = true
Settings.is_debug = true
settings_window.set_winning_score(5)
settings_window.set_selected_server(4)
settings_popup.set_winning_score(5)
settings_popup.set_selected_server(4)
song_controls.next_pressed.connect(play_next_song)
song_controls.show_answer_pressed.connect(show_answer_pressed)
toolbar.sound_test_pressed.connect(music_player_container.get_sound_test_song)
toolbar.sound_test_pressed.connect(music_player.get_sound_test_song)
toolbar.settings_pressed.connect(show_settings)
toolbar.reset_playlist_pressed.connect(reset_playlist)
toolbar.reset_points_pressed.connect(reset_points)
song_loader.song_list_loaded.connect(update_song_list)
song_loader.song_added.connect(_on_song_added)
new_character_select.connect("new_new_character_selected", _on_new_character_selected)
character_select_popup.connect("new_new_character_selected", _on_new_character_selected)
music_list_panel.song_clicked.connect(song_object_clicked)
players_panel.player_added.connect(_on_player_added)
players_panel.player_removed.connect(_on_player_removed)
players_panel.change_character_requested.connect(_on_player_change_character_clicked)
music_player_container.connect("play_next_song", play_next_song)
music_player_container.connect("update_song_list", update_song_list)
settings_window.connect("server_changed", _on_server_changed)
settings_window.visibility_changed.connect(_on_settings_window_visibility_changed)
players_panel.change_character_requested.connect(_on_change_character_requested)
music_player.connect("play_next_song", play_next_song)
music_player.connect("update_song_list", update_song_list)
settings_popup.connect("server_changed", _on_server_changed)
settings_popup.visibility_changed.connect(_on_settings_popup_visibility_changed)
open_button.pressed.connect(open)
inspiration_list.load_from_server()
song_loader.load_song_list()
new_character_select.load_characters()
character_select_popup.load_characters()
func _input(event: InputEvent) -> void:
if event is InputEventKey and event.pressed:
if event.alt_pressed && event.keycode == KEY_UP:
GameLog.debug("Alt + UP pressed")
music_player_container.change_volume(0.05)
music_player.change_volume(0.05)
if event.alt_pressed && event.keycode == KEY_DOWN:
GameLog.debug("Alt + DOWN pressed")
music_player_container.change_volume(-0.05)
music_player.change_volume(-0.05)
if event.alt_pressed && event.ctrl_pressed && event.keycode == KEY_LEFT:
GameLog.debug("Ctrl + Alt + LEFT pressed")
music_player_container.restart()
music_player.restart()
elif event.alt_pressed && event.keycode == KEY_LEFT:
GameLog.debug("Alt + LEFT pressed")
music_player_container.seek(-5)
music_player.seek(-5)
if event.alt_pressed && event.keycode == KEY_RIGHT:
GameLog.debug("Alt + RIGHT pressed")
music_player_container.seek(5)
music_player.seek(5)
## Disables the buttons that use the song list while the server syncs it.
@@ -138,7 +138,7 @@ func refresh_from_server() -> void:
GameLog.debug("refresh_from_server")
inspiration_list.load_from_server()
reset_playlist()
new_character_select.load_characters()
character_select_popup.load_characters()
func _on_server_changed() -> void:
@@ -159,20 +159,20 @@ func play_next_song() -> void:
if Playlist.first_song_played:
Playlist.set_latest_played_song()
Playlist.first_song_played = true
music_player_container.play_song_object(Playlist.latest_played_song)
music_player.play_song_object(Playlist.latest_played_song)
if !(Playlist.get_preloaded_songs() > 0):
song_controls.set_next_enabled(false)
song_loader.fetch_song_if_idle()
func _popups() -> Array[PopupWindow]:
return [settings_window, new_character_select, winner_window]
func _popups() -> Array[BasePopup]:
return [settings_popup, character_select_popup, winner_popup]
# The cache size can be changed in the settings. Waiting until the settings are closed
# avoids starting downloads while the user is still clicking the number up and down.
func _on_settings_window_visibility_changed() -> void:
if !settings_window.visible:
func _on_settings_popup_visibility_changed() -> void:
if !settings_popup.visible:
song_loader.fill_cache()
@@ -199,11 +199,11 @@ func song_object_clicked(song_no: int) -> void:
var sound: AudioStream = AudioStreamMP3.new()
sound.data = body
Playlist.add_song_to_song_object(song_no, sound)
music_player_container.play_song_object(song_no)
music_player.play_song_object(song_no)
MusicServerClient.fetch_song(song_no, song_downloaded)
else:
GameLog.debug("song already downloaded")
music_player_container.play_song_object(song_no)
music_player.play_song_object(song_no)
func reset_playlist() -> void:
@@ -228,13 +228,13 @@ func reset_points() -> void:
func show_settings() -> void:
GameLog.debug("show_settings")
settings_window.open()
settings_popup.open()
# Each new player's points reach the music player, the log and the winner window.
# Each new player's points reach the music player, the log and the winner popup.
func _on_player_added(new_player_object: PlayerObject) -> void:
new_player_object.connect("first_point_triggerd", music_player_container._on_point_triggered.bind("first"))
new_player_object.connect("match_point_triggerd", music_player_container._on_point_triggered.bind("match"))
new_player_object.connect("first_point_triggerd", music_player._on_point_triggered.bind("first"))
new_player_object.connect("match_point_triggerd", music_player._on_point_triggered.bind("match"))
new_player_object.connect("winner_triggerd", _on_player_won.bind(new_player_object))
new_player_object.connect("point_given_sound", _on_make_point_given_sound)
new_player_object.connect("player_point_given", _on_point_given.bind(new_player_object))
@@ -250,13 +250,13 @@ func _on_point_given(player_object: PlayerObject) -> void:
func _on_make_point_given_sound() -> void:
music_player_container.play_sound_effect(preload("res://sounds/itemopen.wav"))
music_player.play_sound_effect(preload("res://sounds/itemopen.wav"))
func _on_point_taken(player_object: PlayerObject) -> void:
GameLog.debug("_on_point_taken")
event_logged.emit(player_object.player_name + " lost a point")
music_player_container.play_sound_effect(preload("res://sounds/itemequip.wav"))
music_player.play_sound_effect(preload("res://sounds/itemequip.wav"))
if Playlist.currently_playing_song >= 0:
Playlist.remove_point(player_object.id)
update_song_list()
@@ -264,8 +264,8 @@ func _on_point_taken(player_object: PlayerObject) -> void:
func _on_player_won(player_object: PlayerObject) -> void:
GameLog.debug("_on_player_won")
winner_window.show_winner(player_object)
music_player_container.play_song(preload("res://sounds/winning.mp3"))
winner_popup.show_winner(player_object)
music_player.play_song(preload("res://sounds/winning.mp3"))
# Songs played after the game is won don't count towards the statistics
if Settings.add_to_stats:
Settings.add_to_stats = false
@@ -277,16 +277,16 @@ func _on_player_removed(player_object: PlayerObject) -> void:
update_song_list()
func _on_player_change_character_clicked(new_player: Player, player_name: String) -> void:
func _on_change_character_requested(new_player: PlayerRow, player_name: String) -> void:
GameLog.debug("_on_player_change_character_clicked")
current_player = new_player
current_player_row = new_player
GameLog.debug("Change character for: " + player_name)
new_character_select.show_grid(player_name)
character_select_popup.show_grid(player_name)
func _on_new_character_selected(character_texture: ImageTexture) -> void:
GameLog.debug("_on_new_character_selected")
current_player.new_character_selected(character_texture)
current_player_row.new_character_selected(character_texture)
###Local
@@ -294,7 +294,7 @@ func _on_new_character_selected(character_texture: ImageTexture) -> void:
var local_path: String = '/Users/sebastian/ResilioSync/Sorterat_test/Metal Gear Solid 4 - Guns of the Patriots/2-16 Metal Gear Saga.mp3'
func open() -> void:
fileDialog.popup()
file_dialog.popup()
func _on_file_dialog_dir_selected(path: String) -> void: