Fixed add player process where name can be set. Added signals for points. Added settings file. Changed some shortcuts.

This commit is contained in:
2023-09-07 21:55:31 +02:00
parent 5b6169ed6c
commit 050d19039c
7 changed files with 134 additions and 28 deletions

View File

@@ -4,13 +4,11 @@ extends Control
# 2. Fix reset buttons
# 3. Fix settings
# 4. Fix top buttons
# 5. Fix player name
# 7. Fix welcome into the game
# 8. Fix match ball sound
# 9. Fix winner
# 10. Fix jump between songs
# 11. Refactor components
# 12. Change add player
# 13. Fix graphics in lists
# 14. Fix layout
# 15. Fix for local play
@@ -51,7 +49,16 @@ var progress := $PanelContainer/HBoxContainer/HSlider
var label := $PanelContainer/HBoxContainer/Label
@onready
var add_player := $Players/VBoxContainer/HBoxContainer/AddPlayer
var add_player_container := $Players/VBoxContainer/AddPlayerContainer
@onready
var add_players_button := $Players/VBoxContainer/HBoxContainer/AddPlayersButton
@onready
var add_player_button := $Players/VBoxContainer/AddPlayerContainer/AddPlayerButton
@onready
var new_player_name_field := $Players/VBoxContainer/AddPlayerContainer/PlayerNameField
@onready
var sound_test_button := $SoundTestButton
@@ -104,8 +111,9 @@ func _ready():
progress.drag_started.connect(_on_drag_started)
progress.drag_ended.connect(_on_drag_ended)
character_select.connect("character_selected", _on_character_selected)
add_player.pressed.connect(add_players)
new_player_name_field.connect("enter_key_pressed", add_player)
add_players_button.pressed.connect(add_players)
add_player_button.pressed.connect(add_player)
open_button.pressed.connect(open)
get_suggestion_list()
@@ -122,7 +130,7 @@ func get_sound_test_song():
progress.max_value = round(stream.get_length())
progress.tick_count = round(stream.get_length() / 60)
make_request("https://music.sanplex.tech/music/first", play_sound_test_song)
make_request(Settings.default_path + "/music/first", play_sound_test_song)
func sound_test_local():
path = "res://01. Opening.mp3"
@@ -138,7 +146,7 @@ func sync_games():
http_request.request_completed.connect(games_synced)
# Perform a GET request. The URL below returns JSON as of writing.
var error = http_request.request("https://music.sanplex.tech/sync")
var error = http_request.request(Settings.default_path + "/sync")
if error != OK:
push_error("An error occurred in the HTTP request.")
@@ -152,12 +160,18 @@ func get_suggestion_list() -> void:
http_request.request_completed.connect(_http_request_completed)
# Perform a GET request. The URL below returns JSON as of writing.
var error = http_request.request("https://music.sanplex.tech/music/all")
var error = http_request.request(Settings.default_path + "/music/all")
if error != OK:
push_error("An error occurred in the HTTP request.")
func add_players():
add_player_container.visible = !add_player_container.visible
new_player_name_field.grab_focus()
func add_player():
var new_player := Player.instantiate()
new_player.new_name(new_player_name_field.text)
new_player_name_field.text = ""
players.add_child(new_player)
new_player.connect("change_character_clicked", _on_player_change_character_clicked.bind(new_player))
@@ -173,7 +187,7 @@ func show_answer():
http_request.request_completed.connect(show_fetched)
# Perform a GET request. The URL below returns JSON as of writing.
var error = http_request.request("https://music.sanplex.tech/music/info")
var error = http_request.request(Settings.default_path + "/music/info")
if error != OK:
push_error("An error occurred in the HTTP request.")
@@ -183,7 +197,7 @@ func fetched():
http_request2.request_completed.connect(show_fetched_list)
# Perform a GET request. The URL below returns JSON as of writing.
var error2 = http_request2.request("https://music.sanplex.tech/music/list")
var error2 = http_request2.request(Settings.default_path + "/music/list")
if error2 != OK:
push_error("An error occurred in the HTTP request.")
@@ -335,11 +349,10 @@ func format_text(part: float, total: float) -> String:
func fetch_next_song() -> void:
var http_request = HTTPRequest.new()
add_child(http_request)
#http.set_download_file("https://music.sanplex.tech/music/first")
http_request.request_completed.connect(first_song_fetched)
# Perform a GET request. The URL below returns JSON as of writing.
var error = http_request.request("https://music.sanplex.tech/music/rand")
var error = http_request.request(Settings.default_path + "/music/rand")
if error != OK:
push_error("An error occurred in the HTTP request.")
@@ -351,7 +364,7 @@ func first_song_fetched(result, response_code, headers, body) -> void:
push_error("Song couldn't be downloaded. Try a different song.")
var sound = AudioStreamMP3.new()
sound.data = body
make_request("https://music.sanplex.tech/music/addQue", add_que)
make_request(Settings.default_path + "/music/addQue", add_que)
print("play given song")
audio.stream = sound
audio.play()