daniel/Embodiment
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing more merge conflicts

Browse Source
This commit is contained in:
Jasmine Hyder
2021-12-09 21:26:42 -06:00
parent 1fd6eeac95
commit ad704f9350
6 changed files with 65 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Enemies/Flaming Skull.tscn
View File

@@ -4,35 +4,36 @@
[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]
[sub_resource type="AtlasTexture" id=1]
atlas = ExtResource( 5 )
region = Rect2( 0, 0, 672, 672 )
[sub_resource type="AtlasTexture" id=4]
[sub_resource type="AtlasTexture" id=2]
atlas = ExtResource( 5 )
region = Rect2( 672, 0, 672, 672 )
[sub_resource type="AtlasTexture" id=5]
[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 = 5.0
height = 12.0
[sub_resource type="CircleShape2D" id=2]
[sub_resource type="CircleShape2D" id=6]
radius = 50.0
[node name="Flaming Skull" type="KinematicBody2D" groups=["enemy"]]
[node name="Flaming Skull" type="KinematicBody2D" groups=[
"enemy",
]]
light_mask = 0
collision_layer = 4
collision_mask = 5
@@ -41,8 +42,7 @@ script = ExtResource( 4 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
position = Vector2( 4.76837e-07, -2.38419e-07 )
scale = Vector2( 0.0517113, 0.0517113 )
frames = SubResource( 6 )
frame = 2
frames = SubResource( 4 )
playing = true
offset = Vector2( 0, 0.5 )
@@ -58,7 +58,9 @@ visible = false
light_mask = 0
rotation = 1.5708
[node name="Hitbox" type="Area2D" parent="." groups=["enemy_hitbox_1"]]
[node name="Hitbox" type="Area2D" parent="." groups=[
"enemy_hitbox_1",
]]
light_mask = 0
collision_layer = 4
collision_mask = 2
@@ -66,19 +68,19 @@ collision_mask = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
light_mask = 0
position = Vector2( -1, 1 )
shape = SubResource( 1 )
shape = SubResource( 5 )
[node name="Player Detector" type="Area2D" parent="."]
light_mask = 0
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
light_mask = 0
shape = SubResource( 2 )
shape = SubResource( 6 )
[connection signal="area_entered" from="Hitbox" to="." method="_on_hitbox_area_entered"]
[connection signal="body_entered" from="Player Detector" to="." method="_on_player_detector_body_entered"]