giantroostergames/LD54
4
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Scoreboard Part 1

Browse source
This commit is contained in:
Manuel 2023-10-03 00:08:26 +02:00
parent 4396504480
commit 7328ab1349
Signed by: Manuel
GPG key ID: 4085037435E1F07A
4 changed files with 59 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/gui/menu/scores.gd
View file

@ -1,16 +1,16 @@
extends Control extends Control
@export var level_select: Control @export var level_select: Control
@export var first_selection: Control
@export var level_first_selection: Control @export var level_first_selection: Control
@export var leaderboard: Control @export var leaderboard: Control
@export var scrollboard_vbox: Control
@export var scrollboard_item: Control
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():
first_selection.grab_focus() level_first_selection.grab_focus()
scrollboard_item.hide()
func _on_quit_button_pressed(): func _on_quit_button_pressed():
get_tree().quit() get_tree().quit()
@ -20,11 +20,26 @@ func _on_back_button_pressed():
func _on_level_button_pressed(level: int): func _on_level_button_pressed(level: int):
load_level("res://src/game/levels/level_%s.tscn" % level) load_level(level)
func load_level(path: String): func load_level(level: int):
leaderboard.show() leaderboard.show()
load_leaderboard_content() load_leaderboard_content(level)
func load_leaderboard_content(level: String): func load_leaderboard_content(level: int):
var factory = RequestFactory.new($HTTPRequest, Globals.config.HighscoreServerAddr)
factory.resolve_list_request(func (result, response_code, h, body):
if response_code == 200:
var json = JSON.parse_string(body.get_string_from_utf8())
for k in json:
var node = scrollboard_item.duplicate()
var children = node.get_children()
children[0].text = k + 1
children[1].text = json[k].player
children[2].text = str(json[k].score)
scrollboard_vbox.add_child(node)
else:
return
# TODO: Show dialog
, "level" + str(level))

47
src/gui/menu/scores.tscn
View file

