From ad704f9350da7b1122c713ad612566b2827f5c43 Mon Sep 17 00:00:00 2001 From: Jasmine Hyder Date: Thu, 9 Dec 2021 21:26:42 -0600 Subject: [PATCH] Fixing more merge conflicts --- Enemies/Flaming Skull.gd | 22 ------ Enemies/Flaming Skull.tscn | 34 ++++----- Enemies/Hellhound.tscn | 137 +++++-------------------------------- Levels/Level 3.tscn | 16 +++-- Levels/Level 4.tscn | 18 ++--- project.godot | 15 ++-- 6 files changed, 65 insertions(+), 177 deletions(-) diff --git a/Enemies/Flaming Skull.gd b/Enemies/Flaming Skull.gd index a848ff1..bdab410 100644 --- a/Enemies/Flaming Skull.gd +++ b/Enemies/Flaming Skull.gd @@ -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 diff --git a/Enemies/Flaming Skull.tscn b/Enemies/Flaming Skull.tscn index 46b6769..ea298f4 100644 --- a/Enemies/Flaming Skull.tscn +++ b/Enemies/Flaming Skull.tscn @@ -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"] diff --git a/Enemies/Hellhound.tscn b/Enemies/Hellhound.tscn index f73e622..d5b976b 100644 --- a/Enemies/Hellhound.tscn +++ b/Enemies/Hellhound.tscn @@ -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 diff --git a/Levels/Level 3.tscn b/Levels/Level 3.tscn index d4f4c86..9b9cc7f 100644 --- a/Levels/Level 3.tscn +++ b/Levels/Level 3.tscn @@ -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 diff --git a/Levels/Level 4.tscn b/Levels/Level 4.tscn index c942c47..29d7252 100644 --- a/Levels/Level 4.tscn +++ b/Levels/Level 4.tscn @@ -34,10 +34,10 @@ animations = [ { "speed": 10.0 } ] -[sub_resource type="ConvexPolygonShape2D" id=10] +[sub_resource type="ConvexPolygonShape2D" id=2] points = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 ) -[sub_resource type="TileSet" id=9] +[sub_resource type="TileSet" id=3] 0/name = "transparent16x16.png 0" 0/texture = ExtResource( 19 ) 0/tex_offset = Vector2( 0, 0 ) @@ -48,22 +48,22 @@ points = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 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 = SubResource( 10 ) +0/shape = SubResource( 2 ) 0/shape_one_way = false 0/shape_one_way_margin = 1.0 0/shapes = [ { "autotile_coord": Vector2( 0, 0 ), "one_way": false, "one_way_margin": 1.0, -"shape": SubResource( 10 ), +"shape": SubResource( 2 ), "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) } ] 0/z_index = 0 -[sub_resource type="RectangleShape2D" id=11] +[sub_resource type="RectangleShape2D" id=4] extents = Vector2( 39, 10 ) -[sub_resource type="RectangleShape2D" id=12] +[sub_resource type="RectangleShape2D" id=5] extents = Vector2( 26.5, 10 ) [node name="World" type="Node2D"] @@ -112,7 +112,7 @@ format = 1 tile_data = PoolIntArray( -2621441, 8, 37, -2686976, 8, 38, -2686975, 8, 38, -2686974, 8, 38, -2686973, 8, 38, -2686972, 8, 38, -2686971, 8, 38, -2686970, 8, 38, -2686969, 8, 38, -2686968, 8, 38, -2686967, 8, 38, -2686966, 8, 38, -2686965, 8, 38, -2686964, 8, 38, -2686963, 8, 38, -2686962, 8, 38, -2686961, 8, 38, -2686960, 8, 38, -2686959, 8, 38, -2686958, 8, 38, -2686957, 8, 38, -2686956, 8, 38, -2686955, 8, 38, -2686954, 8, 38, -2686953, 8, 38, -2686952, 8, 38, -2686951, 8, 39, -2555905, 8, 65573, -2621440, 8, 65574, -2621439, 8, 65574, -2621438, 8, 65574, -2621437, 8, 65574, -2621436, 8, 65574, -2621435, 8, 65574, -2621434, 8, 65574, -2621433, 8, 65574, -2621432, 8, 65574, -2621431, 8, 65574, -2621430, 8, 65574, -2621429, 8, 65574, -2621428, 8, 65574, -2621427, 8, 65574, -2621426, 8, 65574, -2621425, 8, 65574, -2621424, 8, 65574, -2621423, 8, 65574, -2621422, 8, 65574, -2621421, 8, 65574, -2621420, 8, 65574, -2621419, 8, 65574, -2621418, 8, 65574, -2621417, 8, 65574, -2621416, 8, 65574, -2621415, 8, 65575, -2490369, 8, 65573, -2555904, 8, 65574, -2555903, 8, 65574, -2555902, 8, 65574, -2555901, 8, 65574, -2555900, 8, 65574, -2555899, 8, 65574, -2555898, 8, 65574, -2555897, 8, 65574, -2555896, 8, 65574, -2555895, 8, 65574, -2555894, 8, 65574, -2555893, 8, 65574, -2555892, 8, 65574, -2555891, 8, 65574, -2555890, 8, 65574, -2555889, 8, 65574, -2555888, 8, 65574, -2555887, 8, 65574, -2555886, 8, 65574, -2555885, 8, 65574, -2555884, 8, 65574, -2555883, 8, 65574, -2555882, 8, 65574, -2555881, 8, 65574, -2555880, 8, 65574, -2555879, 8, 65575, -2424833, 8, 65573, -2490368, 8, 65574, -2490367, 8, 65574, -2490366, 8, 65574, -2490365, 8, 65574, -2490364, 8, 65574, -2490363, 8, 65574, -2490362, 8, 65574, -2490361, 8, 65574, -2490360, 8, 65574, -2490359, 8, 65574, -2490358, 8, 65574, -2490357, 8, 65574, -2490356, 8, 65574, -2490355, 8, 65574, -2490354, 8, 65574, -2490353, 8, 65574, -2490352, 8, 65574, -2490351, 8, 65574, -2490350, 8, 65574, -2490349, 8, 65574, -2490348, 8, 65574, -2490347, 8, 65574, -2490346, 8, 65574, -2490345, 8, 65574, -2490344, 8, 65574, -2490343, 8, 65575, -2359297, 8, 65573, -2424832, 8, 65574, -2424831, 8, 65574, -2424830, 8, 65574, -2424829, 8, 65574, -2424828, 8, 65574, -2424827, 8, 65574, -2424826, 8, 65574, -2424825, 8, 65574, -2424824, 8, 65574, -2424823, 8, 65574, -2424822, 8, 65574, -2424821, 8, 65574, -2424820, 8, 65574, -2424819, 8, 65574, -2424818, 8, 65574, -2424817, 8, 65574, -2424816, 8, 65574, -2424815, 8, 65574, -2424814, 8, 65574, -2424813, 8, 65574, -2424812, 8, 65574, -2424811, 8, 65574, -2424810, 8, 65574, -2424809, 8, 65574, -2424808, 8, 65574, -2424807, 8, 65575, -2293761, 8, 65573, -2359296, 8, 65574, -2359295, 8, 65574, -2359294, 8, 65574, -2359293, 8, 65574, -2359292, 8, 65574, -2359291, 8, 65574, -2359290, 8, 65574, -2359289, 8, 65574, -2359288, 8, 65574, -2359287, 8, 65574, -2359286, 8, 65574, -2359285, 8, 65574, -2359284, 8, 65574, -2359283, 8, 65574, -2359282, 8, 65574, -2359281, 8, 65574, -2359280, 8, 65574, -2359279, 8, 65574, -2359278, 8, 65574, -2359277, 8, 65574, -2359276, 8, 65574, -2359275, 8, 65574, -2359274, 8, 65574, -2359273, 8, 65574, -2359272, 8, 65574, -2359271, 8, 65575, -2228225, 8, 65573, -2293760, 8, 65574, -2293759, 8, 65574, -2293758, 8, 65574, -2293757, 8, 65574, -2293756, 8, 65574, -2293755, 8, 65574, -2293754, 8, 65574, -2293753, 8, 65574, -2293752, 8, 65574, -2293751, 8, 65574, -2293750, 8, 65574, -2293749, 8, 65574, -2293748, 8, 65574, -2293747, 8, 65574, -2293746, 8, 65574, -2293745, 8, 65574, -2293744, 8, 65574, -2293743, 8, 65574, -2293742, 8, 65574, -2293741, 8, 65574, -2293740, 8, 65574, -2293739, 8, 65574, -2293738, 8, 65574, -2293737, 8, 65574, -2293736, 8, 65574, -2293735, 8, 65575, -2162689, 8, 65573, -2228224, 8, 65574, -2228223, 8, 65574, -2228222, 8, 65574, -2228221, 8, 65574, -2228220, 8, 65574, -2228219, 8, 65574, -2228218, 8, 65574, -2228217, 8, 65574, -2228216, 8, 65574, -2228215, 8, 65574, -2228214, 8, 65574, -2228213, 8, 65574, -2228212, 8, 65574, -2228211, 8, 65574, -2228210, 8, 65574, -2228209, 8, 65574, -2228208, 8, 65574, -2228207, 8, 65574, -2228206, 8, 65574, -2228205, 8, 65574, -2228204, 8, 65574, -2228203, 8, 65574, -2228202, 8, 65574, -2228201, 8, 65574, -2228200, 8, 65574, -2228199, 8, 65575, -2097153, 8, 65573, -2162688, 8, 65574, -2162687, 8, 65574, -2162686, 8, 65574, -2162685, 8, 65574, -2162684, 8, 65574, -2162683, 8, 65574, -2162682, 8, 65574, -2162681, 8, 65574, -2162680, 8, 65574, -2162679, 8, 65574, -2162678, 8, 65574, -2162677, 8, 65574, -2162676, 8, 65574, -2162675, 8, 65574, -2162674, 8, 65574, -2162673, 8, 65574, -2162672, 8, 65574, -2162671, 8, 65574, -2162670, 8, 65574, -2162669, 8, 65574, -2162668, 8, 65574, -2162667, 8, 65574, -2162666, 8, 65574, -2162665, 8, 65574, -2162664, 8, 65574, -2162663, 8, 65575, -2031617, 8, 65573, -2097152, 8, 65574, -2097151, 8, 65574, -2097150, 8, 65574, -2097149, 8, 65574, -2097148, 8, 65574, -2097147, 8, 65574, -2097146, 8, 65574, -2097145, 8, 65574, -2097144, 8, 65574, -2097143, 8, 65574, -2097142, 8, 65574, -2097141, 8, 65574, -2097140, 8, 65574, -2097139, 8, 65574, -2097138, 8, 65574, -2097137, 8, 65574, -2097136, 8, 65574, -2097135, 8, 65574, -2097134, 8, 65574, -2097133, 8, 65574, -2097132, 8, 65574, -2097131, 8, 65574, -2097130, 8, 65574, -2097129, 8, 65574, -2097128, 8, 65574, -2097127, 8, 65575, -1966081, 8, 65573, -2031616, 8, 65574, -2031615, 8, 65574, -2031614, 8, 65574, -2031613, 8, 65574, -2031612, 8, 65574, -2031611, 8, 65574, -2031610, 8, 65574, -2031609, 8, 65574, -2031608, 8, 65574, -2031607, 8, 65574, -2031606, 8, 65574, -2031605, 8, 65574, -2031604, 8, 65574, -2031603, 8, 65574, -2031602, 8, 65574, -2031601, 8, 65574, -2031600, 8, 65574, -2031599, 8, 65574, -2031598, 8, 65574, -2031597, 8, 65574, -2031596, 8, 65574, -2031595, 8, 65574, -2031594, 8, 65574, -2031593, 8, 65574, -2031592, 8, 65574, -2031591, 8, 65575, -1900545, 8, 65573, -1966080, 8, 65574, -1966079, 8, 65574, -1966078, 8, 65574, -1966077, 8, 65574, -1966076, 8, 65574, -1966075, 8, 65574, -1966074, 8, 65574, -1966073, 8, 65574, -1966072, 8, 65574, -1966071, 8, 65574, -1966070, 8, 65574, -1966069, 8, 65574, -1966068, 8, 65574, -1966067, 8, 65574, -1966066, 8, 65574, -1966065, 8, 65574, -1966064, 8, 65574, -1966063, 8, 65574, -1966062, 8, 65574, -1966061, 8, 65574, -1966060, 8, 65574, -1966059, 8, 65574, -1966058, 8, 65574, -1966057, 8, 65574, -1966056, 8, 65574, -1966055, 8, 65575, -1835009, 8, 65573, -1900544, 8, 65574, -1900543, 8, 65574, -1900542, 8, 65574, -1900541, 8, 65574, -1900540, 8, 65574, -1900539, 8, 65574, -1900538, 8, 65574, -1900537, 8, 65574, -1900536, 8, 65574, -1900535, 8, 65574, -1900534, 8, 65574, -1900533, 8, 65574, -1900532, 8, 65574, -1900531, 8, 65574, -1900530, 8, 65574, -1900529, 8, 65574, -1900528, 8, 65574, -1900527, 8, 65574, -1900526, 8, 65574, -1900525, 8, 65574, -1900524, 8, 65574, -1900523, 8, 65574, -1900522, 8, 65574, -1900521, 8, 65574, -1900520, 8, 65574, -1900519, 8, 65575, -1769473, 8, 65573, -1835008, 8, 65574, -1835007, 8, 65574, -1835006, 8, 65574, -1835005, 8, 65574, -1835004, 8, 65574, -1835003, 8, 65574, -1835002, 8, 65574, -1835001, 8, 65574, -1835000, 8, 65574, -1834999, 8, 65574, -1834998, 8, 65574, -1834997, 8, 65574, -1834996, 8, 65574, -1834995, 8, 65574, -1834994, 8, 65574, -1834993, 8, 65574, -1834992, 8, 65574, -1834991, 8, 65574, -1834990, 8, 65574, -1834989, 8, 65574, -1834988, 8, 65574, -1834987, 8, 65574, -1834986, 8, 65574, -1834985, 8, 65574, -1834984, 8, 65574, -1834983, 8, 65575, -1703937, 8, 65573, -1769472, 8, 65574, -1769471, 8, 65574, -1769470, 8, 65574, -1769469, 8, 65574, -1769468, 8, 65574, -1769467, 8, 65574, -1769466, 8, 65574, -1769465, 8, 65574, -1769464, 8, 65574, -1769463, 8, 65574, -1769462, 8, 65574, -1769461, 8, 65574, -1769460, 8, 65574, -1769459, 8, 65574, -1769458, 8, 65574, -1769457, 8, 65574, -1769456, 8, 65574, -1769455, 8, 65574, -1769454, 8, 65574, -1769453, 8, 65574, -1769452, 8, 65574, -1769451, 8, 65574, -1769450, 8, 65574, -1769449, 8, 65574, -1769448, 8, 65574, -1769447, 8, 65575, -1638401, 8, 131109, -1703936, 8, 131110, -1703935, 8, 131110, -1703934, 8, 131110, -1703933, 8, 131110, -1703932, 8, 131110, -1703931, 8, 131110, -1703930, 8, 131110, -1703929, 8, 131110, -1703928, 8, 131110, -1703927, 8, 131110, -1703926, 8, 131110, -1703925, 8, 65579, -1703924, 8, 65574, -1703923, 8, 65578, -1703922, 8, 131110, -1703921, 8, 131110, -1703920, 8, 131110, -1703919, 8, 131110, -1703918, 8, 131110, -1703917, 8, 131110, -1703916, 8, 131110, -1703915, 8, 131110, -1703914, 8, 131110, -1703913, 8, 131110, -1703912, 8, 131110, -1703911, 8, 131111, -1638389, 8, 65573, -1638388, 8, 65574, -1638387, 8, 65575, -1572853, 8, 65573, -1572852, 8, 65574, -1572851, 8, 65575, -1507317, 8, 65573, -1507316, 8, 65574, -1507315, 8, 65575, -1441781, 8, 65573, -1441780, 8, 65574, -1441779, 8, 65575, -1376245, 8, 65573, -1376244, 8, 65574, -1376243, 8, 65575, -1310709, 8, 65573, -1310708, 8, 65574, -1310707, 8, 65575, -1245173, 8, 65573, -1245172, 8, 65574, -1245171, 8, 65575, -1179637, 8, 131109, -1179636, 8, 131110, -1179635, 8, 131111, -1048565, 8, 37, -1048564, 8, 38, -1048563, 8, 39, -983029, 8, 65573, -983028, 8, 65574, -983027, 8, 65575, -917493, 8, 65573, -917492, 8, 65574, -917491, 8, 65575, -851957, 8, 65573, -851956, 8, 65574, -851955, 8, 65575, -786421, 8, 65573, -786420, 8, 65574, -786419, 8, 65575, -720885, 8, 65573, -720884, 8, 65574, -720883, 8, 65575, -655349, 8, 65573, -655348, 8, 65574, -655347, 8, 65575, -589813, 8, 65573, -589812, 8, 65574, -589811, 8, 65575, -458753, 8, 37, -524288, 8, 38, -524287, 8, 38, -524286, 8, 38, -524285, 8, 38, -524284, 8, 39, -524277, 8, 65573, -524276, 8, 65574, -524275, 8, 65575, -393217, 8, 65573, -458752, 8, 65574, -458751, 8, 65574, -458750, 8, 65574, -458749, 8, 65574, -458748, 8, 65575, -458741, 8, 65573, -458740, 8, 65574, -458739, 8, 65575, -327681, 8, 65573, -393216, 8, 65574, -393215, 8, 65574, -393214, 8, 65574, -393213, 8, 65574, -393212, 8, 65575, -393205, 8, 65573, -393204, 8, 65574, -393203, 8, 65575, -262145, 8, 131109, -327680, 8, 65579, -327679, 8, 65574, -327678, 8, 65574, -327677, 8, 65578, -327676, 8, 131111, -327669, 8, 65573, -327668, 8, 65574, -327667, 8, 65575, -262144, 8, 65573, -262143, 8, 65574, -262142, 8, 65574, -262141, 8, 65575, -262133, 8, 65573, -262132, 8, 65574, -262131, 8, 65575, -196608, 8, 65573, -196607, 8, 65574, -196606, 8, 65574, -196605, 8, 65575, -196597, 8, 65573, -196596, 8, 65574, -196595, 8, 65575, -131072, 8, 65573, -131071, 8, 65574, -131070, 8, 65574, -131069, 8, 65575, -131061, 8, 65573, -131060, 8, 65574, -131059, 8, 65575, -65536, 8, 65573, -65535, 8, 65574, -65534, 8, 65574, -65533, 8, 65575, -65525, 8, 65573, -65524, 8, 65574, -65523, 8, 65575, -65512, 8, 37, -65511, 8, 38, -65510, 8, 38, -65509, 8, 39, 0, 8, 65573, 1, 8, 65574, 2, 8, 65574, 3, 8, 131114, 4, 8, 38, 5, 8, 38, 6, 8, 38, 7, 8, 38, 8, 8, 38, 9, 8, 38, 10, 8, 38, 11, 8, 131115, 12, 8, 65574, 13, 8, 131114, 14, 8, 38, 15, 8, 38, 16, 8, 38, 17, 8, 38, 18, 8, 38, 19, 8, 38, 20, 8, 38, 21, 8, 38, 22, 8, 38, 23, 8, 38, 24, 8, 131115, 25, 8, 65574, 26, 8, 65574, 27, 8, 65575, 65536, 8, 65573, 65537, 8, 65574, 65538, 8, 65574, 65539, 8, 65574, 65540, 8, 65574, 65541, 8, 65574, 65542, 8, 65574, 65543, 8, 65574, 65544, 8, 65574, 65545, 8, 65574, 65546, 8, 65574, 65547, 8, 65574, 65548, 8, 65574, 65549, 8, 65574, 65550, 8, 65574, 65551, 8, 65574, 65552, 8, 65574, 65553, 8, 65574, 65554, 8, 65574, 65555, 8, 65574, 65556, 8, 65574, 65557, 8, 65574, 65558, 8, 65574, 65559, 8, 65574, 65560, 8, 65574, 65561, 8, 65574, 65562, 8, 65574, 65563, 8, 65575, 131072, 8, 65573, 131073, 8, 65574, 131074, 8, 65578, 131075, 8, 131110, 131076, 8, 131110, 131077, 8, 131110, 131078, 8, 131110, 131079, 8, 65579, 131080, 8, 65574, 131081, 8, 65578, 131082, 8, 131110, 131083, 8, 131110, 131084, 8, 131110, 131085, 8, 131110, 131086, 8, 65579, 131087, 8, 65574, 131088, 8, 65578, 131089, 8, 131110, 131090, 8, 65579, 131091, 8, 65574, 131092, 8, 65574, 131093, 8, 65574, 131094, 8, 65574, 131095, 8, 65574, 131096, 8, 65574, 131097, 8, 65574, 131098, 8, 65574, 131099, 8, 65575, 196608, 8, 65573, 196609, 8, 65574, 196610, 8, 65575, 196615, 8, 65573, 196616, 8, 65574, 196617, 8, 65575, 196622, 8, 65573, 196623, 8, 65574, 196624, 8, 65575, 196626, 8, 65573, 196627, 8, 65578, 196628, 8, 131110, 196629, 8, 131110, 196630, 8, 131110, 196631, 8, 131110, 196632, 8, 65579, 196633, 8, 65574, 196634, 8, 65574, 196635, 8, 65575, 262144, 8, 65573, 262145, 8, 65574, 262146, 8, 131114, 262147, 8, 38, 262148, 8, 38, 262149, 8, 38, 262150, 8, 38, 262151, 8, 131115, 262152, 8, 65574, 262153, 8, 131114, 262154, 8, 38, 262155, 8, 38, 262156, 8, 38, 262157, 8, 38, 262158, 8, 131115, 262159, 8, 65574, 262160, 8, 65575, 262162, 8, 65573, 262163, 8, 65575, 262168, 8, 131109, 262169, 8, 131110, 262170, 8, 131110, 262171, 8, 131111, 327680, 8, 65573, 327681, 8, 65574, 327682, 8, 65574, 327683, 8, 65574, 327684, 8, 65574, 327685, 8, 65574, 327686, 8, 65574, 327687, 8, 65574, 327688, 8, 65574, 327689, 8, 65574, 327690, 8, 65574, 327691, 8, 65574, 327692, 8, 65574, 327693, 8, 65574, 327694, 8, 65574, 327695, 8, 65574, 327696, 8, 65575, 327698, 8, 65573, 327699, 8, 65575, 393216, 8, 65573, 393217, 8, 65574, 393218, 8, 65574, 393219, 8, 65578, 393220, 8, 131110, 393221, 8, 65579, 393222, 8, 65574, 393223, 8, 65578, 393224, 8, 131110, 393225, 8, 65579, 393226, 8, 65574, 393227, 8, 65578, 393228, 8, 131110, 393229, 8, 65579, 393230, 8, 65574, 393231, 8, 65574, 393232, 8, 65575, 393234, 8, 65573, 393235, 8, 65575, 524280, 8, 37, 524281, 8, 38, 524282, 8, 38, 524283, 8, 39, 458752, 8, 65573, 458753, 8, 65574, 458754, 8, 65574, 458755, 8, 65575, 458757, 8, 65573, 458758, 8, 65574, 458759, 8, 65575, 458761, 8, 65573, 458762, 8, 65574, 458763, 8, 65575, 458765, 8, 65573, 458766, 8, 65574, 458767, 8, 65574, 458768, 8, 65575, 458770, 8, 65573, 458771, 8, 65575, 589816, 8, 65573, 589817, 8, 65574, 589818, 8, 65574, 589819, 8, 131114, 589820, 8, 38, 589821, 8, 38, 589822, 8, 38, 589823, 8, 38, 524288, 8, 131115, 524289, 8, 65574, 524290, 8, 65574, 524291, 8, 65575, 524293, 8, 65573, 524294, 8, 65574, 524295, 8, 65575, 524297, 8, 65573, 524298, 8, 65574, 524299, 8, 65575, 524301, 8, 65573, 524302, 8, 65574, 524303, 8, 65574, 524304, 8, 65575, 524306, 8, 65573, 524307, 8, 65575, 655352, 8, 65573, 655353, 8, 65574, 655354, 8, 65574, 655355, 8, 65574, 655356, 8, 65574, 655357, 8, 65574, 655358, 8, 65574, 655359, 8, 65574, 589824, 8, 65574, 589825, 8, 65574, 589826, 8, 65574, 589827, 8, 131114, 589828, 8, 38, 589829, 8, 131115, 589830, 8, 65574, 589831, 8, 131114, 589832, 8, 38, 589833, 8, 131115, 589834, 8, 65574, 589835, 8, 131114, 589836, 8, 38, 589837, 8, 131115, 589838, 8, 65574, 589839, 8, 65574, 589840, 8, 131114, 589841, 8, 38, 589842, 8, 131115, 589843, 8, 65575, 720888, 8, 65573, 720889, 8, 65574, 720890, 8, 65574, 720891, 8, 65574, 720892, 8, 65574, 720893, 8, 65574, 720894, 8, 65574, 720895, 8, 65574, 655360, 8, 65574, 655361, 8, 65574, 655362, 8, 65574, 655363, 8, 65574, 655364, 8, 65574, 655365, 8, 65574, 655366, 8, 65574, 655367, 8, 65574, 655368, 8, 65574, 655369, 8, 65574, 655370, 8, 65574, 655371, 8, 65574, 655372, 8, 65574, 655373, 8, 65574, 655374, 8, 65574, 655375, 8, 65574, 655376, 8, 65574, 655377, 8, 65574, 655378, 8, 65574, 655379, 8, 65575, 786424, 8, 65573, 786425, 8, 65574, 786426, 8, 65574, 786427, 8, 65578, 786428, 8, 131110, 786429, 8, 131110, 786430, 8, 131110, 786431, 8, 131110, 720896, 8, 131110, 720897, 8, 131110, 720898, 8, 131110, 720899, 8, 131110, 720900, 8, 131110, 720901, 8, 131110, 720902, 8, 131110, 720903, 8, 131110, 720904, 8, 131110, 720905, 8, 131110, 720906, 8, 131110, 720907, 8, 131110, 720908, 8, 131110, 720909, 8, 131110, 720910, 8, 131110, 720911, 8, 131110, 720912, 8, 65579, 720913, 8, 65574, 720914, 8, 65574, 720915, 8, 65575, 851960, 8, 131109, 851961, 8, 131110, 851962, 8, 131110, 851963, 8, 131111, 786448, 8, 65573, 786449, 8, 65574, 786450, 8, 65574, 786451, 8, 65575, 851984, 8, 65573, 851985, 8, 65574, 851986, 8, 65574, 851987, 8, 65575, 917520, 8, 65573, 917521, 8, 65574, 917522, 8, 65574, 917523, 8, 65575, 983056, 8, 65573, 983057, 8, 65574, 983058, 8, 65574, 983059, 8, 65575, 1048591, 8, 37, 1048592, 8, 131115, 1048593, 8, 65574, 1048594, 8, 65574, 1048595, 8, 131114, 1048596, 8, 39, 1114127, 8, 65573, 1114128, 8, 65574, 1114129, 8, 65574, 1114130, 8, 65574, 1114131, 8, 65574, 1114132, 8, 65575, 1179663, 8, 65573, 1179664, 8, 65574, 1179665, 8, 65574, 1179666, 8, 65574, 1179667, 8, 65574, 1179668, 8, 65575, 1245199, 8, 131109, 1245200, 8, 131110, 1245201, 8, 131110, 1245202, 8, 131110, 1245203, 8, 131110, 1245204, 8, 131111 ) [node name="Wall (Collision)" type="TileMap" parent="."] -tile_set = SubResource( 9 ) +tile_set = SubResource( 3 ) cell_size = Vector2( 16, 16 ) cell_custom_transform = Transform2D( 8, 0, 0, 8, 0, 0 ) show_collision = true @@ -210,7 +210,7 @@ collision_layer = 2 [node name="CollisionShape2D" type="CollisionShape2D" parent="DoorCollision"] position = Vector2( 203, -9 ) -shape = SubResource( 11 ) +shape = SubResource( 4 ) [node name="NextArea" type="Area2D" parent="."] collision_layer = 2 @@ -218,7 +218,7 @@ collision_mask = 2 [node name="CollisionShape2D" type="CollisionShape2D" parent="NextArea"] position = Vector2( 200, -56 ) -shape = SubResource( 12 ) +shape = SubResource( 5 ) [connection signal="gem_collected" from="YSort/Items/TreasureChest" to="." method="_on_TreasureChest_gem_collected"] [connection signal="gem_collected" from="YSort/Items/TreasureChest2" to="." method="_on_TreasureChest_gem_collected"] diff --git a/project.godot b/project.godot index 0ce1812..6049a4a 100644 --- a/project.godot +++ b/project.godot @@ -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) ] }