Compare commits

...

2 commits

Author SHA1 Message Date
bc2aa0ba2c add reset player button 2025-04-13 15:12:55 +02:00
1efbf8df4f fix initial rounds selection off by one 2025-04-13 14:58:15 +02:00
5 changed files with 34 additions and 8 deletions

View file

@ -200,7 +200,7 @@ tracks/0/keys = {
"times": PackedFloat32Array(0, 0.7, 2), "times": PackedFloat32Array(0, 0.7, 2),
"transitions": PackedFloat32Array(1, 1, 1), "transitions": PackedFloat32Array(1, 1, 1),
"update": 0, "update": 0,
"values": [Vector2(92.1386, 36.868), Vector2(120, 36.868), Vector2(330, 72)] "values": [Vector2(0, 35), Vector2(120, 36.868), Vector2(330, 72)]
} }
tracks/1/type = "value" tracks/1/type = "value"
tracks/1/imported = false tracks/1/imported = false
@ -485,6 +485,15 @@ libraries = {
&"": SubResource("AnimationLibrary_wuihg") &"": SubResource("AnimationLibrary_wuihg")
} }
[node name="fps_label" type="Label" parent="hud"]
visible = false
offset_left = 1028.0
offset_top = 12.0
offset_right = 1117.0
offset_bottom = 56.0
theme_override_font_sizes/font_size = 28
text = "60 FPS"
[node name="Camera2D" type="Camera2D" parent="."] [node name="Camera2D" type="Camera2D" parent="."]
[node name="cars" type="Node" parent="."] [node name="cars" type="Node" parent="."]

View file

@ -321,11 +321,18 @@ scale = Vector2(2, 2)
theme_override_constants/outline_size = 10 theme_override_constants/outline_size = 10
text = "Fullscreen" text = "Fullscreen"
[node name="btn_reset_players" type="Button" parent="MenuDisplay"]
offset_left = 800.0
offset_top = 600.0
offset_right = 912.0
offset_bottom = 631.0
text = "Reset Players"
[node name="btn_save_whitelist" type="Button" parent="MenuDisplay"] [node name="btn_save_whitelist" type="Button" parent="MenuDisplay"]
offset_left = 936.0 offset_left = 940.0
offset_top = 605.0 offset_top = 600.0
offset_right = 1085.0 offset_right = 1089.0
offset_bottom = 636.0 offset_bottom = 631.0
text = "Save Key Whitelist" text = "Save Key Whitelist"
[node name="map_container" type="HFlowContainer" parent="MenuDisplay"] [node name="map_container" type="HFlowContainer" parent="MenuDisplay"]
@ -426,7 +433,8 @@ text = "Hold Button to join"
wait_time = 5.0 wait_time = 5.0
[connection signal="toggled" from="MenuDisplay/btn_fullscreen" to="." method="_on_btn_fullscreen_toggled"] [connection signal="toggled" from="MenuDisplay/btn_fullscreen" to="." method="_on_btn_fullscreen_toggled"]
[connection signal="pressed" from="MenuDisplay/btn_save_whitelist" to="." method="_on_button_pressed"] [connection signal="pressed" from="MenuDisplay/btn_reset_players" to="." method="_on_btn_reset_players_pressed"]
[connection signal="pressed" from="MenuDisplay/btn_save_whitelist" to="." method="_on_btn_save_whitelist_pressed"]
[connection signal="map_changed" from="MenuDisplay/map_container" to="." method="_on_map_container_map_changed"] [connection signal="map_changed" from="MenuDisplay/map_container" to="." method="_on_map_container_map_changed"]
[connection signal="item_selected" from="MenuDisplay/rounds_selection" to="." method="_on_rounds_selection_item_selected"] [connection signal="item_selected" from="MenuDisplay/rounds_selection" to="." method="_on_rounds_selection_item_selected"]
[connection signal="item_selected" from="MenuDisplay/rounds_selection" to="MenuDisplay/rounds_selection" method="_on_item_selected"] [connection signal="item_selected" from="MenuDisplay/rounds_selection" to="MenuDisplay/rounds_selection" method="_on_item_selected"]

View file

@ -16,6 +16,7 @@ extends Node2D
@onready var highscore_label: Label = $hud/highscore_label @onready var highscore_label: Label = $hud/highscore_label
@onready var splittime_label: Label = $hud/splittime_label @onready var splittime_label: Label = $hud/splittime_label
@onready var fps_label: Label = $hud/fps_label
const caroffset= 32+4 #space cars on start line const caroffset= 32+4 #space cars on start line
@ -118,6 +119,7 @@ func custom_array_sort_rank(a, b):
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta: float) -> void: func _process(delta: float) -> void:
fps_label.text=str(round(1.0/delta))
if running: if running:
Gamestate.addTimeElapsed(delta) Gamestate.addTimeElapsed(delta)
#if !countdown.is_stopped(): #if !countdown.is_stopped():

View file

@ -35,7 +35,7 @@ func getFastModeChance():
func getRounds() -> int: func getRounds() -> int:
if rounds<=0: #if no rounds setting configured, use from config file if rounds<=0: #if no rounds setting configured, use from config file
var loadedRounds:int=ConfigFileHandler.get_general_setting("rounds")-1 var loadedRounds:int=ConfigFileHandler.get_general_setting("rounds")
if loadedRounds>0: if loadedRounds>0:
rounds=loadedRounds rounds=loadedRounds
return rounds return rounds

View file

@ -134,8 +134,15 @@ func _on_map_container_map_changed() -> void:
$Timer.start() $Timer.start()
func _on_button_pressed() -> void: func _on_btn_save_whitelist_pressed() -> void:
if len(Gamestate.getPlayerkeys())>=1: if len(Gamestate.getPlayerkeys())>=1:
var _playerkeys=Gamestate.getPlayerkeys() var _playerkeys=Gamestate.getPlayerkeys()
print("Keys ="+str(_playerkeys)) print("Keys ="+str(_playerkeys))
ConfigFileHandler.save_keywhitelist_setting(_playerkeys) ConfigFileHandler.save_keywhitelist_setting(_playerkeys)
func _on_btn_reset_players_pressed() -> void:
removeAssignedKeys()
Gamestate.removeAllPlayers()
$Timer.stop()
$MenuDisplay.update_playerlist(Gamestate.players)
print("Removed players")