From 8efe7f7bac6c516dd3d196280820fcd1fd1fb555 Mon Sep 17 00:00:00 2001 From: Fisch Date: Mon, 7 Apr 2025 21:55:13 +0200 Subject: [PATCH] fix map change config load value and show player keys in menu --- scenes/menu.tscn | 1 - scripts/gamestate.gd | 4 +++- scripts/menudisplay.gd | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scenes/menu.tscn b/scenes/menu.tscn index 66b9516..b380a16 100644 --- a/scenes/menu.tscn +++ b/scenes/menu.tscn @@ -105,7 +105,6 @@ offset_right = 517.0 offset_bottom = 637.245 [node name="VBoxContainer_Playerlist" type="VBoxContainer" parent="MenuDisplay/MarginContainer"] -visible = false layout_mode = 2 theme = SubResource("Theme_eo4i1") diff --git a/scripts/gamestate.gd b/scripts/gamestate.gd index 9e4a5ab..3ba3ede 100644 --- a/scripts/gamestate.gd +++ b/scripts/gamestate.gd @@ -20,7 +20,7 @@ var carpreset="normal" var remove_cars_timeout=true -var automatic_map_change_after=2 +var automatic_map_change_after=-1 #-1 to load config value initally var automatic_map_change_in=automatic_map_change_after #change map when this reaches 0 var colorwheelstep:float=0.3 @@ -47,6 +47,8 @@ func setCarPreset(p:String): func setAutomaticMapChangeAfter(v): automatic_map_change_after=max(v,0) + if automatic_map_change_in==-1: + automatic_map_change_in=automatic_map_change_after #initial value func getSelectedMap(): #return only short map name "00" return map_scene_name diff --git a/scripts/menudisplay.gd b/scripts/menudisplay.gd index 71e9a80..efa9ce7 100644 --- a/scripts/menudisplay.gd +++ b/scripts/menudisplay.gd @@ -6,7 +6,7 @@ const MAX_OUTLINESIZE=60 # Called when the node enters the scene tree for the first time. func _ready() -> void: - $MapChangeInfo.text="Mapchange in "+str(Gamestate.automatic_map_change_in) + pass # Called every frame. 'delta' is the elapsed time since the previous frame. @@ -60,3 +60,6 @@ func _process(delta: float) -> void: var outlinesize=max(0,label.get_theme_constant("outline_size")-2*delta) label.add_theme_constant_override("outline_size",outlinesize) + + $MapChangeInfo.text="Mapchange in "+str(Gamestate.automatic_map_change_in) +