Skip to content
Snippets Groups Projects
Commit a8b9a1ea authored by Jannik Rosendahl's avatar Jannik Rosendahl
Browse files

Auto stash before merge of "main" and "origin/main"

parent 06ce141b
No related branches found
No related tags found
No related merge requests found
......@@ -234,11 +234,6 @@ animations = [ {
"name": "jump",
"speed": 5.0
}, {
"frames": [ ExtResource( 14 ), ExtResource( 16 ), ExtResource( 18 ), ExtResource( 20 ), ExtResource( 17 ), ExtResource( 19 ) ],
"loop": true,
"name": "walk",
"speed": 5.0
}, {
"frames": [ ExtResource( 9 ) ],
"loop": true,
"name": "hurt",
......@@ -248,6 +243,11 @@ animations = [ {
"loop": true,
"name": "death",
"speed": 2.0
}, {
"frames": [ ExtResource( 14 ), ExtResource( 16 ), ExtResource( 18 ), ExtResource( 20 ), ExtResource( 17 ), ExtResource( 19 ) ],
"loop": true,
"name": "walk",
"speed": 5.0
} ]
[sub_resource type="RectangleShape2D" id=3]
......@@ -267,7 +267,7 @@ script = SubResource( 1 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
frames = SubResource( 2 )
animation = "walk"
frame = 2
frame = 5
playing = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
......@@ -345,5 +345,4 @@ __meta__ = {
[connection signal="animation_finished" from="AnimatedSprite" to="." method="_on_AnimatedSprite_animation_finished"]
[connection signal="body_entered" from="PlayerDetector" to="." method="_on_PlayerDetector_body_entered"]
[connection signal="body_exited" from="PlayerDetector" to="." method="_on_PlayerDetector_body_exited"]
[connection signal="body_entered" from="SwordHitbox" to="." method="_on_SwordHitbox_body_entered"]
......@@ -48,6 +48,7 @@ script = SubResource( 1 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
frames = SubResource( 2 )
frame = 1
playing = true
[node name="Area2D" type="Area2D" parent="."]
......
......@@ -7,6 +7,7 @@ func _ready():
func _on_coin_collected():
coins = coins + 10
if $coinSound != null:
$coinSound.play()
_ready()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment