From bfbc0dfd2bdab4f67e269ac75e5e27e277dbb840 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Tue, 27 Feb 2024 19:26:35 -0500 Subject: [PATCH] global takeover of transition_speed variable --- autoloads/game.gd | 4 ++-- cutscenes/intro_story.gd | 6 +++--- maps/map.gd | 2 +- menus/file_create.gd | 8 ++++---- menus/file_select.gd | 4 ++-- menus/file_select_panel.gd | 2 +- menus/game_over.gd | 4 ++-- menus/level_select_scholar.gd | 2 +- menus/main_menu.gd | 12 ++++++------ menus/newgrounds_login.gd | 4 ++-- menus/results.gd | 4 ++-- menus/rev83_intro.gd | 4 ++-- menus/scoreboards.gd | 4 ++-- menus/sound_test.gd | 2 +- menus/splash_screen.gd | 12 ++++++------ menus/submit_score.gd | 4 ++-- menus/title_screen.gd | 4 ++-- objects/environment/exit/exit.gd | 2 +- 18 files changed, 42 insertions(+), 42 deletions(-) diff --git a/autoloads/game.gd b/autoloads/game.gd index 538e826..ff704fe 100644 --- a/autoloads/game.gd +++ b/autoloads/game.gd @@ -141,7 +141,7 @@ func tally_scores() -> void: func change_map(map: PackedScene) -> void: get_tree().paused = true can_pause = false - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") can_pause = true # save deaths @@ -276,7 +276,7 @@ func _on_player_died() -> void: yield(time_tween, "finished") yield(get_tree().create_timer(1.0 * 0.1), "timeout") Engine.time_scale = 1.0 - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") var map = get_map() var gover = load("res://menus/game_over.tscn").instance() diff --git a/cutscenes/intro_story.gd b/cutscenes/intro_story.gd index 4327876..2a3a94c 100644 --- a/cutscenes/intro_story.gd +++ b/cutscenes/intro_story.gd @@ -1,17 +1,17 @@ extends Node2D func _ready(): - Fade.fade_in(0.4) + Fade.fade_in(Options.transition_speed_secs) Audio.play_music(load("res://audio/music/intro.ogg")) $VoiceOver.play() func _input(event): if Input.is_action_just_pressed("ui_accept"): - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") SceneManager.current_scene = load("res://menus/level_select_scholar.tscn").instance() func _on_AnimationPlayer_animation_finished(anim_name): - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") SceneManager.current_scene = load("res://menus/level_select_scholar.tscn").instance() diff --git a/maps/map.gd b/maps/map.gd index b387449..b8f2410 100644 --- a/maps/map.gd +++ b/maps/map.gd @@ -15,7 +15,7 @@ var collectible_bonus = false func _ready(): get_tree().paused = true Game.can_pause = false - Fade.fade_in(0.4) + Fade.fade_in(Options.transition_speed_secs) Fade.connect("fade_finished", get_tree(), "set_pause", [false], CONNECT_ONESHOT) Fade.connect("fade_finished", Game, "set", ["can_pause", true], CONNECT_ONESHOT) Audio.play_music(music) diff --git a/menus/file_create.gd b/menus/file_create.gd index fc40ae2..7f58483 100644 --- a/menus/file_create.gd +++ b/menus/file_create.gd @@ -53,7 +53,7 @@ func _ready() -> void: chosen_name.text = "" file.name = "" # fade in - Fade.fade_in(0.4) + Fade.fade_in(Options.transition_speed_secs) # focus the difficulty $"%Spicy".call_deferred("grab_focus") @@ -69,13 +69,13 @@ func _set_difficulty(value: int) -> void: func _difficulty_selected() -> void: - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") $"%DifficultySelect".queue_free() $"%NameEntry".visible = true get_tree().paused = false Game.use_lives = false - Fade.fade_in(0.4) + Fade.fade_in(Options.transition_speed_secs) func _on_letter_chosen(letter: String) -> void: if file.name.length() < 8: @@ -104,7 +104,7 @@ func _on_player_teleport_finished() -> void: file.save_to_file() Save.current_file = file Game.difficulty = file.difficulty - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") get_tree().paused = false SceneManager.current_scene = load("res://cutscenes/intro_story.tscn").instance() diff --git a/menus/file_select.gd b/menus/file_select.gd index 6b1d5bf..79f0bc3 100644 --- a/menus/file_select.gd +++ b/menus/file_select.gd @@ -8,12 +8,12 @@ onready var flavor_text = $FlavorText onready var delete_background = $DeleteBackground func _ready() -> void: - Fade.fade_in(0.4) + Fade.fade_in(Options.transition_speed_secs) $SelectFile1.call_deferred("grab_focus") func _on_file_loaded() -> void: - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") SceneManager.current_scene = next_scene.instance() diff --git a/menus/file_select_panel.gd b/menus/file_select_panel.gd index 395d4f8..92d2bd5 100644 --- a/menus/file_select_panel.gd +++ b/menus/file_select_panel.gd @@ -31,7 +31,7 @@ func select() -> void: # empty file, so go to file creation screen else: # wait for fade - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") # create new file and give it to the file create screen var file_create = FileCreate.instance() diff --git a/menus/game_over.gd b/menus/game_over.gd index 39eef54..ce22ddf 100644 --- a/menus/game_over.gd +++ b/menus/game_over.gd @@ -5,14 +5,14 @@ onready var exit_button = $Panel/Exit # Called when the node enters the scene tree for the first time. func _ready(): - Fade.fade_in(0.4) + Fade.fade_in(Options.transition_speed_secs) get_tree().paused = true retry_button.grab_focus() Audio.ac_music.stream_paused = false Audio.play_music(load("res://audio/music/74(game_over).ogg")) func _on_Exit_button_down(): - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") get_tree().paused = false SceneManager.current_scene = load("res://menus/level_select_scholar.tscn").instance() diff --git a/menus/level_select_scholar.gd b/menus/level_select_scholar.gd index a0a5280..7ae09cb 100644 --- a/menus/level_select_scholar.gd +++ b/menus/level_select_scholar.gd @@ -30,7 +30,7 @@ onready var shards_needed: Label = $"%ShardsNeeded" func _ready() -> void: $ShardCount.text = "%02d" % Save.current_file.get_total_shards() - Fade.fade_in(0.4) + Fade.fade_in(Options.transition_speed_secs) Audio.ac_music.stop() # set initial offset LevelData.levels[selected_level].save_id diff --git a/menus/main_menu.gd b/menus/main_menu.gd index 0d8e2ac..27c6645 100644 --- a/menus/main_menu.gd +++ b/menus/main_menu.gd @@ -3,7 +3,7 @@ extends Node onready var continue_button = $Panel/Continue func _ready(): - Fade.fade_in(0.4) + Fade.fade_in(Options.transition_speed_secs) #Grey out continue if no save files yield(get_tree(),"idle_frame") print(Save.current_file) @@ -17,31 +17,31 @@ func _ready(): Vector2( 0.83205, 0.5547 ) func _on_Continue_button_down(): - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") SceneManager.current_scene = load("res://menus/level_select_scholar.tscn").instance() func _on_FileSelect_button_down(): - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") SceneManager.current_scene = load("res://menus/file_select.tscn").instance() func _on_Exit_button_down(): - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") get_tree().quit() func _on_SoundTest_button_down(): - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") SceneManager.current_scene = load("res://menus/sound_test.tscn").instance() func _on_HighScores_button_down() -> void: - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") SceneManager.current_scene = load("res://menus/scoreboards.tscn").instance() diff --git a/menus/newgrounds_login.gd b/menus/newgrounds_login.gd index 6cfff72..3ded771 100644 --- a/menus/newgrounds_login.gd +++ b/menus/newgrounds_login.gd @@ -4,12 +4,12 @@ onready var tab_container: TabContainer = $"%TabContainer" func _ready() -> void: visible = false - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") visible = true yield(get_tree(), "idle_frame") grab_focus() - Fade.fade_in(0.4) + Fade.fade_in(Options.transition_speed_secs) if not Ngio.keys_loaded: tab_container.current_tab = 2 return diff --git a/menus/results.gd b/menus/results.gd index bff4c6d..cde0dbb 100644 --- a/menus/results.gd +++ b/menus/results.gd @@ -25,7 +25,7 @@ func _ready() -> void: yield(get_tree(), "idle_frame") self.add_child(text_3d) text_3d.animation_player.set_speed_scale(0) - Fade.fade_in(0.4) + Fade.fade_in(Options.transition_speed_secs) # fill in shard names var level: LevelEntry = LevelData.levels[Game.current_level] for i in 5: @@ -51,7 +51,7 @@ func final_score(): func _on_AnimationPlayer_animation_finished(anim_name): - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") if Debug.is_cheating == false: SceneManager.change_scene(SubmitScore.instance()) diff --git a/menus/rev83_intro.gd b/menus/rev83_intro.gd index a71dd43..52003ae 100644 --- a/menus/rev83_intro.gd +++ b/menus/rev83_intro.gd @@ -3,11 +3,11 @@ extends Node2D onready var label = $TextBlock/Label func _ready(): - Fade.fade_in(0.4) + Fade.fade_in(Options.transition_speed_secs) label.text = label.text % str(Save.current_file.name) func _input(event): if Input.is_action_just_pressed("ui_accept"): - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") SceneManager.current_scene = load("res://menus/intro_story.tscn").instance() diff --git a/menus/scoreboards.gd b/menus/scoreboards.gd index 14f090f..c57882e 100644 --- a/menus/scoreboards.gd +++ b/menus/scoreboards.gd @@ -33,7 +33,7 @@ onready var next_board: TextureRect = $"%NextBoard" # Called when the node enters the scene tree for the first time. func _ready() -> void: - Fade.fade_in(0.4) + Fade.fade_in(Options.transition_speed_secs) yield(get_tree(), "idle_frame") level_title.text = LevelData.levels[selected_level].title level_title.grab_focus() @@ -48,7 +48,7 @@ func _ready() -> void: func _input(event: InputEvent) -> void: if event.is_action_pressed("ui_cancel"): - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") SceneManager.current_scene = preload("res://menus/main_menu.tscn").instance() diff --git a/menus/sound_test.gd b/menus/sound_test.gd index 443128e..99a3e05 100644 --- a/menus/sound_test.gd +++ b/menus/sound_test.gd @@ -1,4 +1,4 @@ extends Control func _ready(): - Fade.fade_in(0.4) + Fade.fade_in(Options.transition_speed_secs) diff --git a/menus/splash_screen.gd b/menus/splash_screen.gd index afd5c06..16dc3b3 100644 --- a/menus/splash_screen.gd +++ b/menus/splash_screen.gd @@ -9,27 +9,27 @@ onready var godot: TextureRect = $Godot func _ready() -> void: yield(get_tree().create_timer(0.5), "timeout") - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") team_sg.visible = true - Fade.fade_in(0.4) + Fade.fade_in(Options.transition_speed_secs) yield(Fade, "fade_finished") yield(get_tree().create_timer(1.0), "timeout") - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") yield(get_tree().create_timer(0.5), "timeout") godot.visible = true - Fade.fade_in(0.4) + Fade.fade_in(Options.transition_speed_secs) yield(Fade, "fade_finished") yield(get_tree().create_timer(1.0), "timeout") - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") _next_screen() func _input(event: InputEvent) -> void: if Input.is_action_just_pressed("ui_accept"): skipping = true - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") _next_screen() free() diff --git a/menus/submit_score.gd b/menus/submit_score.gd index 0e14199..5b48a29 100644 --- a/menus/submit_score.gd +++ b/menus/submit_score.gd @@ -17,7 +17,7 @@ func _ready() -> void: yield(get_tree(), "idle_frame") print(_scoreboard_tag) $"%YesScore".grab_focus() - Fade.fade_in(0.4) + Fade.fade_in(Options.transition_speed_secs) func _on_YesScore_pressed() -> void: @@ -58,7 +58,7 @@ func _on_NoTime_pressed() -> void: func _next_screen() -> void: Game.clear_collectibles() - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") SceneManager.change_scene(LevelSelect.instance()) diff --git a/menus/title_screen.gd b/menus/title_screen.gd index 6b19693..2dd72da 100644 --- a/menus/title_screen.gd +++ b/menus/title_screen.gd @@ -23,7 +23,7 @@ func _input(event): has_started = true func _ready(): - Fade.fade_in(0.4) + Fade.fade_in(Options.transition_speed_secs) var time = OS.get_time() if time.hour >= 18 or time.hour < 6: $Night.visible = true @@ -33,6 +33,6 @@ func _ready(): func _on_AudioStreamPlayer_finished(): - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") SceneManager.current_scene = next_menu.instance() diff --git a/objects/environment/exit/exit.gd b/objects/environment/exit/exit.gd index 6e56ec4..154f59b 100644 --- a/objects/environment/exit/exit.gd +++ b/objects/environment/exit/exit.gd @@ -38,7 +38,7 @@ func _on_Area2D_area_entered(area): func _on_player_teleport_finished(): Game.tally_scores() yield(get_tree().create_timer(4.0, false), "timeout") - Fade.fade_out(0.4) + Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") SceneManager.change_scene(preload("res://menus/results.tscn").instance())