restart level call deferred

This commit is contained in:
pennyrigate 2023-01-16 03:34:47 -05:00
parent 3247a67e96
commit 88b4135315
5 changed files with 20 additions and 21 deletions

24
game.gd
View file

@ -23,19 +23,19 @@ onready var ac_die = $DieSound
onready var ac_music = $Music onready var ac_music = $Music
onready var ac_cheat = $CodeEntrySound onready var ac_cheat = $CodeEntrySound
#Sounds #Sounds
onready var a_gold = preload("res://audio/sounds/gold.wav") const a_gold = preload("res://audio/sounds/gold.wav")
onready var a_arrow = preload("res://audio/sounds/a_egg_collect.ogg") const a_arrow = preload("res://audio/sounds/a_egg_collect.ogg")
onready var a_jump = preload("res://audio/sounds/jump.ogg") const a_jump = preload("res://audio/sounds/jump.ogg")
onready var a_star = preload("res://audio/sounds/a_jinjo.ogg") const a_star = preload("res://audio/sounds/a_jinjo.ogg")
onready var a_shard = preload("res://audio/sounds/tempjingle.wav") const a_shard = preload("res://audio/sounds/tempjingle.wav")
onready var a_climb_up = preload("res://audio/sounds/a_climb.ogg") const a_climb_up = preload("res://audio/sounds/a_climb.ogg")
onready var a_climb_down = preload("res://audio/sounds/a_bmilc.ogg") const a_climb_down = preload("res://audio/sounds/a_bmilc.ogg")
onready var a_sword = preload("res://audio/sounds/sword.ogg") const a_sword = preload("res://audio/sounds/sword.ogg")
onready var a_doublejump = preload("res://audio/sounds/a_bree.wav") const a_doublejump = preload("res://audio/sounds/a_bree.wav")
onready var a_shoot = preload("res://audio/sounds/a_egg_shoot.ogg") const a_shoot = preload("res://audio/sounds/a_egg_shoot.ogg")
onready var a_die = preload("res://audio/sounds/die.wav") const a_die = preload("res://audio/sounds/die.wav")
#Objects #Objects
onready var block_text = preload("res://objects/hud/blocktext.tscn") const block_text = preload("res://objects/hud/blocktext.tscn")
const pause_screen = preload("res://objects/hud/pause_screen.tscn") const pause_screen = preload("res://objects/hud/pause_screen.tscn")
var respawn_point = Vector2(32,166) #Respawn point var respawn_point = Vector2(32,166) #Respawn point
var current_level = 0 #Current level being played var current_level = 0 #Current level being played

View file

@ -1,11 +1,5 @@
extends Node2D extends Node2D
# Declare member variables here. Examples:
# var a = 2
# var b = "text"
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():
get_tree().paused = true get_tree().paused = true
@ -18,4 +12,8 @@ func _on_Resume_pressed():
func _on_Restart_pressed(): func _on_Restart_pressed():
Game Game.call_deferred("restart_level")
func _on_ExitLevel_pressed():
Game.change_map(load("res://maps/level_select.tscn"))

View file

@ -87,3 +87,4 @@ texture_focused = ExtResource( 3 )
[connection signal="pressed" from="Body/Resume" to="." method="_on_Resume_pressed"] [connection signal="pressed" from="Body/Resume" to="." method="_on_Resume_pressed"]
[connection signal="pressed" from="Body/Restart" to="." method="_on_Restart_pressed"] [connection signal="pressed" from="Body/Restart" to="." method="_on_Restart_pressed"]
[connection signal="pressed" from="Body/ExitLevel" to="." method="_on_ExitLevel_pressed"]

View file

@ -253,7 +253,7 @@ func die():
Game.lives -= 1 Game.lives -= 1
Game.play_sound(Game.a_die,Game.ac_die) Game.play_sound(Game.a_die,Game.ac_die)
if Game.lives < 0: if Game.lives < 0:
Game.restart_level() Game.call_deferred("restart_level")
func _on_AnimationPlayer_animation_finished(anim_name): func _on_AnimationPlayer_animation_finished(anim_name):

View file

@ -40,7 +40,7 @@ func _physics_process(delta):
console.visible = !console.visible console.visible = !console.visible
#Restart scene #Restart scene
if Input.is_action_just_pressed("debug_restart"): if Input.is_action_just_pressed("debug_restart"):
Game.restart_level() Game.call_deferred("restart_level")
#Move player to mouse #Move player to mouse
if Input.is_action_pressed("debug_move_player"): if Input.is_action_pressed("debug_move_player"):
Game.get_map().get_node("Player").position = get_viewport().get_mouse_position() Game.get_map().get_node("Player").position = get_viewport().get_mouse_position()