Fixing more merge conflicts
This commit is contained in:
1 parent
1fd6eeac95
commit
ad704f9350
6 files changed
+65
-177
No files matched your search
@@ -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
|
||||
+18
-16
@@ -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"]
|
||||
|
||||
+18
-119
@@ -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
|
||||
|
||||
+12
-4
@@ -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
|
||||
|
||||
+9
-9
@@ -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, 6Line truncated
|
||||
|
||||
[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"]
|
||||
|
||||
+8
-7
@@ -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)
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user