interfisch/teststrecke-game
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

change remove cars timeout setting to use time instead of boolean

Browse source
This commit is contained in:
interfisch 2025-03-23 09:43:12 +01:00
parent 07aedaa514
commit e71115be84
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/car.gd
View file

@ -110,6 +110,7 @@ var finalTime=-1
func _ready() -> void: func _ready() -> void:
collision_shape.disabled=true #disable collisions on start. also to avoid collision when initially setting position collision_shape.disabled=true #disable collisions on start. also to avoid collision when initially setting position
finalTime=-1 finalTime=-1
no_input_timer.wait_time=Gamestate.getRemoveCarsTimeout()
func _physics_process(delta: float) -> void: func _physics_process(delta: float) -> void:
@ -253,7 +254,7 @@ func get_input(delta:float):
if key_accelerator_pressed: if key_accelerator_pressed:
no_input_timer.stop() no_input_timer.stop()
else: else:
if Gamestate.enabled_remove_timeout_cars and no_input_timer.is_stopped() and !no_input_timeout_flag: #reset timer if Gamestate.getRemoveCarsTimeout()>0 and no_input_timer.is_stopped() and !no_input_timeout_flag: #reset timer
no_input_timer.start() no_input_timer.start()
if key_accelerator_pressed: if key_accelerator_pressed:

2
scripts/configFileHandler.gd
View file

@ -10,7 +10,7 @@ func _ready() -> void:
config.set_value("video", "fullscreen", false) config.set_value("video", "fullscreen", false)
config.set_value("general", "remove_timeout_cars", true) config.set_value("general", "remove_cars_timeout", 15)
config.save(SETTINGS_FILE_PATH) config.save(SETTINGS_FILE_PATH)
else: else:

12
scripts/gamestate.gd
View file

@ -16,7 +16,7 @@ var map_scene_name_postfix=".tscn"
var rounds=3 var rounds=3
var enabled_remove_timeout_cars=true var remove_cars_timeout=true
var automatic_map_change_in_start=5 var automatic_map_change_in_start=5
var automatic_map_change_in=automatic_map_change_in_start #change map when this reaches 0 var automatic_map_change_in=automatic_map_change_in_start #change map when this reaches 0
@ -30,12 +30,12 @@ func setRounds(r):
print("Rounds set to "+str(r)) print("Rounds set to "+str(r))
rounds=r rounds=r
func getEnabledRemoveTimeoutCars(): func getRemoveCarsTimeout():
return enabled_remove_timeout_cars return remove_cars_timeout
func setEnabledRemoveTimeoutCars(s): func setRemoveCarsTimeout(s):
print("enabled_remove_timeout_cars set to "+str(s)) print("remove_cars_timeout set to "+str(s))
enabled_remove_timeout_cars=s remove_cars_timeout=s
func getSelectedMap(): #return only short map name "00" func getSelectedMap(): #return only short map name "00"

2
scripts/menu.gd
View file

@ -16,7 +16,7 @@ func _ready():
btn_fullscreen.button_pressed=DisplayServer.window_get_mode(0)==DisplayServer.WINDOW_MODE_FULLSCREEN #toogle fullscreen switch to correct init state btn_fullscreen.button_pressed=DisplayServer.window_get_mode(0)==DisplayServer.WINDOW_MODE_FULLSCREEN #toogle fullscreen switch to correct init state
btn_fullscreen.button_pressed=ConfigFileHandler.get_video_setting("fullscreen") btn_fullscreen.button_pressed=ConfigFileHandler.get_video_setting("fullscreen")
Gamestate.setEnabledRemoveTimeoutCars(ConfigFileHandler.get_general_setting("remove_timeout_cars")) Gamestate.setRemoveCarsTimeout(ConfigFileHandler.get_general_setting("remove_cars_timeout"))
keywhitelist=ConfigFileHandler.get_keywhitelist_setting() #empty list if disabled keywhitelist=ConfigFileHandler.get_keywhitelist_setting() #empty list if disabled
btn_save_whitelist.disabled=keywhitelist.size()>0 #whitelist enabled, then disable save whitelist button btn_save_whitelist.disabled=keywhitelist.size()>0 #whitelist enabled, then disable save whitelist button