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

Undoing me deletingn daniel's branch out of mine

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
Enemies/Flaming Skull.gd
View File

@@ -25,4 +25,4 @@ func _on_player_detector_area_entered(area: Area2D) -> void:
func _on_player_detector_area_exited(_area: Area2D):
player = null
return
return

34
Enemies/Flaming Skull.tscn
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"]

2
Enemies/Hellhound.gd
View File

@@ -44,4 +44,4 @@ func _on_Player_Attack_area_entered(area: Area2D) -> void:
func _on_Player_Attack_area_exited(area: Area2D) -> void:
player = null
$AnimatedSprite1.animation = "Running"
return
return

85
Enemies/Hellhound.tscn
View File

@@ -7,124 +7,109 @@
[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]
[sub_resource type="AtlasTexture" id=9]
flags = 4
[sub_resource type="AtlasTexture" id=1]
atlas = ExtResource( 3 )
region = Rect2( 0, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=10]
flags = 4
[sub_resource type="AtlasTexture" id=2]
atlas = ExtResource( 3 )
region = Rect2( 64, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=11]
flags = 4
[sub_resource type="AtlasTexture" id=3]
atlas = ExtResource( 3 )
region = Rect2( 128, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=12]
flags = 4
[sub_resource type="AtlasTexture" id=4]
atlas = ExtResource( 3 )
region = Rect2( 192, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=13]
flags = 4
[sub_resource type="AtlasTexture" id=5]
atlas = ExtResource( 3 )
region = Rect2( 256, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=14]
flags = 4
[sub_resource type="AtlasTexture" id=6]
atlas = ExtResource( 3 )
region = Rect2( 320, 0, 64, 32 )
[sub_resource type="AtlasTexture" id=3]
flags = 4
[sub_resource type="AtlasTexture" id=7]
atlas = ExtResource( 5 )
region = Rect2( 0, 0, 65, 48 )
[sub_resource type="AtlasTexture" id=4]
flags = 4
[sub_resource type="AtlasTexture" id=8]
atlas = ExtResource( 5 )
region = Rect2( 65, 0, 65, 48 )
[sub_resource type="AtlasTexture" id=5]
flags = 4
[sub_resource type="AtlasTexture" id=9]
atlas = ExtResource( 5 )
region = Rect2( 130, 0, 65, 48 )
[sub_resource type="AtlasTexture" id=6]
flags = 4
[sub_resource type="AtlasTexture" id=10]
atlas = ExtResource( 5 )
region = Rect2( 195, 0, 65, 48 )
[sub_resource type="AtlasTexture" id=7]
flags = 4
[sub_resource type="AtlasTexture" id=11]
atlas = ExtResource( 5 )
region = Rect2( 260, 0, 65, 48 )
[sub_resource type="AtlasTexture" id=8]
flags = 4
[sub_resource type="AtlasTexture" id=12]
atlas = ExtResource( 5 )
region = Rect2( 325, 0, 65, 48 )
[sub_resource type="AtlasTexture" id=15]
flags = 4
[sub_resource type="AtlasTexture" id=13]
atlas = ExtResource( 6 )
region = Rect2( 0, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=16]
flags = 4
[sub_resource type="AtlasTexture" id=14]
atlas = ExtResource( 6 )
region = Rect2( 67, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=17]
flags = 4
[sub_resource type="AtlasTexture" id=15]
atlas = ExtResource( 6 )
region = Rect2( 134, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=18]
flags = 4
[sub_resource type="AtlasTexture" id=16]
atlas = ExtResource( 6 )
region = Rect2( 201, 0, 67, 32 )
[sub_resource type="AtlasTexture" id=19]
flags = 4
[sub_resource type="AtlasTexture" id=17]
atlas = ExtResource( 6 )
region = Rect2( 268, 0, 67, 32 )
[sub_resource type="SpriteFrames" id=20]
[sub_resource type="SpriteFrames" id=18]
animations = [ {
"frames": [ SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ), SubResource( 13 ), SubResource( 14 ) ],
"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ) ],
"loop": true,
"name": "Idle",
"speed": 3.0
}, {
"frames": [ SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ) ],
"frames": [ SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ) ],
"loop": true,
"name": "Jump",
"speed": 8.0
}, {
"frames": [ SubResource( 15 ), SubResource( 16 ), SubResource( 17 ), SubResource( 18 ), SubResource( 19 ) ],
"frames": [ SubResource( 13 ), SubResource( 14 ), SubResource( 15 ), SubResource( 16 ), SubResource( 17 ) ],
"loop": true,
"name": "Running",
"speed": 5.0
} ]
[sub_resource type="CapsuleShape2D" id=1]
[sub_resource type="CapsuleShape2D" id=19]
radius = 3.0
height = 2.0
[sub_resource type="CircleShape2D" id=2]
[sub_resource type="CircleShape2D" id=20]
radius = 50.0
[node name="Hellhound" type="KinematicBody2D" groups=["enemies"]]
[node name="Hellhound" type="KinematicBody2D" groups=[
"enemies",
]]
collision_layer = 2
script = ExtResource( 4 )
[node name="AnimatedSprite1" type="AnimatedSprite" parent="."]
position = Vector2( 1, -3 )
scale = Vector2( 0.5625, 0.5625 )
frames = SubResource( 20 )
frames = SubResource( 18 )
animation = "Idle"
frame = 5
playing = true
@@ -132,30 +117,30 @@ playing = true
[node name="Hitbox" type="CollisionShape2D" parent="."]
visible = false
position = Vector2( 0, -3 )
shape = SubResource( 1 )
shape = SubResource( 19 )
[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
scale = Vector2( 1.5, 1.5 )
shape = SubResource( 2 )
shape = SubResource( 20 )
[node name="Player Attack" type="Area2D" parent="."]
visible = false
collision_layer = 0
collision_mask = 2
input_pickable = false
monitorable = false
collision_layer = 0
collision_mask = 2
[node name="Attack" type="CollisionShape2D" parent="Player Attack"]
visible = false
scale = Vector2( 0.5, 0.5 )
shape = SubResource( 2 )
shape = SubResource( 20 )
[node name="Light2D" type="Light2D" parent="."]
visible = false
@@ -180,4 +165,4 @@ 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_entered" from="Player Attack" to="." method="_on_Player_Attack_area_entered"]
[connection signal="area_exited" from="Player Attack" to="." method="_on_Player_Attack_area_exited"]
[connection signal="area_exited" from="Player Attack" to="." method="_on_Player_Attack_area_exited"]

6
Levels/Level 4.tscn
View File

@@ -70,21 +70,21 @@ tile_data = PoolIntArray( -2359292, 0, 5, -2359291, 0, 196610, -2359290, 0, 1966
[node name="Fire3" type="AnimatedSprite" parent="."]
position = Vector2( -607.628, -210.601 )
frames = SubResource( 1 )
frame = 13
frame = 8
playing = true
offset = Vector2( 679.819, 333.222 )
[node name="Fire2" type="AnimatedSprite" parent="."]
position = Vector2( -543.25, -212.563 )
frames = SubResource( 1 )
frame = 2
frame = 11
playing = true
offset = Vector2( 679.819, 333.222 )
[node name="Fire1" type="AnimatedSprite" parent="."]
position = Vector2( -479.806, -214.167 )
frames = SubResource( 1 )
frame = 9
frame = 4
playing = true
offset = Vector2( 679.819, 333.222 )

3
Sprites/Assets/tileset_mk_16_16_nature_tileset_godot.png.import
View File

@@ -28,8 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
svg/scale=1.0

54
Sprites/Assets/tileset_mk_16_16_nature_tileset_godot.tres
View File

@@ -1,6 +1,6 @@
[gd_resource type="TileSet" load_steps=2 format=2]
[ext_resource path="./tileset_mk_16_16_nature_tileset_godot.png" type="Texture" id=1]
[ext_resource path="res://Sprites/Assets/tileset_mk_16_16_nature_tileset_godot.png" type="Texture" id=1]
[resource]
0/name = "tileset_mk_16_16_nature_tileset_godot.png 0"
@@ -20,6 +20,10 @@
0/autotile/z_index_map = [ ]
0/occluder_offset = Vector2( 0, 0 )
0/navigation_offset = Vector2( 0, 0 )
0/shape_offset = Vector2( 0, 0 )
0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
0/shape_one_way = false
0/shape_one_way_margin = 0.0
0/shapes = [ ]
0/z_index = 0
1/name = "tileset_mk_16_16_nature_tileset_godot.png 1"
@@ -39,6 +43,10 @@
1/autotile/z_index_map = [ ]
1/occluder_offset = Vector2( 0, 0 )
1/navigation_offset = Vector2( 0, 0 )
1/shape_offset = Vector2( 0, 0 )
1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
1/shape_one_way = false
1/shape_one_way_margin = 0.0
1/shapes = [ ]
1/z_index = 0
2/name = "tileset_mk_16_16_nature_tileset_godot.png 2"
@@ -58,6 +66,10 @@
2/autotile/z_index_map = [ ]
2/occluder_offset = Vector2( 0, 0 )
2/navigation_offset = Vector2( 0, 0 )
2/shape_offset = Vector2( 0, 0 )
2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
2/shape_one_way = false
2/shape_one_way_margin = 0.0
2/shapes = [ ]
2/z_index = 0
3/name = "tileset_mk_16_16_nature_tileset_godot.png 3"
@@ -77,6 +89,10 @@
3/autotile/z_index_map = [ ]
3/occluder_offset = Vector2( 0, 0 )
3/navigation_offset = Vector2( 0, 0 )
3/shape_offset = Vector2( 0, 0 )
3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
3/shape_one_way = false
3/shape_one_way_margin = 0.0
3/shapes = [ ]
3/z_index = 0
4/name = "tileset_mk_16_16_nature_tileset_godot.png 4"
@@ -96,6 +112,10 @@
4/autotile/z_index_map = [ ]
4/occluder_offset = Vector2( 0, 0 )
4/navigation_offset = Vector2( 0, 0 )
4/shape_offset = Vector2( 0, 0 )
4/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
4/shape_one_way = false
4/shape_one_way_margin = 0.0
4/shapes = [ ]
4/z_index = 0
5/name = "tileset_mk_16_16_nature_tileset_godot.png 5"
@@ -115,6 +135,10 @@
5/autotile/z_index_map = [ ]
5/occluder_offset = Vector2( 0, 0 )
5/navigation_offset = Vector2( 0, 0 )
5/shape_offset = Vector2( 0, 0 )
5/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
5/shape_one_way = false
5/shape_one_way_margin = 0.0
5/shapes = [ ]
5/z_index = 0
6/name = "tileset_mk_16_16_nature_tileset_godot.png 6"
@@ -134,6 +158,10 @@
6/autotile/z_index_map = [ ]
6/occluder_offset = Vector2( 0, 0 )
6/navigation_offset = Vector2( 0, 0 )
6/shape_offset = Vector2( 0, 0 )
6/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
6/shape_one_way = false
6/shape_one_way_margin = 0.0
6/shapes = [ ]
6/z_index = 0
7/name = "tileset_mk_16_16_nature_tileset_godot.png 7"
@@ -153,6 +181,10 @@
7/autotile/z_index_map = [ ]
7/occluder_offset = Vector2( 0, 0 )
7/navigation_offset = Vector2( 0, 0 )
7/shape_offset = Vector2( 0, 0 )
7/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
7/shape_one_way = false
7/shape_one_way_margin = 0.0
7/shapes = [ ]
7/z_index = 0
8/name = "tileset_mk_16_16_nature_tileset_godot.png 8"
@@ -172,6 +204,10 @@
8/autotile/z_index_map = [ ]
8/occluder_offset = Vector2( 0, 0 )
8/navigation_offset = Vector2( 0, 0 )
8/shape_offset = Vector2( 0, 0 )
8/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
8/shape_one_way = false
8/shape_one_way_margin = 0.0
8/shapes = [ ]
8/z_index = 0
9/name = "tileset_mk_16_16_nature_tileset_godot.png 9"
@@ -191,6 +227,10 @@
9/autotile/z_index_map = [ ]
9/occluder_offset = Vector2( 0, 0 )
9/navigation_offset = Vector2( 0, 0 )
9/shape_offset = Vector2( 0, 0 )
9/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
9/shape_one_way = false
9/shape_one_way_margin = 0.0
9/shapes = [ ]
9/z_index = 0
10/name = "tileset_mk_16_16_nature_tileset_godot.png 10"
@@ -210,6 +250,10 @@
10/autotile/z_index_map = [ ]
10/occluder_offset = Vector2( 0, 0 )
10/navigation_offset = Vector2( 0, 0 )
10/shape_offset = Vector2( 0, 0 )
10/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
10/shape_one_way = false
10/shape_one_way_margin = 0.0
10/shapes = [ ]
10/z_index = 0
11/name = "tileset_mk_16_16_nature_tileset_godot.png 11"
@@ -219,7 +263,7 @@
11/region = Rect2( 0, 0, 960, 400 )
11/tile_mode = 1
11/autotile/bitmask_mode = 1
11/autotile/bitmask_flags = [ Vector2( 49, 6 ), 432, Vector2( 49, 7 ), 438, Vector2( 49, 8 ), 54, Vector2( 49, 9 ), 48, Vector2( 50, 6 ), 504, Vector2( 50, 7 ), 511, Vector2( 50, 8 ), 63, Vector2( 50, 9 ), 56, Vector2( 51, 6 ), 216, Vector2( 51, 7 ), 219, Vector2( 51, 8 ), 27, Vector2( 51, 9 ), 24, Vector2( 52, 6 ), 144, Vector2( 52, 7 ), 146, Vector2( 52, 8 ), 18, Vector2( 52, 9 ), 16, Vector2( 53, 6 ), 176, Vector2( 53, 7 ), 182, Vector2( 53, 8 ), 434, Vector2( 53, 9 ), 50, Vector2( 54, 6 ), 248, Vector2( 54, 7 ), 255, Vector2( 54, 8 ), 507, Vector2( 54, 9 ), 59, Vector2( 55, 6 ), 440, Vector2( 55, 7 ), 447, Vector2( 55, 8 ), 510, Vector2( 55, 9 ), 62, Vector2( 56, 6 ), 152, Vector2( 56, 7 ), 155, Vector2( 56, 8 ), 218, Vector2( 56, 9 ), 26, Vector2( 57, 6 ), 184, Vector2( 57, 7 ), 191, Vector2( 57, 8 ), 506, Vector2( 57, 9 ), 58, Vector2( 58, 6 ), 443, Vector2( 58, 7 ), 254, Vector2( 58, 8 ), 442, Vector2( 58, 9 ), 190, Vector2( 59, 8 ), 250, Vector2( 59, 9 ), 187, Vector2( 53, 10 ), 178, Vector2( 54, 10 ), 251, Vector2( 55, 10 ), 446, Vector2( 56, 10 ), 154, Vector2( 57, 10 ), 186 ]
11/autotile/bitmask_flags = [ Vector2( 49, 6 ), 432, Vector2( 49, 7 ), 438, Vector2( 49, 8 ), 54, Vector2( 49, 9 ), 48, Vector2( 50, 6 ), 504, Vector2( 50, 7 ), 511, Vector2( 50, 8 ), 63, Vector2( 50, 9 ), 56, Vector2( 51, 6 ), 216, Vector2( 51, 7 ), 219, Vector2( 51, 8 ), 27, Vector2( 51, 9 ), 24, Vector2( 52, 6 ), 144, Vector2( 52, 7 ), 146, Vector2( 52, 8 ), 18, Vector2( 52, 9 ), 16, Vector2( 53, 6 ), 176, Vector2( 53, 7 ), 182, Vector2( 53, 8 ), 434, Vector2( 53, 9 ), 50, Vector2( 53, 10 ), 178, Vector2( 54, 6 ), 248, Vector2( 54, 7 ), 255, Vector2( 54, 8 ), 507, Vector2( 54, 9 ), 59, Vector2( 54, 10 ), 251, Vector2( 55, 6 ), 440, Vector2( 55, 7 ), 447, Vector2( 55, 8 ), 510, Vector2( 55, 9 ), 62, Vector2( 55, 10 ), 446, Vector2( 56, 6 ), 152, Vector2( 56, 7 ), 155, Vector2( 56, 8 ), 218, Vector2( 56, 9 ), 26, Vector2( 56, 10 ), 154, Vector2( 57, 6 ), 184, Vector2( 57, 7 ), 191, Vector2( 57, 8 ), 506, Vector2( 57, 9 ), 58, Vector2( 57, 10 ), 186, Vector2( 58, 6 ), 443, Vector2( 58, 7 ), 254, Vector2( 58, 8 ), 442, Vector2( 58, 9 ), 190, Vector2( 59, 8 ), 250, Vector2( 59, 9 ), 187 ]
11/autotile/icon_coordinate = Vector2( 50, 7 )
11/autotile/tile_size = Vector2( 16, 16 )
11/autotile/spacing = 0
@@ -229,5 +273,9 @@
11/autotile/z_index_map = [ ]
11/occluder_offset = Vector2( 0, 0 )
11/navigation_offset = Vector2( 0, 0 )
11/shape_offset = Vector2( 0, 0 )
11/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
11/shape_one_way = false
11/shape_one_way_margin = 0.0
11/shapes = [ ]
11/z_index = 0
11/z_index = 0