From ce42e18e728c967b57550318df7072baedc74e37 Mon Sep 17 00:00:00 2001 From: Diego Date: Tue, 21 Jul 2020 23:55:01 -0500 Subject: [PATCH] level 1 --- ai/Script/Demon.gd | 3 +++ levels/Level 1.tscn | 12 +++++++++--- levels/World.tscn | 9 ++++++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ai/Script/Demon.gd b/ai/Script/Demon.gd index 51c0784..38d3d28 100644 --- a/ai/Script/Demon.gd +++ b/ai/Script/Demon.gd @@ -39,6 +39,9 @@ func _physics_process(_delta): if health <= 0: queue_free() + if is_on_wall() and is_on_floor(): + velocity.y = -90 + func do_knockback(normal): if $Hell.flip_h == true: knockback = Vector2(-4, -4) diff --git a/levels/Level 1.tscn b/levels/Level 1.tscn index e9b53fc..98c7740 100644 --- a/levels/Level 1.tscn +++ b/levels/Level 1.tscn @@ -1,19 +1,25 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://meta/DungeonTilemap.tres" type="TileSet" id=1] [ext_resource path="res://art/Paralax Dungeon.png" type="Texture" id=2] [ext_resource path="res://Player/Player.tscn" type="PackedScene" id=3] [ext_resource path="res://ai/Scenes/Demon.tscn" type="PackedScene" id=4] +[ext_resource path="res://art/door.png" type="Texture" id=5] [node name="Level 1" type="Node"] +[node name="door" type="Sprite" parent="."] +position = Vector2( 31, 158 ) +texture = ExtResource( 5 ) +hframes = 2 + [node name="TileMap" type="TileMap" parent="." groups=[ "Tilemap", ]] tile_set = ExtResource( 1 ) cell_size = Vector2( 16, 16 ) format = 1 -tile_data = PoolIntArray( 0, 0, 196609, 1, 0, 196610, 2, 0, 196610, 3, 0, 196610, 4, 0, 196610, 5, 0, 196610, 6, 0, 196610, 7, 0, 196610, 8, 0, 196610, 9, 0, 196610, 10, 0, 196610, 11, 0, 196610, 12, 0, 196610, 13, 0, 196610, 14, 0, 196610, 15, 0, 196610, 16, 0, 196610, 17, 0, 196610, 18, 0, 196610, 19, 0, 196610, 20, 0, 196610, 21, 0, 196610, 22, 0, 196610, 23, 0, 196610, 24, 0, 196610, 25, 0, 196610, 26, 0, 196610, 27, 0, 196610, 28, 0, 196610, 29, 0, 196610, 30, 0, 196610, 31, 0, 196610, 32, 0, 196610, 33, 0, 196610, 34, 0, 196610, 35, 0, 196611, 720896, 0, 196609, 720897, 1610612736, 196610, 720898, 1610612736, 196610, 720899, 1610612736, 196610, 720900, 1610612736, 196610, 720901, 1610612736, 196610, 720902, 1610612736, 196610, 720903, 1610612736, 196610, 720904, 1610612736, 196610, 720905, 1610612736, 196610, 720906, 1610612736, 196610, 720907, 1610612736, 196610, 720908, 1610612736, 196610, 720909, 1610612736, 196610, 720910, 1610612736, 196610, 720911, 1610612736, 196610, 720912, 1610612736, 196610, 720913, 1610612736, 196610, 720914, 1610612736, 196610, 720915, 1610612736, 196610, 720916, 1610612736, 196610, 720917, 1610612736, 196610, 720918, 1610612736, 196610, 720919, 1610612736, 196610, 720920, 1610612736, 196610, 720921, 0, 196610, 720922, 0, 196610, 720923, 0, 196610, 720924, 0, 196610, 720925, 0, 196610, 720926, 0, 196610, 720927, 0, 196610, 720928, 0, 196610, 720929, 0, 196610, 720930, 0, 196610, 720931, 0, 196610, 720932, 0, 196610, 720933, 0, 196611 ) +tile_data = PoolIntArray( 65535, 0, 8, 0, 0, 10, 1, 0, 10, 2, 0, 10, 3, 0, 10, 4, 0, 10, 5, 0, 10, 6, 0, 10, 7, 0, 10, 8, 0, 10, 9, 0, 10, 10, 0, 10, 11, 0, 10, 12, 0, 10, 13, 0, 10, 14, 0, 10, 15, 0, 10, 16, 0, 10, 17, 0, 10, 18, 0, 10, 19, 0, 10, 20, 0, 10, 21, 0, 10, 22, 0, 10, 23, 0, 10, 24, 0, 10, 25, 0, 10, 26, 0, 10, 27, 0, 10, 28, 0, 10, 29, 0, 10, 30, 0, 10, 31, 0, 10, 32, 0, 10, 33, 0, 10, 34, 0, 10, 35, 0, 10, 36, 0, 10, 37, 0, 10, 38, 0, 10, 39, 0, 10, 40, 0, 10, 41, 0, 10, 42, 0, 10, 43, 0, 10, 44, 0, 10, 45, 0, 10, 46, 0, 10, 47, 0, 10, 48, 0, 10, 49, 0, 10, 50, 0, 10, 51, 0, 10, 52, 0, 10, 53, 0, 10, 54, 0, 10, 55, 0, 10, 56, 0, 10, 57, 0, 10, 58, 0, 10, 59, 0, 10, 60, 0, 10, 61, 0, 10, 62, 0, 10, 63, 0, 10, 64, 0, 11, 131071, 0, 65544, 65536, 0, 131078, 65537, 0, 196617, 65538, 0, 196617, 65539, 0, 196617, 65540, 0, 196617, 65541, 0, 196617, 65542, 0, 196617, 65543, 0, 196617, 65544, 0, 196617, 65545, 0, 196617, 65546, 0, 196617, 65547, 0, 196617, 65548, 0, 196617, 65549, 0, 196617, 65550, 0, 196617, 65551, 0, 196617, 65552, 0, 196617, 65553, 0, 196617, 65554, 0, 196617, 65555, 0, 196617, 65556, 0, 196617, 65557, 0, 196617, 65558, 0, 196617, 65559, 0, 196617, 65560, 0, 196617, 65561, 0, 196617, 65562, 0, 196617, 65563, 0, 196617, 65564, 0, 196617, 65565, 0, 196617, 65566, 0, 196617, 65567, 0, 196617, 65568, 0, 196617, 65569, 0, 196617, 65570, 0, 196617, 65571, 0, 196617, 65572, 0, 196617, 65573, 0, 196617, 65574, 0, 196617, 65575, 0, 196617, 65576, 0, 196617, 65577, 0, 196617, 65578, 0, 196617, 65579, 0, 196617, 65580, 0, 196617, 65581, 0, 196617, 65582, 0, 196617, 65583, 0, 196617, 65584, 0, 196617, 65585, 0, 196617, 65586, 0, 196617, 65587, 0, 196617, 65588, 0, 196617, 65589, 0, 196617, 65590, 0, 196617, 65591, 0, 196617, 65592, 0, 196617, 65593, 0, 196617, 65594, 0, 196617, 65595, 0, 196617, 65596, 0, 196617, 65597, 0, 196617, 65598, 0, 196617, 65599, 0, 196617, 65600, 0, 196619, 196607, 0, 65544, 131072, 0, 131083, 262143, 0, 65544, 196608, 0, 131083, 327679, 0, 65544, 262144, 0, 131083, 393215, 0, 65544, 327680, 0, 131083, 458751, 0, 65544, 393216, 0, 131083, 393270, 0, 8, 393271, 0, 10, 393272, 0, 10, 393273, 0, 10, 393274, 0, 10, 393275, 0, 10, 393276, 0, 10, 393277, 0, 10, 393278, 0, 10, 393279, 0, 10, 393280, 0, 11, 524287, 0, 65544, 458752, 0, 131083, 458805, 0, 8, 458806, 0, 65541, 458807, 0, 131081, 458808, 0, 131081, 458809, 0, 131081, 458810, 0, 131081, 458811, 0, 131081, 458812, 0, 131081, 458813, 0, 131081, 458814, 0, 131081, 458815, 0, 131081, 458816, 0, 131083, 589823, 0, 65544, 524288, 0, 131083, 524308, 0, 196608, 524340, 0, 8, 524341, 0, 65541, 524342, 0, 131081, 524343, 0, 131081, 524344, 0, 131081, 524345, 0, 131081, 524346, 0, 131081, 524347, 0, 131081, 524348, 0, 131081, 524349, 0, 131081, 524350, 0, 131081, 524351, 0, 131081, 524352, 0, 131083, 655359, 0, 65544, 589824, 0, 131083, 589861, 0, 8, 589862, 0, 10, 589863, 0, 10, 589864, 0, 10, 589865, 0, 10, 589866, 0, 10, 589867, 0, 10, 589868, 0, 10, 589869, 0, 10, 589870, 0, 10, 589871, 0, 11, 589875, 0, 196609, 589876, 0, 196613, 589877, 0, 196617, 589878, 0, 196617, 589879, 0, 196617, 589880, 0, 196617, 589881, 0, 196617, 589882, 0, 196617, 589883, 0, 196617, 589884, 0, 196617, 589885, 0, 196617, 589886, 0, 196617, 589887, 0, 196617, 589888, 0, 196619, 720895, 0, 65544, 655360, 0, 131083, 655374, 0, 0, 655386, 0, 0, 655396, 0, 8, 655397, 0, 65541, 655398, 0, 131081, 655399, 0, 131081, 655400, 0, 131081, 655401, 0, 131081, 655402, 0, 131081, 655403, 0, 131081, 655404, 0, 131081, 655405, 0, 131081, 655406, 0, 131081, 655407, 0, 65542, 655408, 0, 11, 786431, 0, 65544, 720896, 0, 65542, 720897, 0, 10, 720898, 0, 10, 720899, 0, 10, 720900, 0, 10, 720901, 0, 10, 720902, 0, 10, 720903, 0, 10, 720904, 0, 10, 720905, 0, 10, 720906, 0, 10, 720907, 0, 10, 720908, 0, 10, 720909, 0, 10, 720910, 0, 9, 720911, 0, 10, 720912, 0, 10, 720913, 0, 10, 720914, 0, 10, 720915, 0, 10, 720916, 0, 10, 720917, 0, 10, 720918, 0, 10, 720919, 0, 10, 720920, 0, 10, 720921, 0, 10, 720922, 0, 9, 720923, 0, 10, 720924, 0, 10, 720925, 0, 10, 720926, 0, 10, 720927, 0, 10, 720928, 0, 10, 720929, 0, 10, 720930, 0, 10, 720931, 0, 10, 720932, 0, 65541, 720933, 0, 131081, 720934, 0, 131081, 720935, 0, 131081, 720936, 0, 131081, 720937, 0, 131081, 720938, 0, 131081, 720939, 0, 131081, 720940, 0, 131081, 720941, 0, 131081, 720942, 0, 131081, 720943, 0, 131081, 720944, 0, 65542, 720945, 0, 11, 851967, 0, 65544, 786432, 0, 131081, 786433, 0, 131081, 786434, 0, 131081, 786435, 0, 131081, 786436, 0, 131081, 786437, 0, 131081, 786438, 0, 131081, 786439, 0, 131081, 786440, 0, 131081, 786441, 0, 131081, 786442, 0, 131081, 786443, 0, 131081, 786444, 0, 131081, 786445, 0, 131081, 786446, 0, 131081, 786447, 0, 131081, 786448, 0, 131081, 786449, 0, 131081, 786450, 0, 131081, 786451, 0, 131081, 786452, 0, 131081, 786453, 0, 131081, 786454, 0, 131081, 786455, 0, 131081, 786456, 0, 131081, 786457, 0, 131081, 786458, 0, 131081, 786459, 0, 131081, 786460, 0, 131081, 786461, 0, 131081, 786462, 0, 131081, 786463, 0, 131081, 786464, 0, 131081, 786465, 0, 131081, 786466, 0, 131081, 786467, 0, 131081, 786468, 0, 131081, 786469, 0, 131081, 786470, 0, 131081, 786471, 0, 131081, 786472, 0, 131081, 786473, 0, 131081, 786474, 0, 131081, 786475, 0, 131081, 786476, 0, 131081, 786477, 0, 131081, 786478, 0, 131081, 786479, 0, 131081, 786480, 0, 131081, 786481, 0, 65542, 786482, 0, 11, 917503, 0, 196616, 851968, 0, 196617, 851969, 0, 196617, 851970, 0, 196617, 851971, 0, 196617, 851972, 0, 196617, 851973, 0, 196617, 851974, 0, 196617, 851975, 0, 196617, 851976, 0, 196617, 851977, 0, 196617, 851978, 0, 196617, 851979, 0, 196617, 851980, 0, 196617, 851981, 0, 196617, 851982, 0, 196617, 851983, 0, 196617, 851984, 0, 196617, 851985, 0, 196617, 851986, 0, 196617, 851987, 0, 196617, 851988, 0, 196617, 851989, 0, 196617, 851990, 0, 196617, 851991, 0, 196617, 851992, 0, 196617, 851993, 0, 196617, 851994, 0, 196617, 851995, 0, 196617, 851996, 0, 196617, 851997, 0, 196617, 851998, 0, 196617, 851999, 0, 196617, 852000, 0, 196617, 852001, 0, 196617, 852002, 0, 196617, 852003, 0, 196617, 852004, 0, 196617, 852005, 0, 196617, 852006, 0, 196617, 852007, 0, 196617, 852008, 0, 196617, 852009, 0, 196617, 852010, 0, 196617, 852011, 0, 196617, 852012, 0, 196617, 852013, 0, 196617, 852014, 0, 196617, 852015, 0, 196617, 852016, 0, 196617, 852017, 0, 196617, 852018, 0, 131082, 852019, 0, 10, 852020, 0, 10, 852021, 0, 10, 852022, 0, 10, 852023, 0, 10, 852024, 0, 10, 852025, 0, 10, 852026, 0, 10, 852027, 0, 10, 852028, 0, 10, 852029, 0, 10, 852030, 0, 10, 852031, 0, 10, 852032, 0, 11, 917554, 0, 196616, 917555, 0, 196617, 917556, 0, 196617, 917557, 0, 196617, 917558, 0, 196617, 917559, 0, 196617, 917560, 0, 196617, 917561, 0, 196617, 917562, 0, 196617, 917563, 0, 196617, 917564, 0, 196617, 917565, 0, 196617, 917566, 0, 196617, 917567, 0, 196617, 917568, 0, 196619 ) [node name="ParallaxBackground" type="ParallaxBackground" parent="."] @@ -25,7 +31,7 @@ texture = ExtResource( 2 ) centered = false [node name="Player" parent="." instance=ExtResource( 3 )] -position = Vector2( 92.1555, 139.436 ) +position = Vector2( 33, 170 ) [node name="Demon" parent="." instance=ExtResource( 4 )] position = Vector2( 301, 164 ) diff --git a/levels/World.tscn b/levels/World.tscn index 22ecee8..0822327 100644 --- a/levels/World.tscn +++ b/levels/World.tscn @@ -131,6 +131,12 @@ tracks/0/keys = { [node name="World" type="Node2D"] position = Vector2( 6.67419, 7.34163 ) +[node name="Door2" parent="." instance=ExtResource( 13 )] +modulate = Color( 0, 0, 0, 1 ) +position = Vector2( 1932.15, 115.955 ) +scale = Vector2( 1, 1.19488 ) +frame = 0 + [node name="Door" parent="." instance=ExtResource( 13 )] position = Vector2( 1932.15, 115.955 ) scale = Vector2( 1, 1.19488 ) @@ -156,6 +162,7 @@ shape = SubResource( 1 ) [node name="ParallaxBackground" type="ParallaxBackground" parent="."] [node name="ParallaxLayer" type="ParallaxLayer" parent="ParallaxBackground"] +visible = false modulate = Color( 0.635294, 0.635294, 0.635294, 1 ) motion_mirroring = Vector2( 490, 500 ) @@ -176,7 +183,7 @@ __meta__ = { } [node name="Player" parent="." instance=ExtResource( 2 )] -position = Vector2( 1919.33, 146.658 ) +position = Vector2( -21.6742, 153.658 ) [node name="text" type="Node2D" parent="."] position = Vector2( -5.81107, -6.20908 )