@ -1,6 +1,6 @@
[gd_scene load_steps=8 format=3 uid="uid://daki40cyvwaoy"] [gd_scene load_steps=8 format=3 uid="uid://daki40cyvwaoy"]
[ext_resource type="Script" path="res://src/gui/menu/main.gd" id="1_1gfw2"] [ext_resource type="Script" path="res://src/gui/menu/scores.gd" id="1_im4lk"]
[ext_resource type="AudioStream" uid="uid://dh5jxxwim7ra8" path="res://assets/sounds/music/death_by_waveshaper.wav" id="2_t8ixe"] [ext_resource type="AudioStream" uid="uid://dh5jxxwim7ra8" path="res://assets/sounds/music/death_by_waveshaper.wav" id="2_t8ixe"]
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2u7je"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2u7je"]
@ -54,7 +54,7 @@ Button/styles/normal = SubResource("StyleBoxFlat_uo2yv")
Button/styles/pressed = SubResource("StyleBoxFlat_sjhib") Button/styles/pressed = SubResource("StyleBoxFlat_sjhib")
Panel/styles/panel = SubResource("StyleBoxFlat_5it3g") Panel/styles/panel = SubResource("StyleBoxFlat_5it3g")
[node name="Menu" type="Control" node_paths=PackedStringArray("level_select", "level_first_selection")] [node name="ScoreList" type="Control" node_paths=PackedStringArray("level_select", "level_first_selection", "leaderboard", "scrollboard_vbox", "scrollboard_item")]
layout_mode = 3 layout_mode = 3
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
@ -64,9 +64,12 @@ offset_bottom = 1.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
theme = SubResource("Theme_67fiq") theme = SubResource("Theme_67fiq")
script = ExtResource("1_1gfw2") script = ExtResource("1_im4lk")
level_select = NodePath("LevelSelect") level_select = NodePath("LevelSelect")
level_first_selection = NodePath("LevelSelect/VBoxContainer/VBoxContainer2/Row1/1") level_first_selection = NodePath("LevelSelect/VBoxContainer/VBoxContainer2/Row1/1")
leaderboard = NodePath("Leaderboard")
scrollboard_vbox = NodePath("Leaderboard/ScrollContainer/VBoxContainer")
scrollboard_item = NodePath("Leaderboard/ScrollContainer/VBoxContainer/HBoxContainer")
[node name="LevelSelect" type="Panel" parent="."] [node name="LevelSelect" type="Panel" parent="."]
layout_mode = 1 layout_mode = 1
@ -223,7 +226,7 @@ anchors_preset = 0
offset_right = 40.0 offset_right = 40.0
offset_bottom = 40.0 offset_bottom = 40.0
[node name="LevelSelect2" type="Panel" parent="."] [node name="Leaderboard" type="Panel" parent="."]
visible = false visible = false
layout_mode = 1 layout_mode = 1
anchors_preset = -1 anchors_preset = -1
@ -238,34 +241,34 @@ offset_bottom = 219.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
[node name="ScrollContainer" type="ScrollContainer" parent="LevelSelect2"] [node name="ScrollContainer" type="ScrollContainer" parent="Leaderboard"]
layout_mode = 2 layout_mode = 2
offset_left = 50.0 offset_left = 50.0
offset_top = 100.0 offset_top = 100.0
offset_right = 450.0 offset_right = 450.0
offset_bottom = 400.0 offset_bottom = 400.0
[node name="VBoxContainer" type="VBoxContainer" parent="LevelSelect2/ScrollContainer"] [node name="VBoxContainer" type="VBoxContainer" parent="Leaderboard/ScrollContainer"]
layout_mode = 2 layout_mode = 2
[node name="HBoxContainer" type="HBoxContainer" parent="LevelSelect2/ScrollContainer/VBoxContainer"] [node name="HBoxContainer" type="HBoxContainer" parent="Leaderboard/ScrollContainer/VBoxContainer"]
layout_mode = 2 layout_mode = 2
[node name="Label" type="Label" parent="LevelSelect2/ScrollContainer/VBoxContainer/HBoxContainer"] [node name="Label" type="Label" parent="Leaderboard/ScrollContainer/VBoxContainer/HBoxContainer"]
custom_minimum_size = Vector2(50, 2.08165e-12) custom_minimum_size = Vector2(50, 2.08165e-12)
layout_mode = 2 layout_mode = 2
text = "1" text = "1"
[node name="Label2" type="Label" parent="LevelSelect2/ScrollContainer/VBoxContainer/HBoxContainer"] [node name="Label2" type="Label" parent="Leaderboard/ScrollContainer/VBoxContainer/HBoxContainer"]
custom_minimum_size = Vector2(170, 2.08165e-12) custom_minimum_size = Vector2(170, 2.08165e-12)
layout_mode = 2 layout_mode = 2
text = "Username" text = "Username"
[node name="Label3" type="Label" parent="LevelSelect2/ScrollContainer/VBoxContainer/HBoxContainer"] [node name="Label3" type="Label" parent="Leaderboard/ScrollContainer/VBoxContainer/HBoxContainer"]
layout_mode = 2 layout_mode = 2
text = "Username" text = "12345678"
[node name="Label" type="Label" parent="LevelSelect2"] [node name="Label" type="Label" parent="Leaderboard"]
layout_mode = 1 layout_mode = 1
anchors_preset = 5 anchors_preset = 5
anchor_left = 0.5 anchor_left = 0.5
@ -278,7 +281,7 @@ grow_horizontal = 2
text = "LEADERBOARD" text = "LEADERBOARD"
horizontal_alignment = 1 horizontal_alignment = 1
[node name="BackButton" type="Button" parent="LevelSelect2"] [node name="BackButton" type="Button" parent="Leaderboard"]
custom_minimum_size = Vector2(120, 40) custom_minimum_size = Vector2(120, 40)
layout_mode = 1 layout_mode = 1
anchors_preset = 7 anchors_preset = 7
@ -297,7 +300,7 @@ size_flags_vertical = 8
focus_neighbor_bottom = NodePath("../StartButton") focus_neighbor_bottom = NodePath("../StartButton")
text = "BACK" text = "BACK"
[node name="BackButton" type="Button" parent="LevelSelect2/BackButton"] [node name="BackButton" type="Button" parent="Leaderboard/BackButton"]
custom_minimum_size = Vector2(120, 40) custom_minimum_size = Vector2(120, 40)
layout_mode = 1 layout_mode = 1
anchors_preset = 7 anchors_preset = 7
@ -316,7 +319,7 @@ focus_neighbor_bottom = NodePath("../StartButton")
text = "NEXT text = "NEXT
" "
[node name="BackButton" type="Button" parent="LevelSelect2/BackButton/BackButton"] [node name="BackButton" type="Button" parent="Leaderboard/BackButton/BackButton"]
custom_minimum_size = Vector2(120, 40) custom_minimum_size = Vector2(120, 40)
layout_mode = 1 layout_mode = 1
anchors_preset = 7 anchors_preset = 7
@ -336,7 +339,7 @@ focus_neighbor_bottom = NodePath("../StartButton")
text = "PREVIOUS text = "PREVIOUS
" "
[node name="Label2" type="Label" parent="LevelSelect2"] [node name="Label2" type="Label" parent="Leaderboard"]
layout_mode = 0 layout_mode = 0
offset_left = 50.0 offset_left = 50.0
offset_top = 66.0 offset_top = 66.0
@ -344,7 +347,7 @@ offset_right = 107.0
offset_bottom = 92.0 offset_bottom = 92.0
text = "Rank" text = "Rank"
[node name="Label3" type="Label" parent="LevelSelect2"] [node name="Label3" type="Label" parent="Leaderboard"]
layout_mode = 0 layout_mode = 0
offset_left = 106.0 offset_left = 106.0
offset_top = 66.0 offset_top = 66.0
@ -353,7 +356,7 @@ offset_bottom = 92.0
text = "Name text = "Name
" "
[node name="Label4" type="Label" parent="LevelSelect2"] [node name="Label4" type="Label" parent="Leaderboard"]
layout_mode = 0 layout_mode = 0
offset_left = 277.0 offset_left = 277.0
offset_top = 66.0 offset_top = 66.0
@ -362,6 +365,8 @@ offset_bottom = 92.0
text = "Score text = "Score
" "
[node name="HTTPRequest" type="HTTPRequest" parent="."]
[connection signal="pressed" from="LevelSelect/VBoxContainer/VBoxContainer2/Row1/1" to="." method="_on_level_button_pressed" binds= [1]] [connection signal="pressed" from="LevelSelect/VBoxContainer/VBoxContainer2/Row1/1" to="." method="_on_level_button_pressed" binds= [1]]
[connection signal="pressed" from="LevelSelect/VBoxContainer/VBoxContainer2/Row1/2" to="." method="_on_level_button_pressed" binds= [2]] [connection signal="pressed" from="LevelSelect/VBoxContainer/VBoxContainer2/Row1/2" to="." method="_on_level_button_pressed" binds= [2]]
[connection signal="pressed" from="LevelSelect/VBoxContainer/VBoxContainer2/Row1/3" to="." method="_on_level_button_pressed" binds= [3]] [connection signal="pressed" from="LevelSelect/VBoxContainer/VBoxContainer2/Row1/3" to="." method="_on_level_button_pressed" binds= [3]]
@ -375,6 +380,6 @@ text = "Score
[connection signal="pressed" from="LevelSelect/VBoxContainer/VBoxContainer2/Row3/11" to="." method="_on_level_button_pressed" binds= [11]] [connection signal="pressed" from="LevelSelect/VBoxContainer/VBoxContainer2/Row3/11" to="." method="_on_level_button_pressed" binds= [11]]
[connection signal="pressed" from="LevelSelect/VBoxContainer/VBoxContainer2/Row3/12" to="." method="_on_level_button_pressed" binds= [12]] [connection signal="pressed" from="LevelSelect/VBoxContainer/VBoxContainer2/Row3/12" to="." method="_on_level_button_pressed" binds= [12]]
[connection signal="pressed" from="LevelSelect/BackButton" to="." method="_on_back_button_pressed"] [connection signal="pressed" from="LevelSelect/BackButton" to="." method="_on_back_button_pressed"]
[connection signal="pressed" from="LevelSelect2/BackButton" to="." method="_on_back_button_pressed"] [connection signal="pressed" from="Leaderboard/BackButton" to="." method="_on_back_button_pressed"]
[connection signal="pressed" from="LevelSelect2/BackButton/BackButton" to="." method="_on_back_button_pressed"] [connection signal="pressed" from="Leaderboard/BackButton/BackButton" to="." method="_on_back_button_pressed"]
[connection signal="pressed" from="LevelSelect2/BackButton/BackButton/BackButton" to="." method="_on_back_button_pressed"] [connection signal="pressed" from="Leaderboard/BackButton/BackButton/BackButton" to="." method="_on_back_button_pressed"]

