Merged with main

This commit is contained in:
VoidTwo
2021-12-09 23:13:44 -06:00
136 changed files with 4395 additions and 156 deletions

View File

@@ -1,111 +1,108 @@
[gd_scene load_steps=30 format=2]
[gd_scene load_steps=27 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://Sprites/Enemies/Hell_Hound_Run.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]
[ext_resource path="res://Sprites/Enemies/Hell_Hound_Idle.png" type="Texture" id=5]
[ext_resource path="res://Sprites/Enemies/Hell_Hound_Jump.png" type="Texture" id=6]
[sub_resource type="AtlasTexture" id=23]
atlas = ExtResource( 3 )
region = Rect2( 0, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=24]
atlas = ExtResource( 3 )
region = Rect2( 64, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=25]
atlas = ExtResource( 3 )
region = Rect2( 128, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=26]
atlas = ExtResource( 3 )
region = Rect2( 192, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=27]
atlas = ExtResource( 3 )
region = Rect2( 256, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=28]
atlas = ExtResource( 3 )
region = Rect2( 320, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=29]
[sub_resource type="AtlasTexture" id=5]
atlas = ExtResource( 6 )
region = Rect2( 0, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=30]
atlas = ExtResource( 6 )
region = Rect2( 67, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=31]
atlas = ExtResource( 6 )
region = Rect2( 134, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=32]
atlas = ExtResource( 6 )
region = Rect2( 201, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=33]
atlas = ExtResource( 6 )
region = Rect2( 268, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=34]
atlas = ExtResource( 5 )
region = Rect2( 0, 0, 65, 48 )
[sub_resource type="AtlasTexture" id=35]
atlas = ExtResource( 5 )
[sub_resource type="AtlasTexture" id=6]
atlas = ExtResource( 6 )
region = Rect2( 65, 0, 65, 48 )
[sub_resource type="AtlasTexture" id=36]
atlas = ExtResource( 5 )
[sub_resource type="AtlasTexture" id=7]
atlas = ExtResource( 6 )
region = Rect2( 130, 0, 65, 48 )
[sub_resource type="AtlasTexture" id=37]
atlas = ExtResource( 5 )
[sub_resource type="AtlasTexture" id=8]
atlas = ExtResource( 6 )
region = Rect2( 195, 0, 65, 48 )
[sub_resource type="AtlasTexture" id=38]
atlas = ExtResource( 5 )
[sub_resource type="AtlasTexture" id=9]
atlas = ExtResource( 6 )
region = Rect2( 260, 0, 65, 48 )
[sub_resource type="AtlasTexture" id=39]
atlas = ExtResource( 5 )
[sub_resource type="AtlasTexture" id=10]
atlas = ExtResource( 6 )
region = Rect2( 325, 0, 65, 48 )
[sub_resource type="SpriteFrames" id=40]
[sub_resource type="AtlasTexture" id=11]
atlas = ExtResource( 3 )
region = Rect2( 0, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=12]
atlas = ExtResource( 3 )
region = Rect2( 67, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=13]
atlas = ExtResource( 3 )
region = Rect2( 134, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=14]
atlas = ExtResource( 3 )
region = Rect2( 201, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=15]
atlas = ExtResource( 3 )
region = Rect2( 268, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=16]
atlas = ExtResource( 5 )
region = Rect2( 0, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=17]
atlas = ExtResource( 5 )
region = Rect2( 64, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=18]
atlas = ExtResource( 5 )
region = Rect2( 128, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=19]
atlas = ExtResource( 5 )
region = Rect2( 192, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=20]
atlas = ExtResource( 5 )
region = Rect2( 256, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=21]
atlas = ExtResource( 5 )
region = Rect2( 320, 0, 64, 32 )
[sub_resource type="SpriteFrames" id=22]
animations = [ {
"frames": [ SubResource( 23 ), SubResource( 24 ), SubResource( 25 ), SubResource( 26 ), SubResource( 27 ), SubResource( 28 ) ],
"frames": [ SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ) ],
"loop": true,
"name": "Idle",
"name": "Jump",
"speed": 5.0
}, {
"frames": [ SubResource( 29 ), SubResource( 30 ), SubResource( 31 ), SubResource( 32 ), SubResource( 33 ) ],
"frames": [ SubResource( 11 ), SubResource( 12 ), SubResource( 13 ), SubResource( 14 ), SubResource( 15 ) ],
"loop": true,
"name": "Running",
"speed": 5.0
}, {
"frames": [ SubResource( 34 ), SubResource( 35 ), SubResource( 36 ), SubResource( 37 ), SubResource( 38 ), SubResource( 39 ) ],
"frames": [ SubResource( 16 ), SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ), SubResource( 21 ) ],
"loop": true,
"name": "Jump",
"name": "Idle",
"speed": 5.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"]]
@@ -118,23 +115,16 @@ script = ExtResource( 4 )
light_mask = 0
position = Vector2( 1, -3 )
scale = Vector2( 0.5625, 0.5625 )
frames = SubResource( 40 )
frames = SubResource( 22 )
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 )
[node name="Collision" type="CollisionShape2D" parent="."]
visible = false
light_mask = 0
rotation = 1.5708
shape = SubResource( 21 )
shape = SubResource( 1 )
[node name="Hitbox" type="Area2D" parent="." groups=["enemy_hitbox_1"]]
light_mask = 0
@@ -144,7 +134,7 @@ 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
@@ -156,7 +146,7 @@ monitorable = false
[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
@@ -166,7 +156,7 @@ input_pickable = false
monitorable = false
[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
@@ -176,28 +166,7 @@ input_pickable = false
monitorable = false
[node name="CollisionShape2D" type="CollisionShape2D" parent="Player Detector - Attack2"]
shape = SubResource( 22 )
[node name="Light" type="Light2D" parent="."]
visible = false
texture = ExtResource( 2 )
texture_scale = 0.5
color = Color( 0.984314, 0.94902, 0.211765, 0.392157 )
energy = 2.0
range_item_cull_mask = 11
[node name="Eyes" type="Light2D" parent="."]
visible = false
scale = Vector2( 0.1, 0.1 )
texture = ExtResource( 2 )
offset = Vector2( 5, -35 )
range_item_cull_mask = 4
shadow_item_cull_mask = 0
[node name="Occluder" type="LightOccluder2D" parent="."]
visible = false
show_behind_parent = true
occluder = ExtResource( 1 )
shape = SubResource( 4 )
[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"]