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

137
Enemies/Hellhound.tscn
View File

@@ -1,136 +1,42 @@
[gd_scene load_steps=30 format=2]
[gd_scene load_steps=9 format=2]
[ext_resource path="res://Resources/Level_5_Enemy_Glowing_Ghost_Occluder.tres" type="OccluderPolygon2D" id=1]
[ext_resource path="res://Sprites/Assets/Light.png" type="Texture" id=2]
[ext_resource path="res://Sprites/Enemies/Hell_Hound_Idle.png" type="Texture" id=3]
[ext_resource path="res://Enemies/Hellhound.gd" type="Script" id=4]
[ext_resource path="res://Sprites/Enemies/Hell_Hound_Jump.png" type="Texture" id=5]
[ext_resource path="res://Sprites/Enemies/Hell_Hound_Run.png" type="Texture" id=6]
[ext_resource path="res://Sprites/Enemies/Chasing_Glowing_Ghost.png" type="Texture" id=7]
[sub_resource type="AtlasTexture" id=3]
atlas = ExtResource( 5 )
region = Rect2( 0, 0, 65, 48 )
[sub_resource type="AtlasTexture" id=4]
atlas = ExtResource( 5 )
region = Rect2( 65, 0, 65, 48 )
[sub_resource type="AtlasTexture" id=5]
atlas = ExtResource( 5 )
region = Rect2( 130, 0, 65, 48 )
[sub_resource type="AtlasTexture" id=6]
atlas = ExtResource( 5 )
region = Rect2( 195, 0, 65, 48 )
[sub_resource type="AtlasTexture" id=7]
atlas = ExtResource( 5 )
region = Rect2( 260, 0, 65, 48 )
[sub_resource type="AtlasTexture" id=8]
atlas = ExtResource( 5 )
region = Rect2( 325, 0, 65, 48 )
[sub_resource type="AtlasTexture" id=15]
atlas = ExtResource( 6 )
region = Rect2( 0, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=16]
atlas = ExtResource( 6 )
region = Rect2( 67, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=17]
atlas = ExtResource( 6 )
region = Rect2( 134, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=18]
atlas = ExtResource( 6 )
region = Rect2( 201, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=19]
atlas = ExtResource( 6 )
region = Rect2( 268, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=9]
atlas = ExtResource( 3 )
region = Rect2( 0, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=10]
atlas = ExtResource( 3 )
region = Rect2( 64, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=11]
atlas = ExtResource( 3 )
region = Rect2( 128, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=12]
atlas = ExtResource( 3 )
region = Rect2( 192, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=13]
atlas = ExtResource( 3 )
region = Rect2( 256, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=14]
atlas = ExtResource( 3 )
region = Rect2( 320, 0, 64, 32 )
[sub_resource type="SpriteFrames" id=20]
animations = [ {
"frames": [ SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ) ]
"loop": true,
"name": "Jump",
"speed": 8.0
}, {
"frames": [ SubResource( 13 ), SubResource( 14 ), SubResource( 15 ), SubResource( 16 ), SubResource( 17 ) ],
"loop": true,
"name": "Running",
"speed": 5.0
}, {
"frames": [ SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ), SubResource( 13 ), SubResource( 14 ) ],
"loop": true,
"name": "Idle",
"speed": 3.0
} ]
[sub_resource type="CapsuleShape2D" id=21]
[sub_resource type="CapsuleShape2D" id=1]
radius = 1.5
height = 3.0
[sub_resource type="CapsuleShape2D" id=1]
[sub_resource type="CapsuleShape2D" id=2]
radius = 8.0
height = 2.0
[sub_resource type="CircleShape2D" id=2]
[sub_resource type="CircleShape2D" id=3]
radius = 82.0061
[sub_resource type="CircleShape2D" id=22]
[sub_resource type="CircleShape2D" id=4]
radius = 25.02
[node name="Hellhound" type="KinematicBody2D" groups=["enemy"]]
[node name="Hellhound" type="KinematicBody2D" groups=[
"enemy",
]]
light_mask = 0
collision_layer = 4
collision_mask = 5
script = ExtResource( 4 )
[node name="AnimatedSprite1" type="AnimatedSprite" parent="."]
light_mask = 0
position = Vector2( 1, -3 )
scale = Vector2( 0.5625, 0.5625 )
frames = SubResource( 18 )
animation = "Idle"
frame = 3
playing = true
[node name="Sprite" type="Sprite" parent="."]
visible = false
light_mask = 4
position = Vector2( 0, -3 )
texture = ExtResource( 7 )
offset = Vector2( 0, 0.5 )
@@ -138,9 +44,11 @@ offset = Vector2( 0, 0.5 )
visible = false
light_mask = 0
rotation = 1.5708
shape = SubResource( 21 )
shape = SubResource( 1 )
[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
@@ -148,13 +56,10 @@ collision_mask = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
visible = false
light_mask = 0
shape = SubResource( 1 )
shape = SubResource( 2 )
[node name="Player Detector" type="Area2D" parent="."]
light_mask = 0
collision_layer = 0
collision_mask = 2
input_pickable = false
monitorable = false
collision_layer = 0
@@ -162,34 +67,28 @@ collision_mask = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="Player Detector"]
visible = false
light_mask = 0
shape = SubResource( 2 )
shape = SubResource( 3 )
[node name="Player Detector - Attack" 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 - Attack"]
shape = SubResource( 22 )
shape = SubResource( 4 )
[node name="Player Detector - Attack2" 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 - Attack2"]
shape = SubResource( 22 )
shape = SubResource( 4 )
[node name="Light" type="Light2D" parent="."]
visible = false