added respawn timer for falling blocks
This commit is contained in:
parent
25fcdd6f54
commit
86ee9b12fa
7 changed files with 51 additions and 37 deletions
BIN
audio/sounds/die.wav
Normal file
BIN
audio/sounds/die.wav
Normal file
Binary file not shown.
23
audio/sounds/die.wav.import
Normal file
23
audio/sounds/die.wav.import
Normal file
|
@ -0,0 +1,23 @@
|
|||
[remap]
|
||||
|
||||
importer="wav"
|
||||
type="AudioStreamSample"
|
||||
path="res://.import/die.wav-bed4faf3cb9c725fe22ee38040ba1e8d.sample"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://audio/sounds/die.wav"
|
||||
dest_files=[ "res://.import/die.wav-bed4faf3cb9c725fe22ee38040ba1e8d.sample" ]
|
||||
|
||||
[params]
|
||||
|
||||
force/8_bit=false
|
||||
force/mono=false
|
||||
force/max_rate=false
|
||||
force/max_rate_hz=44100
|
||||
edit/trim=false
|
||||
edit/normalize=false
|
||||
edit/loop_mode=0
|
||||
edit/loop_begin=0
|
||||
edit/loop_end=-1
|
||||
compress/mode=0
|
Binary file not shown.
2
game.gd
2
game.gd
|
@ -33,7 +33,7 @@ onready var a_climb_down = preload("res://audio/sounds/a_bmilc.ogg")
|
|||
onready var a_sword = preload("res://audio/sounds/sword.ogg")
|
||||
onready var a_doublejump = preload("res://audio/sounds/a_bree.wav")
|
||||
onready var a_shoot = preload("res://audio/sounds/a_egg_shoot.ogg")
|
||||
onready var a_die = preload("res://audio/sounds/a_hurt.ogg")
|
||||
onready var a_die = preload("res://audio/sounds/die.wav")
|
||||
#Objects
|
||||
onready var block_text = preload("res://objects/hud/blocktext.tscn")
|
||||
var respawn_point = Vector2(32,166) #Respawn point
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -3,7 +3,8 @@ extends KinematicBody2D
|
|||
var fall = false
|
||||
export var fall_speed = 0.5
|
||||
onready var startpos = position
|
||||
onready var timer = $Timer
|
||||
onready var fall_timer = $FallTimer
|
||||
onready var refresh_timer = $RefreshTimer
|
||||
|
||||
func _physics_process(delta):
|
||||
if fall:
|
||||
|
@ -11,18 +12,21 @@ func _physics_process(delta):
|
|||
|
||||
func _on_Area2D_area_entered(area):
|
||||
if area.is_in_group("player"):
|
||||
timer.start()
|
||||
fall_timer.start()
|
||||
|
||||
|
||||
func _on_VisibilityNotifier2D_screen_exited():
|
||||
position = startpos
|
||||
fall = false
|
||||
|
||||
func _on_RefreshTimer_timeout():
|
||||
position = startpos
|
||||
fall = false
|
||||
|
||||
func _on_Timer_timeout():
|
||||
func _on_FallTimer_timeout():
|
||||
fall = true
|
||||
refresh_timer.start()
|
||||
|
||||
|
||||
func _on_Area2D_area_exited(area):
|
||||
timer.stop()
|
||||
|
||||
fall_timer.stop()
|
||||
|
|
|
@ -35,11 +35,15 @@ collision_mask = 2
|
|||
position = Vector2( 4, -0.5 )
|
||||
shape = SubResource( 2 )
|
||||
|
||||
[node name="Timer" type="Timer" parent="."]
|
||||
[node name="FallTimer" type="Timer" parent="."]
|
||||
wait_time = 0.15
|
||||
one_shot = true
|
||||
|
||||
[node name="RefreshTimer" type="Timer" parent="."]
|
||||
wait_time = 2.0
|
||||
|
||||
[connection signal="screen_exited" from="VisibilityNotifier2D" to="." method="_on_VisibilityNotifier2D_screen_exited"]
|
||||
[connection signal="area_entered" from="Area2D" to="." method="_on_Area2D_area_entered"]
|
||||
[connection signal="area_exited" from="Area2D" to="." method="_on_Area2D_area_exited"]
|
||||
[connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"]
|
||||
[connection signal="timeout" from="FallTimer" to="." method="_on_FallTimer_timeout"]
|
||||
[connection signal="timeout" from="RefreshTimer" to="." method="_on_RefreshTimer_timeout"]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue