diff --git a/.import/hud.png-d633f5249ccc091a7e592fabc835a18c.md5 b/.import/hud.png-d633f5249ccc091a7e592fabc835a18c.md5 index b6988a3..613c31b 100644 --- a/.import/hud.png-d633f5249ccc091a7e592fabc835a18c.md5 +++ b/.import/hud.png-d633f5249ccc091a7e592fabc835a18c.md5 @@ -1,3 +1,3 @@ -source_md5="f63c0b618e4029ab7db46130a39050bc" -dest_md5="5ae15f7f93ebb7667d6cf1268987bb99" +source_md5="d33a97465387e24a2b8a7bf64580ad41" +dest_md5="c487dfc6481b78c617b4a1e5cce0f305" diff --git a/.import/hud.png-d633f5249ccc091a7e592fabc835a18c.stex b/.import/hud.png-d633f5249ccc091a7e592fabc835a18c.stex index e39c5ca..db95e99 100644 Binary files a/.import/hud.png-d633f5249ccc091a7e592fabc835a18c.stex and b/.import/hud.png-d633f5249ccc091a7e592fabc835a18c.stex differ diff --git a/graphics/hud/hud.png b/graphics/hud/hud.png index c476c60..3e35403 100644 Binary files a/graphics/hud/hud.png and b/graphics/hud/hud.png differ diff --git a/maps/mountain.tscn b/maps/mountain.tscn index ba1500f..e37f0b6 100644 --- a/maps/mountain.tscn +++ b/maps/mountain.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=2] +[gd_scene load_steps=21 format=2] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=1] [ext_resource path="res://maps/map.gd" type="Script" id=2] @@ -13,6 +13,12 @@ [ext_resource path="res://objects/environment/death tile/death_tile.tscn" type="PackedScene" id=11] [ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=12] [ext_resource path="res://objects/enemy/bat.tscn" type="PackedScene" id=13] +[ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=14] +[ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=15] +[ext_resource path="res://objects/enemy/snake.tscn" type="PackedScene" id=16] +[ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=17] +[ext_resource path="res://objects/environment/barrier/barrier.tscn" type="PackedScene" id=18] +[ext_resource path="res://objects/environment/rock/rock.tscn" type="PackedScene" id=19] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 4, 294 ) @@ -39,7 +45,6 @@ follow_viewport_enable = true follow_viewport_scale = 0.25 [node name="Mountain" type="Sprite" parent="Background/BackgroundMountain"] -visible = false position = Vector2( 128, 96 ) scale = Vector2( 4, 4 ) z_index = -2 @@ -68,7 +73,7 @@ respawn_h = false tile_set = ExtResource( 7 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 1245189, 0, 196609, 1245190, 0, 196609, 1376279, 0, 65536, 1376280, 0, 65537, 1376281, 0, 65537, 1376282, 0, 65537, 1376283, 0, 65537, 1376284, 0, 65538, 1441794, 0, 65536, 1441795, 0, 65537, 1441796, 0, 65537, 1441797, 0, 65537, 1441798, 0, 65537, 1441799, 0, 65538, 1441808, 0, 65536, 1441809, 0, 65537, 1441810, 0, 65537, 1441811, 0, 65538 ) +tile_data = PoolIntArray( -131065, 0, 0, -131055, 0, 0, -65529, 0, 0, -65519, 0, 0, 7, 0, 0, 17, 0, 0, 65543, 0, 0, 65553, 0, 0, 131079, 0, 0, 131089, 0, 0, 196615, 0, 0, 196625, 0, 0, 262151, 0, 0, 262161, 0, 0, 327687, 0, 0, 327697, 0, 0, 393223, 0, 0, 393233, 0, 0, 458759, 0, 0, 458760, 0, 0, 458762, 0, 0, 458763, 0, 0, 458764, 0, 0, 458765, 0, 0, 458766, 0, 0, 458769, 0, 0, 655383, 0, 0, 720907, 0, 0, 720908, 0, 0, 720909, 0, 0, 720910, 0, 0, 720911, 0, 0, 720912, 0, 0, 720913, 0, 0, 720914, 0, 0, 720919, 0, 1, 720920, 0, 196609, 720921, 0, 196609, 720922, 0, 196609, 720923, 0, 196609, 720924, 0, 196609, 720925, 0, 196609, 720926, 0, 196609, 720927, 0, 196609, 786432, 0, 0, 786433, 0, 0, 786434, 0, 0, 786435, 0, 0, 786436, 0, 0, 786437, 0, 0, 786438, 0, 0, 786439, 0, 0, 786449, 0, 0, 786450, 0, 0, 786451, 0, 0, 851986, 0, 0, 851987, 0, 0, 851988, 0, 0, 917523, 0, 0, 917524, 0, 0, 983040, 0, 196609, 983041, 0, 196609, 983042, 0, 196609, 983043, 0, 196609, 983044, 0, 196609, 983045, 0, 196609, 983046, 0, 196609, 983047, 0, 196609, 983048, 0, 196609, 983049, 0, 196609, 983050, 0, 196609, 983051, 0, 196609, 983052, 0, 196609, 983053, 0, 196609, 983059, 0, 0, 983060, 0, 0, 983061, 0, 0, 983062, 0, 0, 983063, 0, 0, 983064, 0, 0, 983065, 0, 0, 983066, 0, 0, 983067, 0, 0, 1245186, 0, 196609, 1245187, 0, 196609, 1245188, 0, 196609, 1245189, 0, 196609, 1245190, 0, 196609, 1245191, 0, 196609, 1310743, 0, 65536, 1310744, 0, 65537, 1310745, 0, 65537, 1310746, 0, 65537, 1310747, 0, 65537, 1310748, 0, 65538, 1441794, 0, 65536, 1441795, 0, 65537, 1441796, 0, 65537, 1441797, 0, 65537, 1441798, 0, 65537, 1441799, 0, 65538, 1441808, 0, 65536, 1441809, 0, 65537, 1441810, 0, 65537, 1441811, 0, 65538, 1507351, 0, 65536, 1507352, 0, 65537, 1507353, 0, 65537, 1507354, 0, 65537, 1507355, 0, 65537, 1507356, 0, 65537, 1507357, 0, 65538 ) [node name="Player" parent="." instance=ExtResource( 6 )] position = Vector2( 33, 166 ) @@ -77,7 +82,7 @@ position = Vector2( 33, 166 ) tile_set = ExtResource( 7 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 851998, 1, 0, 917534, 1, 0, 983070, 1, 0, 1048606, 1, 0, 1114142, 1, 0, 1179678, 1, 0, 1245214, 1, 0 ) +tile_data = PoolIntArray( -131053, 1, 0, -65517, 1, 0, 19, 1, 0, 65555, 1, 0, 131091, 1, 0, 196627, 1, 0, 262163, 1, 0, 327699, 1, 0, 393235, 1, 0, 393238, 1, 0, 458774, 1, 0, 524310, 1, 0, 851998, 1, 0, 917534, 1, 0, 983070, 1, 0, 1048606, 1, 0, 1114142, 1, 0, 1179678, 1, 0, 1245214, 1, 0 ) [node name="Environment" type="Node2D" parent="."] @@ -91,15 +96,62 @@ right_down_boundry = 2.0 position = Vector2( 240, 104 ) scale = Vector2( 1, 7 ) +[node name="Ladder2" parent="Environment" instance=ExtResource( 12 )] +position = Vector2( 152, -16 ) +scale = Vector2( 1, 9 ) + +[node name="Ladder3" parent="Environment" instance=ExtResource( 12 )] +position = Vector2( 176, 48 ) +scale = Vector2( 1, 3 ) + +[node name="TurningPlatform" parent="Environment" instance=ExtResource( 15 )] +position = Vector2( 168, 168 ) + +[node name="TurningPlatform2" parent="Environment" instance=ExtResource( 15 )] +position = Vector2( 80, 144 ) + +[node name="TurningPlatform3" parent="Environment" instance=ExtResource( 15 )] +position = Vector2( 104, 136 ) +delay = 1.0 + +[node name="TurningPlatform4" parent="Environment" instance=ExtResource( 15 )] +position = Vector2( 24, 64 ) + +[node name="TurningPlatform5" parent="Environment" instance=ExtResource( 15 )] +position = Vector2( 48, 48 ) +delay = 1.0 + +[node name="Barrier" parent="Environment" instance=ExtResource( 18 )] +position = Vector2( 116, 64 ) +scale = Vector2( 1, 24 ) +cost = 20 + +[node name="Rock" parent="Environment" instance=ExtResource( 19 )] +position = Vector2( 64, 104 ) + [node name="Enemies" type="Node2D" parent="."] [node name="RollingFiend" parent="Enemies" instance=ExtResource( 8 )] -position = Vector2( 200, 160 ) +position = Vector2( 200, 152 ) [node name="Bat" parent="Enemies" instance=ExtResource( 13 )] position = Vector2( 172, 160 ) -left_up_boundry = 2.0 -right_down_boundry = 2.0 +left_up_boundry = 3.0 +right_down_boundry = 5.0 + +[node name="Bat2" parent="Enemies" instance=ExtResource( 13 )] +position = Vector2( 40, 56 ) +left_up_boundry = 3.0 +right_down_boundry = 3.0 + +[node name="Snake" parent="Enemies" instance=ExtResource( 16 )] +position = Vector2( 216, 82 ) + +[node name="Collectibles" type="Node2D" parent="."] +position = Vector2( 172, 160 ) + +[node name="Star" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 28, 16 ) [node name="Boundaries" type="StaticBody2D" parent="."] @@ -134,4 +186,6 @@ __meta__ = { position = Vector2( 0, 200 ) scale = Vector2( 32, 1 ) +[node name="HUD" parent="." instance=ExtResource( 17 )] + [connection signal="tree_entered" from="Background/BackgroundMountain/Mountain" to="Background/BackgroundMountain/Mountain" method="set_visible" binds= [ true ]] diff --git a/objects/hud/hud.tscn b/objects/hud/hud.tscn index 65b0f95..5c7e1e7 100644 --- a/objects/hud/hud.tscn +++ b/objects/hud/hud.tscn @@ -116,7 +116,7 @@ text = "0" [node name="TimeCounter" type="Label" parent="."] margin_left = 1.0 margin_top = 179.0 -margin_right = 57.0 +margin_right = 56.0 margin_bottom = 199.0 theme = ExtResource( 10 ) text = "0:00:00"