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

22
Enemies/Flaming Skull.gd
View File

@@ -10,27 +10,6 @@ var counter: int = 0
func _physics_process(_delta: float) -> void:
<<<<<<< HEAD
velocity = Vector2.ZERO
if player:
velocity = position.direction_to(player.position).normalized() * SPEED
velocity = move_and_slide(velocity)
return
func _on_player_detector_area_entered(area: Area2D) -> void:
if area.get_parent().name == 'Player':
player = area.get_parent()
return
func _on_player_detector_area_exited(_area: Area2D):
player = null
return
=======
velocity = Vector2.ZERO
if player and position.distance_to(player.position) > 1:
@@ -77,4 +56,3 @@ func _on_hitbox_area_entered(area: Area2D) -> void:
if health <= 0:
call_deferred('queue_free')
return
>>>>>>> main

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"]

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

16
Levels/Level 3.tscn
View File

@@ -127,23 +127,31 @@ position = Vector2( 250.562, 86.6365 )
[node name="Enemies" type="YSort" parent="YSort"]
[node name="Snowman 1" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 4 )]
[node name="Snowman 1" parent="YSort/Enemies" groups=[
"enemies",
] instance=ExtResource( 4 )]
position = Vector2( 268.977, 221.859 )
collision_layer = 4
collision_mask = 5
[node name="Snowman 2" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 4 )]
[node name="Snowman 2" parent="YSort/Enemies" groups=[
"enemies",
] instance=ExtResource( 4 )]
position = Vector2( 124.417, 123.977 )
collision_layer = 4
collision_mask = 5
[node name="Blue Snowman 1" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 6 )]
[node name="Blue Snowman 1" parent="YSort/Enemies" groups=[
"enemies",
] instance=ExtResource( 6 )]
position = Vector2( 252.747, 40.9419 )
collision_layer = 4
collision_mask = 5
script = ExtResource( 7 )
[node name="Blue Snowman 2" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 6 )]
[node name="Blue Snowman 2" parent="YSort/Enemies" groups=[
"enemies",
] instance=ExtResource( 6 )]
position = Vector2( 105.053, 195.4 )
collision_layer = 4
collision_mask = 5

18
Levels/Level 4.tscn
View File

File diff suppressed because one or more lines are too long

15
project.godot
View File

@@ -12,11 +12,11 @@ config_version=4
config/name="Embodiment"
run/main_scene="res://Main.tscn"
run/delta_sync_after_draw=true
boot_splash/image="res://Sprites/Assets/Black_Background.png"
boot_splash/use_filter=false
boot_splash/bg_color=Color( 0, 0, 0, 1 )
config/icon="res://Sprites/Assets/icon.png"
run/delta_sync_after_draw=true
[display]
@@ -31,33 +31,34 @@ window/stretch/aspect="keep"
player_right={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null)
]
}
player_left={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null)
]
}
player_up={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null)
]
}
player_down={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null)
]
}
screenshot={
"deadzone": 0.5,
"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
]
}
player_attack={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777245,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null)
]
}