From 56e56a5cff2c65f0833028b202173bd22d84f729 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Sun, 22 Jan 2023 22:53:56 -0500 Subject: [PATCH] adjusted jumping spider time --- maps/canopy.tscn | 100 +++++++++++++++++++++++++++--- maps/test_room.tscn | 16 ++--- objects/enemy/jumping_spider.tscn | 15 ++--- objects/enemy/spider.tscn | 1 - 4 files changed, 106 insertions(+), 26 deletions(-) diff --git a/maps/canopy.tscn b/maps/canopy.tscn index 221f5a8..120ab09 100644 --- a/maps/canopy.tscn +++ b/maps/canopy.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=18 format=2] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=1] [ext_resource path="res://maps/map.gd" type="Script" id=2] @@ -12,6 +12,11 @@ [ext_resource path="res://objects/enemy/jumping_spider.tscn" type="PackedScene" id=10] [ext_resource path="res://objects/collectibles/gold.tscn" type="PackedScene" id=11] [ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=12] +[ext_resource path="res://objects/environment/turniwood/turniwood.tscn" type="PackedScene" id=13] +[ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=14] +[ext_resource path="res://objects/environment/barrier/barrier.tscn" type="PackedScene" id=15] +[ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=16] +[ext_resource path="res://objects/environment/rock/rock.tscn" type="PackedScene" id=17] [node name="Map" type="Node2D" groups=["map"]] pause_mode = 1 @@ -31,7 +36,7 @@ __meta__ = { tile_set = ExtResource( 4 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 786439, 0, 65537, 786440, 0, 65537, 1048586, 0, 65537, 1048601, 0, 65537, 1048602, 0, 65537, 1048603, 0, 65537, 1048604, 0, 65537, 1048606, -1610612736, 65536, 1114112, 0, 65537, 1114113, 0, 65537, 1114114, 0, 65537, 1114115, 0, 65537, 1114116, 0, 65537, 1114117, 0, 65537, 1114118, 0, 65537, 1114119, 0, 65537, 1114120, 0, 65537, 1114121, 0, 65537, 1114122, 0, 65537, 1114142, 0, 1, 1179662, 0, 65537, 1179663, 0, 65537, 1179664, 0, 65537, 1179665, 0, 65537, 1179666, 0, 65537, 1179667, 0, 65537, 1179668, 0, 65537, 1179669, 0, 65537, 1179678, 0, 1, 1245197, 0, 65537, 1245198, 0, 65537, 1245214, 0, 1, 1310732, 0, 65537, 1310733, 0, 65537, 1310750, 0, 1, 1376286, 0, 1, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1441824, 0, 0, 1441825, 0, 0, 1441826, 0, 0, 1441827, 0, 0, 1441828, 0, 0, 1441829, 0, 0, 1441830, 0, 0, 1441831, 0, 0, 1441832, 0, 0, 1441833, 0, 0, 1441834, 0, 0, 1441835, 0, 0, 1441836, 0, 0, 1441837, 0, 0, 1441838, 0, 0, 1441839, 0, 0, 1441840, 0, 0, 1441841, 0, 0, 1441842, 0, 0, 1441843, 0, 0, 1441844, 0, 0, 1441845, 0, 0, 1441846, 0, 0, 1441847, 0, 0, 1441848, 0, 0, 1441849, 0, 0, 1441850, 0, 0, 1441851, 0, 0, 1441852, 0, 0, 1441853, 0, 0, 1441854, 0, 0, 1441855, 0, 0, 1507328, 0, 65537, 1507329, 0, 65537, 1507330, 0, 65537, 1507331, 0, 65537, 1507332, 0, 65537, 1507333, 0, 65537, 1507334, 0, 65537, 1507335, 0, 65537, 1507336, 0, 65537, 1507337, 0, 65537, 1507338, 0, 65537, 1507339, 0, 65537, 1507340, 0, 65537, 1507341, 0, 65537, 1507342, 0, 65537, 1507343, 0, 65537, 1507344, 0, 65537, 1507345, 0, 65537, 1507346, 0, 65537, 1507347, 0, 65537, 1507348, 0, 65537, 1507349, 0, 65537, 1507350, 0, 65537, 1507351, 0, 65537, 1507352, 0, 65537, 1507353, 0, 65537, 1507354, 0, 65537, 1507355, 0, 65537, 1507356, 0, 65537, 1507357, 0, 65537, 1507358, 0, 65537, 1507359, 0, 65537, 1507360, 0, 65537, 1507361, 0, 65537, 1507362, 0, 65537, 1507363, 0, 65537, 1507364, 0, 65537, 1507365, 0, 65537, 1507366, 0, 65537, 1507367, 0, 65537, 1507368, 0, 65537, 1507369, 0, 65537, 1507370, 0, 65537, 1507371, 0, 65537, 1507372, 0, 65537, 1507373, 0, 65537, 1507374, 0, 65537, 1507375, 0, 65537, 1507376, 0, 65537, 1507377, 0, 65537, 1507378, 0, 65537, 1507379, 0, 65537, 1507380, 0, 65537, 1507381, 0, 65537, 1507382, 0, 65537, 1507383, 0, 65537, 1507384, 0, 65537, 1507385, 0, 65537, 1507386, 0, 65537, 1507387, 0, 65537, 1507388, 0, 65537, 1507389, 0, 65537, 1507390, 0, 65537, 1507391, 0, 65537 ) +tile_data = PoolIntArray( 327697, 0, 65537, 327698, 0, 65537, 327699, 0, 65537, 327700, 0, 65537, 327701, 0, 65537, 327702, 0, 65537, 327703, 0, 65537, 327704, 0, 65537, 327705, 0, 65537, 327706, 0, 65537, 327707, 0, 65537, 327708, 0, 65537, 327709, 0, 65537, 327710, 0, 65537, 327711, 0, 65537, 327712, 0, 65537, 327713, 0, 65537, 327714, 0, 65537, 327715, 0, 65537, 393231, 0, 65537, 393251, 0, 65537, 393252, 0, 65537, 393253, 0, 65537, 393254, 0, 65537, 393255, 0, 65537, 393256, 0, 65537, 393257, 0, 65537, 458752, 0, 65537, 458753, 0, 65537, 458754, 0, 65537, 458755, 0, 65537, 458756, 0, 65537, 458757, 0, 65537, 524297, 0, 65537, 524298, 0, 65537, 524299, 0, 65537, 524300, 0, 65537, 589836, 0, 65537, 655372, 0, 65537, 655373, 0, 65537, 655374, 0, 65537, 720933, 0, 65537, 720934, 0, 65537, 720935, 0, 65537, 720936, 0, 65537, 720937, 0, 65537, 720938, 0, 65537, 720939, 0, 65537, 786433, 0, 65537, 786434, 0, 65537, 786435, 0, 65538, 786450, 0, 65537, 786451, 0, 65537, 786452, 0, 65537, 786453, 0, 65537, 786454, 0, 65537, 786455, 0, 65537, 786456, 0, 65537, 786457, 0, 65537, 786458, 0, 65537, 786459, 0, 65537, 786460, 0, 65537, 786461, 0, 65537, 786462, 0, 65537, 786463, 0, 65537, 786464, 0, 65537, 786465, 0, 65537, 786466, 0, 65537, 786467, 0, 65537, 786468, 0, 65537, 786469, 0, 65537, 786475, 0, 65537, 786476, 0, 65537, 786477, 0, 65537, 786478, 0, 65537, 852014, 0, 65537, 852015, 0, 65537, 852016, 0, 65537, 852017, 0, 65537, 852018, 0, 65537, 1048586, -1610612736, 65536, 1048601, 0, 65537, 1048602, 0, 65537, 1048603, 0, 65537, 1048604, 0, 65538, 1048607, -1610612736, 65536, 1048608, 0, 65537, 1048609, 0, 65537, 1048610, 0, 65537, 1048611, 0, 65537, 1048612, 0, 65537, 1048613, 0, 65537, 1048614, 0, 65537, 1048615, 0, 65537, 1048616, 0, 65537, 1048617, 0, 65537, 1048618, 0, 65537, 1048619, 0, 65537, 1048620, 0, 65537, 1048621, 0, 65537, 1048622, 0, 65537, 1048623, 0, 65537, 1048624, 0, 65537, 1048627, 0, 65537, 1048630, 0, 65537, 1048631, 0, 65537, 1048632, 0, 65537, 1048633, 0, 65537, 1048634, 0, 65537, 1048635, 0, 65537, 1048636, 0, 65537, 1048637, 0, 65537, 1048638, 0, 65537, 1048639, 0, 65537, 1114112, 0, 65537, 1114113, 0, 65537, 1114114, 0, 65537, 1114115, 0, 65537, 1114116, 0, 65537, 1114117, 0, 65537, 1114118, 0, 65537, 1114119, 0, 65537, 1114120, 0, 65537, 1114121, 0, 65537, 1114122, 536870912, 2, 1114137, 0, 65537, 1114143, -1610612736, 65537, 1179662, 0, 65536, 1179663, 0, 65537, 1179664, 0, 65537, 1179665, 0, 65537, 1179666, 0, 65537, 1179667, 0, 65537, 1179668, 0, 65537, 1179672, 0, 65537, 1179673, 0, 65537, 1179679, -536870912, 65536, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1441824, 0, 0, 1441825, 0, 0, 1441826, 0, 0, 1441827, 0, 0, 1441828, 0, 0, 1441829, 0, 0, 1441830, 0, 0, 1441831, 0, 0, 1441832, 0, 0, 1441833, 0, 0, 1441834, 0, 0, 1441835, 0, 0, 1441836, 0, 0, 1441837, 0, 0, 1441838, 0, 0, 1441839, 0, 0, 1441840, 0, 0, 1441841, 0, 0, 1441842, 0, 0, 1441843, 0, 0, 1441844, 0, 0, 1441845, 0, 0, 1441846, 0, 0, 1441847, 0, 0, 1441848, 0, 0, 1441849, 0, 0, 1441850, 0, 0, 1441851, 0, 0, 1441852, 0, 0, 1441853, 0, 0, 1441854, 0, 0, 1441855, 0, 0, 1441856, 0, 0, 1441857, 0, 0, 1441858, 0, 0, 1441859, 0, 0, 1441860, 0, 0, 1441861, 0, 0, 1441862, 0, 0, 1441863, 0, 0, 1441864, 0, 0, 1441865, 0, 0, 1441866, 0, 0, 1441867, 0, 0, 1441868, 0, 0, 1441869, 0, 0, 1441870, 0, 0, 1441871, 0, 0, 1441872, 0, 0, 1441873, 0, 0, 1441874, 0, 0, 1441875, 0, 0, 1441876, 0, 0, 1441877, 0, 0, 1441878, 0, 0, 1441879, 0, 0, 1441880, 0, 0, 1441881, 0, 0, 1441882, 0, 0, 1441883, 0, 0, 1441884, 0, 0, 1441885, 0, 0, 1441886, 0, 0, 1441887, 0, 0, 1507328, 0, 65537, 1507329, 0, 65537, 1507330, 0, 65537, 1507331, 0, 65537, 1507332, 0, 65537, 1507333, 0, 65537, 1507334, 0, 65537, 1507335, 0, 65537, 1507336, 0, 65537, 1507337, 0, 65537, 1507338, 0, 65537, 1507339, 0, 65537, 1507340, 0, 65537, 1507341, 0, 65537, 1507342, 0, 65537, 1507343, 0, 65537, 1507344, 0, 65537, 1507345, 0, 65537, 1507346, 0, 65537, 1507347, 0, 65537, 1507348, 0, 65537, 1507349, 0, 65537, 1507350, 0, 65537, 1507351, 0, 65537, 1507352, 0, 65537, 1507353, 0, 65537, 1507354, 0, 65537, 1507355, 0, 65537, 1507356, 0, 65537, 1507357, 0, 65537, 1507358, 0, 65537, 1507359, 0, 65537, 1507360, 0, 65537, 1507361, 0, 65537, 1507362, 0, 65537, 1507363, 0, 65537, 1507364, 0, 65537, 1507365, 0, 65537, 1507366, 0, 65537, 1507367, 0, 65537, 1507368, 0, 65537, 1507369, 0, 65537, 1507370, 0, 65537, 1507371, 0, 65537, 1507372, 0, 65537, 1507373, 0, 65537, 1507374, 0, 65537, 1507375, 0, 65537, 1507376, 0, 65537, 1507377, 0, 65537, 1507378, 0, 65537, 1507379, 0, 65537, 1507380, 0, 65537, 1507381, 0, 65537, 1507382, 0, 65537, 1507383, 0, 65537, 1507384, 0, 65537, 1507385, 0, 65537, 1507386, 0, 65537, 1507387, 0, 65537, 1507388, 0, 65537, 1507389, 0, 65537, 1507390, 0, 65537, 1507391, 0, 65537, 1507392, 0, 65537, 1507393, 0, 65537, 1507394, 0, 65537, 1507395, 0, 65537, 1507396, 0, 65537, 1507397, 0, 65537, 1507398, 0, 65537, 1507399, 0, 65537, 1507400, 0, 65537, 1507401, 0, 65537, 1507402, 0, 65537, 1507403, 0, 65537, 1507404, 0, 65537, 1507405, 0, 65537, 1507406, 0, 65537, 1507407, 0, 65537, 1507408, 0, 65537, 1507409, 0, 65537, 1507410, 0, 65537, 1507411, 0, 65537, 1507412, 0, 65537, 1507413, 0, 65537, 1507414, 0, 65537, 1507415, 0, 65537, 1507416, 0, 65537, 1507417, 0, 65537, 1507418, 0, 65537, 1507419, 0, 65537, 1507420, 0, 65537, 1507421, 0, 65537, 1507422, 0, 65537, 1507423, 0, 65537 ) [node name="Player" parent="." instance=ExtResource( 6 )] position = Vector2( 24, 166 ) @@ -40,7 +45,7 @@ position = Vector2( 24, 166 ) tile_set = ExtResource( 4 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 917516, 0, 196608, 983052, 0, 196608, 1048588, 0, 196608 ) +tile_data = PoolIntArray( 655367, 0, 196608, 720903, 0, 196608, 917516, 0, 196608, 983052, 0, 196608, 1048588, 0, 196608 ) [node name="Platforms" type="Node2D" parent="."] @@ -48,6 +53,37 @@ tile_data = PoolIntArray( 917516, 0, 196608, 983052, 0, 196608, 1048588, 0, 1966 position = Vector2( 96, 112 ) scale = Vector2( 1, 3 ) +[node name="Ladder2" parent="Platforms" instance=ExtResource( 12 )] +position = Vector2( 56, 80 ) +scale = Vector2( 1, 2 ) + +[node name="Turniwood" parent="Platforms" instance=ExtResource( 13 )] +position = Vector2( 0, 96 ) + +[node name="Turniwood2" parent="Platforms" instance=ExtResource( 13 )] +position = Vector2( 72, 104 ) + +[node name="Turniwood3" parent="Platforms" instance=ExtResource( 13 )] +position = Vector2( 96, 160 ) + +[node name="Turniwood4" parent="Platforms" instance=ExtResource( 13 )] +position = Vector2( 128, 104 ) + +[node name="Barrier" parent="Platforms" instance=ExtResource( 15 )] +position = Vector2( 164, 152 ) +scale = Vector2( 1, 24 ) + +[node name="Barrier3" parent="Platforms" instance=ExtResource( 15 )] +position = Vector2( 250, 152 ) +scale = Vector2( 1, 24 ) + +[node name="Barrier2" parent="Platforms" instance=ExtResource( 15 )] +position = Vector2( 112, 152 ) +scale = Vector2( 1, 24 ) + +[node name="Rock" parent="Platforms" instance=ExtResource( 17 )] +position = Vector2( 200, 120 ) + [node name="Enemies" type="Node2D" parent="."] [node name="JumpingSpider" parent="Enemies" instance=ExtResource( 10 )] @@ -56,33 +92,70 @@ left_boundary = 2 right_boundary = 4 [node name="Skelarcher" parent="Enemies" instance=ExtResource( 5 )] -position = Vector2( 176, 136 ) +position = Vector2( 200, 136 ) scale = Vector2( -1, 1 ) shoot_time = 2.0 +arrow_speed = 80.0 + +[node name="Skelarcher3" parent="Enemies" instance=ExtResource( 5 )] +position = Vector2( 8, 88 ) +shoot_time = 2.0 [node name="Skelarcher2" parent="Enemies" instance=ExtResource( 5 )] -position = Vector2( 8, 128 ) +position = Vector2( 16, 128 ) shoot_time = 1.0 [node name="JumpingSpider2" parent="Enemies" instance=ExtResource( 10 )] position = Vector2( 144, 168 ) left_boundary = 3 -right_boundary = 3 +right_boundary = 2 [node name="Spider" parent="Enemies" instance=ExtResource( 9 )] -position = Vector2( 208, 136 ) +position = Vector2( 216, 136 ) speed = 50.0 +down_boundary = 4 [node name="Collectibles" type="Node2D" parent="."] [node name="Gold" parent="Collectibles" instance=ExtResource( 11 )] -position = Vector2( 56, 128 ) +position = Vector2( 64, 128 ) + +[node name="Gold4" parent="Collectibles" instance=ExtResource( 11 )] +position = Vector2( 96, 152 ) + +[node name="Gold7" parent="Collectibles" instance=ExtResource( 11 )] +position = Vector2( 120, 136 ) + +[node name="Gold8" parent="Collectibles" instance=ExtResource( 11 )] +position = Vector2( 152, 136 ) + +[node name="Gold9" parent="Collectibles" instance=ExtResource( 11 )] +position = Vector2( 232, 128 ) + +[node name="Gold11" parent="Collectibles" instance=ExtResource( 11 )] +position = Vector2( 216, 120 ) + +[node name="Gold10" parent="Collectibles" instance=ExtResource( 11 )] +position = Vector2( 232, 144 ) + +[node name="Gold6" parent="Collectibles" instance=ExtResource( 11 )] +position = Vector2( 72, 96 ) [node name="Gold2" parent="Collectibles" instance=ExtResource( 11 )] -position = Vector2( 40, 128 ) +position = Vector2( 48, 128 ) [node name="Gold3" parent="Collectibles" instance=ExtResource( 11 )] -position = Vector2( 24, 128 ) +position = Vector2( 32, 128 ) + +[node name="Arrow" parent="Collectibles" instance=ExtResource( 16 )] +position = Vector2( 144, 168 ) + +[node name="Star" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 136, 168 ) + +[node name="Star2" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 0, 88 ) +color = 1 [node name="CanvasLayer" parent="." instance=ExtResource( 7 )] @@ -92,3 +165,10 @@ margin_right = 512.0 margin_bottom = 192.0 color = Color( 0, 0.392157, 1, 0.113725 ) script = ExtResource( 8 ) + +[node name="ColorRect2" type="ColorRect" parent="."] +margin_left = 512.0 +margin_right = 768.0 +margin_bottom = 192.0 +color = Color( 1, 0, 0.74902, 0.113725 ) +script = ExtResource( 8 ) diff --git a/maps/test_room.tscn b/maps/test_room.tscn index 119154e..70adc80 100644 --- a/maps/test_room.tscn +++ b/maps/test_room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=13 format=2] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=1] [ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2] @@ -8,6 +8,7 @@ [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=6] [ext_resource path="res://graphics/backgrounds/canopy.png" type="Texture" id=7] [ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=8] +[ext_resource path="res://objects/environment/rock/rock.tscn" type="PackedScene" id=9] [ext_resource path="res://objects/enemy/slime.tscn" type="PackedScene" id=10] [ext_resource path="res://maps/map.gd" type="Script" id=11] [ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=13] @@ -34,7 +35,10 @@ tile_set = ExtResource( 3 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 -tile_data = PoolIntArray( 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1507328, 0, 65537, 1507329, 0, 65537, 1507330, 0, 65537, 1507331, 0, 65537, 1507332, 0, 65537, 1507333, 0, 65537, 1507334, 0, 65537, 1507335, 0, 65537, 1507336, 0, 65537, 1507337, 0, 65537, 1507338, 0, 65537, 1507339, 0, 65537, 1507340, 0, 65537, 1507341, 0, 65537, 1507342, 0, 65537, 1507343, 0, 65537, 1507344, 0, 65537, 1507345, 0, 65537, 1507346, 0, 65537, 1507347, 0, 65537, 1507348, 0, 65537, 1507349, 0, 65537, 1507350, 0, 65537, 1507351, 0, 65537, 1507352, 0, 65537, 1507353, 0, 65537, 1507354, 0, 65537, 1507355, 0, 65537, 1507356, 0, 65537, 1507357, 0, 65537, 1507358, 0, 65537, 1507359, 0, 65537 ) +tile_data = PoolIntArray( 786454, 0, 65537, 786455, 0, 65537, 851990, 0, 65537, 917526, 0, 65537, 983061, 0, 65537, 983062, 0, 65537, 1048591, 0, 65537, 1048592, 0, 65537, 1048593, 0, 65537, 1048594, 0, 65537, 1114127, 0, 65537, 1179663, 0, 65537, 1245199, 0, 65537, 1310732, 0, 65537, 1310733, 0, 65537, 1310734, 0, 65537, 1310735, 0, 65537, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1507328, 0, 65537, 1507329, 0, 65537, 1507330, 0, 65537, 1507331, 0, 65537, 1507332, 0, 65537, 1507333, 0, 65537, 1507334, 0, 65537, 1507335, 0, 65537, 1507336, 0, 65537, 1507337, 0, 65537, 1507338, 0, 65537, 1507339, 0, 65537, 1507340, 0, 65537, 1507341, 0, 65537, 1507342, 0, 65537, 1507343, 0, 65537, 1507344, 0, 65537, 1507345, 0, 65537, 1507346, 0, 65537, 1507347, 0, 65537, 1507348, 0, 65537, 1507349, 0, 65537, 1507350, 0, 65537, 1507351, 0, 65537, 1507352, 0, 65537, 1507353, 0, 65537, 1507354, 0, 65537, 1507355, 0, 65537, 1507356, 0, 65537, 1507357, 0, 65537, 1507358, 0, 65537, 1507359, 0, 65537 ) + +[node name="Rock" parent="." instance=ExtResource( 9 )] +position = Vector2( 120, 120 ) [node name="Slime" parent="." instance=ExtResource( 10 )] position = Vector2( 84, -7 ) @@ -43,11 +47,7 @@ position = Vector2( 84, -7 ) position = Vector2( 184, 163 ) [node name="Player" parent="." instance=ExtResource( 1 )] -position = Vector2( 64, 162 ) - -[node name="Ladder2" parent="." instance=ExtResource( 8 )] -position = Vector2( 88, 136 ) -scale = Vector2( 1, 5 ) +position = Vector2( 144, 104 ) [node name="Ladder3" parent="." instance=ExtResource( 8 )] position = Vector2( 40, 136 ) @@ -58,7 +58,7 @@ tile_set = ExtResource( 2 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 -tile_data = PoolIntArray( 1114117, 0, 196610, 1114123, 0, 196610, 1179653, 0, 196608, 1179659, 0, 196608, 1245189, 0, 196608, 1245195, 0, 196608, 1310725, 0, 196608, 1310731, 0, 196608, 1376261, 0, 196609, 1376267, 0, 196609 ) +tile_data = PoolIntArray( 1114117, 0, 196610, 1179653, 0, 196608, 1245189, 0, 196608, 1310725, 0, 196608, 1376261, 0, 196609 ) [node name="Death" type="TileMap" parent="."] visible = false diff --git a/objects/enemy/jumping_spider.tscn b/objects/enemy/jumping_spider.tscn index ae0ebf4..932ef88 100644 --- a/objects/enemy/jumping_spider.tscn +++ b/objects/enemy/jumping_spider.tscn @@ -46,7 +46,7 @@ tracks/2/keys = { [sub_resource type="Animation" id=2] resource_name = "jump" -length = 0.35 +length = 0.4 step = 0.05 tracks/0/type = "value" tracks/0/path = NodePath("Sprite:region_rect") @@ -67,10 +67,10 @@ tracks/1/loop_wrap = true tracks/1/imported = false tracks/1/enabled = true tracks/1/keys = { -"times": PoolRealArray( 0, 0.15, 0.35 ), +"times": PoolRealArray( 0, 0.2, 0.4 ), "transitions": PoolRealArray( 1, 1, 1 ), "update": 0, -"values": [ Vector2( 4, -2 ), Vector2( 4, -12 ), Vector2( 4, -2 ) ] +"values": [ Vector2( 4, -2 ), Vector2( 4, -6 ), Vector2( 4, -2 ) ] } tracks/2/type = "value" tracks/2/path = NodePath("Hitbox:position") @@ -79,10 +79,10 @@ tracks/2/loop_wrap = true tracks/2/imported = false tracks/2/enabled = true tracks/2/keys = { -"times": PoolRealArray( 0, 0.15, 0.35 ), +"times": PoolRealArray( 0, 0.2, 0.4 ), "transitions": PoolRealArray( 1, 1, 1 ), "update": 0, -"values": [ Vector2( 0, -4 ), Vector2( 0, -14 ), Vector2( 0, -4 ) ] +"values": [ Vector2( 0, -4 ), Vector2( 0, -8 ), Vector2( 0, -4 ) ] } [sub_resource type="RectangleShape2D" id=3] @@ -93,16 +93,17 @@ position = Vector2( 0, -4 ) script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] -position = Vector2( 4, 2 ) +position = Vector2( 4, -2 ) texture = ExtResource( 1 ) region_enabled = true -region_rect = Rect2( 0, 0, 13, 12 ) +region_rect = Rect2( 13, 0, 13, 12 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] anims/idle = SubResource( 1 ) anims/jump = SubResource( 2 ) [node name="Hitbox" type="Area2D" parent="." groups=["enemy_hitbox"]] +position = Vector2( 0, -4 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"] position = Vector2( 3.5, 4 ) diff --git a/objects/enemy/spider.tscn b/objects/enemy/spider.tscn index eb4a9bc..5c91706 100644 --- a/objects/enemy/spider.tscn +++ b/objects/enemy/spider.tscn @@ -42,7 +42,6 @@ position = Vector2( 5, 5 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="Hitbox"] frames = SubResource( 3 ) -frame = 1 playing = true [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]