Merged with Time Limit

This commit is contained in:
KirbyKidJ
2025-09-23 12:24:51 -07:00
parent 6ae94074e5
commit fce9fbc9ff
19 changed files with 7 additions and 22 deletions

View File

@@ -74,7 +74,6 @@ var file := {
"extra_checkpoints": 0,
"back_scroll": 0,
"time_limit": 1,
"timer_style": 0,
"lakitu_style": 0
}
}

View File

@@ -27,7 +27,7 @@ func handle_main_hud() -> void:
$Main/RedCoins.hide()
$Main/CoinCount.show()
%Combo.hide()
$Timer.paused = Settings.file.difficulty.timer_style == 1
$Timer.paused = Settings.file.difficulty.time_limit == 2
$%Time.show()
%Stopwatch.hide()
%PB.hide()
@@ -180,7 +180,7 @@ func activate_pause_menu() -> void:
const HURRY_UP = preload("res://Assets/Audio/BGM/HurryUp.mp3")
func on_timeout() -> void:
if Global.can_time_tick and is_instance_valid(Global.current_level) and Settings.file.difficulty.time_limit == 1:
if Global.can_time_tick and is_instance_valid(Global.current_level) and Settings.file.difficulty.time_limit > 0:
if Global.level_editor != null:
if Global.level_editor.current_state != LevelEditor.EditorState.PLAYTESTING:
return

View File

@@ -15,9 +15,6 @@ func flag_lives_changed(new_value := 0) -> void:
func time_limit_changed(new_value := 0) -> void:
Settings.file.difficulty.time_limit = new_value
func timer_style_changed(new_value := 0) -> void:
Settings.file.difficulty.timer_style = new_value
func game_over_changed(new_value := 0) -> void:
Settings.file.difficulty.game_over_behaviour = new_value