2
src/model/apirequest.gd
View file

@ -8,7 +8,6 @@ var method: HTTPClient.Method
var callback: Callable var callback: Callable
func _init(u: String, h: PackedStringArray, m: HTTPClient.Method, b: String = ""): func _init(u: String, h: PackedStringArray, m: HTTPClient.Method, b: String = ""):
super()
self.url = u self.url = u
self.headers = h self.headers = h
self.method = m self.method = m
@ -21,4 +20,3 @@ func resolve(f: Callable) -> Error:
return error return error
return OK return OK

10
src/model/requestfactory.gd
View file

@ -2,13 +2,15 @@ class_name RequestFactory
const headers = [ const headers = [
"Content-Type: application/json", "Content-Type: application/json",
"Authentication: Bearer " + Config.Secrets.ApiToken "Authorization: Bearer " + Config.Secrets.ApiToken
] ]
const api_base_path = "/api/v2" const api_base_path = "/api/v2"
var base_uri: String var base_uri: String
var node: HTTPRequest
func _init(base_uri: String): func _init(node: HTTPRequest, base_uri: String):
self.base_uri = base_uri + api_base_path self.base_uri = base_uri + api_base_path
self.node = node
func new_submit_request(score: Score) -> ApiRequest: func new_submit_request(score: Score) -> ApiRequest:
score.ValKey = score.valKey() score.ValKey = score.valKey()
@ -20,3 +22,7 @@ func new_list_request(key: String, offset: int = 0, limit: int = -1) -> ApiReque
return ApiRequest.new( return ApiRequest.new(
self.base_uri + "/score/list/" + Config.ProjectName.to_lower() + "?key=" + key + "&offset=" + str(offset) + "&limit=" + str(limit), self.base_uri + "/score/list/" + Config.ProjectName.to_lower() + "?key=" + key + "&offset=" + str(offset) + "&limit=" + str(limit),
self.headers, HTTPClient.METHOD_GET) self.headers, HTTPClient.METHOD_GET)
func resolve_list_request(f: Callable, key: String, offset: int = 0, limit: int = -1):
self.node.request_completed.connect(f)
self.node.request(self.base_uri + "/score/list/" + Config.ProjectName.to_lower() + "?key=" + key + "&offset=" + str(offset) + "&limit=" + str(limit), headers, HTTPClient.METHOD_GET)