Undoing me deletingn daniel's branch out of mine

This commit is contained in:
Jasmine Hyder
2021-12-05 17:23:19 -06:00
parent da4f26ceab
commit 1a8ef7ff92
7 changed files with 109 additions and 77 deletions

View File

@@ -5,59 +5,59 @@
[ext_resource path="res://Enemies/Flaming Skull.gd" type="Script" id=4]
[ext_resource path="res://Sprites/Enemies/flaming skull design.png" type="Texture" id=5]
[sub_resource type="AtlasTexture" id=3]
flags = 4
[sub_resource type="AtlasTexture" id=1]
atlas = ExtResource( 5 )
region = Rect2( 0, 0, 672, 672 )
[sub_resource type="AtlasTexture" id=4]
flags = 4
[sub_resource type="AtlasTexture" id=2]
atlas = ExtResource( 5 )
region = Rect2( 672, 0, 672, 672 )
[sub_resource type="AtlasTexture" id=5]
flags = 4
[sub_resource type="AtlasTexture" id=3]
atlas = ExtResource( 5 )
region = Rect2( 1344, 0, 672, 672 )
[sub_resource type="SpriteFrames" id=6]
[sub_resource type="SpriteFrames" id=4]
animations = [ {
"frames": [ SubResource( 3 ), SubResource( 4 ), SubResource( 5 ) ],
"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ) ],
"loop": true,
"name": "default",
"speed": 5.0
} ]
[sub_resource type="CapsuleShape2D" id=1]
[sub_resource type="CapsuleShape2D" id=5]
radius = 3.0
height = 2.0
[sub_resource type="CircleShape2D" id=2]
[sub_resource type="CircleShape2D" id=6]
radius = 50.0
[node name="Flaming Skull" type="KinematicBody2D" groups=["enemies"]]
[node name="Flaming Skull" type="KinematicBody2D" groups=[
"enemies",
]]
collision_layer = 2
script = ExtResource( 4 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
scale = Vector2( 0.0446429, 0.0446429 )
frames = SubResource( 6 )
frames = SubResource( 4 )
frame = 1
playing = true
[node name="Hitbox" type="CollisionShape2D" parent="."]
visible = false
position = Vector2( 0, -3 )
shape = SubResource( 1 )
shape = SubResource( 5 )
[node name="Player Detector" type="Area2D" parent="."]
collision_layer = 0
collision_mask = 2
input_pickable = false
monitorable = false
collision_layer = 0
collision_mask = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="Player Detector"]
visible = false
shape = SubResource( 2 )
shape = SubResource( 6 )
[node name="Light2D" type="Light2D" parent="."]
visible = false
@@ -80,4 +80,4 @@ show_behind_parent = true
occluder = ExtResource( 1 )
[connection signal="area_entered" from="Player Detector" to="." method="_on_player_detector_area_entered"]
[connection signal="area_exited" from="Player Detector" to="." method="_on_player_detector_area_exited"]
[connection signal="area_exited" from="Player Detector" to="." method="_on_player_detector_area_exited"]