diff --git a/scenes/game/ui/UI.tscn b/scenes/game/ui/UI.tscn index 5c27100..739b68e 100644 --- a/scenes/game/ui/UI.tscn +++ b/scenes/game/ui/UI.tscn @@ -121,7 +121,8 @@ offset_left = -313.0 offset_top = -26.0 grow_horizontal = 0 grow_vertical = 0 -text = "(R)estart (E)xplore (N)ew Game" +text = "(R)estart (E)xplore" +horizontal_alignment = 2 [node name="Label2" type="Label" parent="HUD/Control"] layout_mode = 1 diff --git a/scripts/game/GameStateManager.gd b/scripts/game/GameStateManager.gd index ca2acf2..9f66507 100644 --- a/scripts/game/GameStateManager.gd +++ b/scripts/game/GameStateManager.gd @@ -82,4 +82,5 @@ func start_postgame(): postgame_started.emit() func end_game(): + game_in_progress = false start_explore() diff --git a/scripts/game/player/player.gd b/scripts/game/player/player.gd index faa36d3..64af4ff 100644 --- a/scripts/game/player/player.gd +++ b/scripts/game/player/player.gd @@ -151,14 +151,14 @@ func _jump(): if Input.is_action_just_pressed("jump"): if _is_on_floor: velocity += jump_velocity - AudioDispatcher.dispatch_audio(self, "sounds/player/jump/grounded/", 0.3, "SFX") + AudioDispatcher.dispatch_audio(self, "sounds/player/jump/grounded/", 0.1, "SFX") elif can_double_jump: if velocity.y < 0: velocity.y = jump_velocity.y else: velocity += jump_velocity can_double_jump = false - AudioDispatcher.dispatch_audio(self, "sounds/player/jump/air", 0.5, "SFX") + AudioDispatcher.dispatch_audio(self, "sounds/player/jump/air", 0.3, "SFX") if _is_on_floor: can_double_jump = true diff --git a/scripts/game/ui/EscapeMenu.gd b/scripts/game/ui/EscapeMenu.gd index 17d63a1..a19ac52 100644 --- a/scripts/game/ui/EscapeMenu.gd +++ b/scripts/game/ui/EscapeMenu.gd @@ -28,7 +28,8 @@ func _ready(): mainmenu_button.pressed.connect( func(): toggle_paused() - get_tree().change_scene_to_file("res://scenes/MAINMENU.tscn") + #get_tree().change_scene_to_file("res://scenes/MAINMENU.tscn") + get_tree().quit() ) func _input(event): diff --git a/scripts/game/ui/WinPanel.gd b/scripts/game/ui/WinPanel.gd index 92e516a..4a87bcc 100644 --- a/scripts/game/ui/WinPanel.gd +++ b/scripts/game/ui/WinPanel.gd @@ -9,6 +9,7 @@ signal finished() func _ready(): timer.timeout.connect( func(): + print('Hiding now!') self.hide() finished.emit() )