diff --git a/graphics/enemy/artificial_soul.png b/graphics/enemy/artificial_soul.png new file mode 100644 index 0000000..dc4a8d5 Binary files /dev/null and b/graphics/enemy/artificial_soul.png differ diff --git a/graphics/enemy/artificial_soul.png.import b/graphics/enemy/artificial_soul.png.import new file mode 100644 index 0000000..ee47abd --- /dev/null +++ b/graphics/enemy/artificial_soul.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/artificial_soul.png-56b840ad8304c2739f473a4d5b5b0e29.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/enemy/artificial_soul.png" +dest_files=[ "res://.import/artificial_soul.png-56b840ad8304c2739f473a4d5b5b0e29.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/graphics/enemy/rolling_fiend.png b/graphics/enemy/rolling_fiend.png index 5a929ad..e0d0cd5 100644 Binary files a/graphics/enemy/rolling_fiend.png and b/graphics/enemy/rolling_fiend.png differ diff --git a/maps/canopy.tscn b/maps/canopy.tscn index ff5cd88..c74776e 100644 --- a/maps/canopy.tscn +++ b/maps/canopy.tscn @@ -167,6 +167,9 @@ position = Vector2( 336, 136 ) [node name="Turniwood19" parent="Platforms" instance=ExtResource( 13 )] position = Vector2( 400, 144 ) +[node name="Turniwood29" parent="Platforms" instance=ExtResource( 13 )] +position = Vector2( 328, 40 ) + [node name="Turniwood18" parent="Platforms" instance=ExtResource( 13 )] position = Vector2( 312, 136 ) delay = 1.0 @@ -199,26 +202,16 @@ position = Vector2( 200, 112 ) [node name="Enemies" type="Node2D" parent="."] -[node name="JumpingSpider" parent="Enemies" instance=ExtResource( 10 )] -position = Vector2( 56, 168 ) -left_boundary = 2 -right_boundary = 4 - [node name="JumpingSpider5" parent="Enemies" instance=ExtResource( 10 )] position = Vector2( 16, 40 ) left_boundary = 2 -right_boundary = 3 +right_boundary = 4 [node name="JumpingSpider4" parent="Enemies" instance=ExtResource( 10 )] position = Vector2( 208, 88 ) left_boundary = 2 right_boundary = 3 -[node name="JumpingSpider7" parent="Enemies" instance=ExtResource( 10 )] -position = Vector2( 216, 48 ) -left_boundary = 2 -right_boundary = 3 - [node name="JumpingSpider8" parent="Enemies" instance=ExtResource( 10 )] position = Vector2( 392, 24 ) left_boundary = 4 @@ -238,7 +231,7 @@ position = Vector2( 240, 24 ) scale = Vector2( -1, 1 ) [node name="Skelarcher6" parent="Enemies" instance=ExtResource( 5 )] -position = Vector2( 96, 56 ) +position = Vector2( 208, 48 ) scale = Vector2( -1, 1 ) shoot_time = 2.0 @@ -282,6 +275,11 @@ position = Vector2( 16, 56 ) speed = 50.0 down_boundary = 4 +[node name="Spider12" parent="Enemies" instance=ExtResource( 9 )] +position = Vector2( 48, 144 ) +speed = 50.0 +down_boundary = 4 + [node name="Spider3" parent="Enemies" instance=ExtResource( 9 )] position = Vector2( 536, 88 ) speed = 40.0 @@ -378,16 +376,16 @@ position = Vector2( 184, 24 ) position = Vector2( 216, 24 ) [node name="Gold17" parent="Collectibles" instance=ExtResource( 11 )] -position = Vector2( 208, 48 ) +position = Vector2( 216, 48 ) [node name="Gold18" parent="Collectibles" instance=ExtResource( 11 )] -position = Vector2( 232, 48 ) +position = Vector2( 240, 48 ) [node name="Gold23" parent="Collectibles" instance=ExtResource( 11 )] -position = Vector2( 184, 88 ) +position = Vector2( 96, 56 ) [node name="Gold24" parent="Collectibles" instance=ExtResource( 11 )] -position = Vector2( 336, 48 ) +position = Vector2( 344, 48 ) [node name="Gold25" parent="Collectibles" instance=ExtResource( 11 )] position = Vector2( 312, 88 ) @@ -432,7 +430,7 @@ position = Vector2( 560, 56 ) position = Vector2( 640, 136 ) [node name="Gold36" parent="Collectibles" instance=ExtResource( 11 )] -position = Vector2( 312, 48 ) +position = Vector2( 304, 48 ) [node name="Gold51" parent="Collectibles" instance=ExtResource( 11 )] position = Vector2( 632, 56 ) @@ -459,7 +457,7 @@ position = Vector2( 416, 24 ) position = Vector2( 368, 24 ) [node name="Gold44" parent="Collectibles" instance=ExtResource( 11 )] -position = Vector2( 232, 88 ) +position = Vector2( 72, 56 ) [node name="Gold22" parent="Collectibles" instance=ExtResource( 11 )] position = Vector2( 536, 112 ) diff --git a/maps/mountain.tscn b/maps/mountain.tscn index 37172a7..367fa2d 100644 --- a/maps/mountain.tscn +++ b/maps/mountain.tscn @@ -117,7 +117,7 @@ __meta__ = { tile_set = ExtResource( 7 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( -2818047, 0, 65536, -2818046, 0, 65537, -2818045, 0, 65537, -2818044, 0, 65537, -2818043, 0, 65538, -2818033, 0, 65536, -2818032, 0, 65537, -2818031, 0, 65537, -2818030, 0, 65537, -2818029, 0, 65538, -2818022, 0, 0, -2818021, 0, 196609, -2818020, 0, 196609, -2818019, 0, 196609, -2818018, 0, 196609, -2818017, 0, 196609, -2752486, 0, 1, -2686950, 0, 1, -2621440, 0, 0, -2621439, 0, 65537, -2621438, 0, 65537, -2621437, 0, 65537, -2621436, 0, 65537, -2621435, 0, 65537, -2621434, 0, 65537, -2621433, 0, 65537, -2621432, 0, 65537, -2621431, 0, 65537, -2621430, 0, 65537, -2621429, 0, 65537, -2621428, 0, 65537, -2621427, 0, 65537, -2621426, 0, 65537, -2621425, 0, 65537, -2621424, 0, 65538, -2621414, 0, 1, -2621413, 0, 0, -2621412, 0, 0, -2621411, 0, 0, -2555904, 0, 1, -2555878, 0, 1, -2490368, 0, 1, -2490342, 0, 1, -2424832, 0, 1, -2424806, 0, 1, -2359296, 0, 1, -2359270, 0, 1, -2293760, 0, 0, -2293759, 0, 0, -2293758, 0, 0, -2293757, 0, 0, -2293756, 0, 0, -2293755, 0, 0, -2293744, 0, 65536, -2293743, 0, 65537, -2293742, 0, 65538, -2293734, 0, 0, -2293733, 0, 0, -2293732, 0, 0, -2097152, 0, 0, -2097151, 0, 0, -2097150, 0, 0, -2097149, 0, 0, -2097148, 0, 0, -2097147, 0, 0, -2097146, 0, 0, -2097145, 0, 0, -2097144, 0, 0, -2097143, 0, 0, -2097142, 0, 0, -2097141, 0, 0, -2097140, 0, 0, -2097139, 0, 0, -2097138, 0, 0, -2097137, 0, 0, -2097136, 0, 0, -2097135, 0, 0, -2097134, 0, 0, -2031616, 0, 1, -1966080, 0, 1, -1900544, 0, 1, -1900535, 0, 0, -1900534, 0, 0, -1900533, 0, 0, -1900532, 0, 0, -1900531, 0, 0, -1900530, 0, 0, -1900529, 0, 0, -1900528, 0, 0, -1900527, 0, 0, -1900526, 0, 0, -1835008, 0, 1, -1834999, 0, 0, -1769472, 0, 1, -1769463, 0, 0, -1769447, 0, 0, -1769446, 0, 0, -1769445, 0, 0, -1703936, 0, 1, -1703927, 0, 0, -1703909, 0, 1, -1638400, 0, 1, -1638391, 0, 0, -1638390, 0, 0, -1638389, 0, 0, -1638388, 0, 0, -1638387, 0, 0, -1638386, 0, 0, -1638385, 0, 0, -1638384, 0, 0, -1638383, 0, 0, -1638382, 0, 0, -1638381, 0, 0, -1638380, 0, 0, -1638373, 0, 1, -1572864, 0, 1, -1572844, 0, 1, -1572837, 0, 1, -1507328, 0, 1, -1507308, 0, 1, -1507301, 0, 1, -1441792, 0, 1, -1441772, 0, 1, -1441765, 0, 1, -1376256, 0, 1, -1376236, 0, 1, -1376229, 0, 1, -1310720, 0, 1, -1310700, 0, 1, -1310693, 0, 1, -1245184, 0, 1, -1245164, 0, 1, -1245157, 0, 65536, -1245156, 0, 65537, -1245155, 0, 65537, -1245154, 0, 65537, -1245153, 0, 65538, -1179648, 0, 65536, -1179647, 0, 65537, -1179646, 0, 65537, -1179645, 0, 65537, -1179644, 0, 65537, -1179643, 0, 65537, -1179642, 0, 65537, -1179641, 0, 65537, -1179640, 0, 65538, -1179638, 0, 65536, -1179637, 0, 65537, -1179636, 0, 65537, -1179635, 0, 65538, -1179631, 0, 65536, -1179630, 0, 65537, -1179629, 0, 65537, -1179628, 0, 65538, -917480, 0, 65536, -917479, 0, 65537, -917478, 0, 65537, -917477, 0, 65538, -851955, 0, 65536, -851954, 0, 65537, -851953, 0, 65538, -655359, 0, 65536, -655358, 0, 65537, -655357, 0, 65537, -655356, 0, 65537, -655355, 0, 65538, -655340, 0, 65536, -655339, 0, 65537, -655338, 0, 65537, -655337, 0, 65537, -655336, 0, 65537, -655335, 0, 65537, -655334, 0, 65537, -655333, 0, 65538, -458743, 0, 0, -458742, 0, 0, -458741, 0, 0, -458740, 0, 0, -458739, 0, 0, -458738, 0, 0, -458737, 0, 0, -458736, 0, 0, -458735, 0, 0, -458734, 0, 0, -458733, 0, 0, -458732, 0, 0, -458731, 0, 0, -393207, 0, 1, -327671, 0, 1, -262135, 0, 1, -262121, 0, 0, -262120, 0, 0, -262119, 0, 0, -262118, 0, 0, -262117, 0, 0, -262116, 0, 0, -262115, 0, 0, -262114, 0, 0, -262113, 0, 0, -196599, 0, 1, -196591, 0, 0, -131068, 0, 0, -131067, 0, 0, -131066, 0, 0, -131065, 0, 0, -131063, 0, 1, -131059, 0, 65536, -131058, 0, 65538, -131055, 0, 1, -65527, 0, 1, -65526, 0, 0, -65521, 0, 65536, -65520, 0, 65538, -65519, 0, 1, -65515, 0, 65536, -65514, 0, 65537, -65513, 0, 65536, -65512, 0, 65537, -65511, 0, 65537, -65510, 0, 65537, -65509, 0, 65537, -65508, 0, 65537, -65507, 0, 65537, -65506, 0, 65537, -65505, 0, 65537, 9, 0, 1, 17, 0, 1, 65545, 0, 1, 65553, 0, 1, 131081, 0, 1, 131089, 0, 1, 196617, 0, 1, 196619, 0, 65536, 196620, 0, 65537, 196621, 0, 65537, 196622, 0, 65537, 196623, 0, 65537, 196624, 0, 65538, 196625, 0, 1, 262153, 0, 1, 262161, 0, 1, 262172, 0, 0, 262173, 0, 0, 262174, 0, 0, 327689, 0, 1, 327697, 0, 1, 393225, 0, 1, 393233, 0, 0, 458757, 0, 0, 458758, 0, 0, 458759, 0, 0, 458761, 0, 1, 524297, 0, 0, 524298, 0, 0, 524299, 0, 0, 524300, 0, 0, 524301, 0, 0, 524302, 0, 0, 720910, 0, 0, 720911, 0, 0, 720912, 0, 0, 720913, 0, 0, 720914, 0, 0, 720915, 0, 0, 720920, 0, 196609, 720921, 0, 196609, 720922, 0, 196609, 720923, 0, 196609, 720924, 0, 196609, 720925, 0, 196609, 720926, 0, 196609, 720927, 0, 196609, 851969, 0, 65536, 851970, 0, 65537, 851971, 0, 65537, 851972, 0, 65537, 851973, 0, 65537, 851974, 0, 65537, 851975, 0, 65538, 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 ) +tile_data = PoolIntArray( -2818047, 0, 65536, -2818046, 0, 65537, -2818045, 0, 65537, -2818044, 0, 65537, -2818043, 0, 65538, -2818033, 0, 65536, -2818032, 0, 65537, -2818031, 0, 65537, -2818030, 0, 65537, -2818029, 0, 65538, -2818022, 0, 0, -2818021, 0, 196609, -2818020, 0, 196609, -2818019, 0, 196609, -2818018, 0, 196609, -2818017, 0, 196609, -2752486, 0, 1, -2686950, 0, 1, -2621440, 0, 0, -2621439, 0, 65537, -2621438, 0, 65537, -2621437, 0, 65537, -2621436, 0, 65537, -2621435, 0, 65537, -2621434, 0, 65537, -2621433, 0, 65537, -2621432, 0, 65537, -2621431, 0, 65537, -2621430, 0, 65537, -2621429, 0, 65537, -2621428, 0, 65537, -2621427, 0, 65537, -2621426, 0, 65537, -2621425, 0, 65537, -2621424, 0, 65538, -2621414, 0, 1, -2621413, 0, 0, -2621412, 0, 0, -2621411, 0, 0, -2555904, 0, 1, -2555878, 0, 1, -2490368, 0, 1, -2490342, 0, 1, -2424832, 0, 1, -2424806, 0, 1, -2359296, 0, 1, -2359270, 0, 1, -2293760, 0, 0, -2293759, 0, 0, -2293758, 0, 0, -2293757, 0, 0, -2293756, 0, 0, -2293755, 0, 0, -2293744, 0, 65536, -2293743, 0, 65537, -2293742, 0, 65538, -2293734, 0, 0, -2293733, 0, 0, -2293732, 0, 0, -2097152, 0, 0, -2097151, 0, 0, -2097150, 0, 0, -2097149, 0, 0, -2097148, 0, 0, -2097147, 0, 0, -2097146, 0, 0, -2097145, 0, 0, -2097144, 0, 0, -2097143, 0, 0, -2097142, 0, 0, -2097141, 0, 0, -2097140, 0, 0, -2097139, 0, 0, -2097138, 0, 0, -2097137, 0, 0, -2097136, 0, 0, -2097135, 0, 0, -2097134, 0, 0, -2031616, 0, 1, -1966080, 0, 1, -1900544, 0, 1, -1900535, 0, 0, -1900534, 0, 0, -1900533, 0, 0, -1900532, 0, 0, -1900531, 0, 0, -1900530, 0, 0, -1900529, 0, 0, -1900528, 0, 0, -1900527, 0, 0, -1900526, 0, 0, -1835008, 0, 1, -1834999, 0, 0, -1769472, 0, 1, -1769463, 0, 0, -1769447, 0, 0, -1769446, 0, 0, -1769445, 0, 0, -1703936, 0, 1, -1703927, 0, 0, -1703909, 0, 1, -1638400, 0, 1, -1638391, 0, 0, -1638390, 0, 0, -1638389, 0, 0, -1638388, 0, 0, -1638387, 0, 0, -1638386, 0, 0, -1638385, 0, 0, -1638384, 0, 0, -1638383, 0, 0, -1638382, 0, 0, -1638381, 0, 0, -1638380, 0, 0, -1638373, 0, 1, -1572864, 0, 1, -1572844, 0, 1, -1572837, 0, 1, -1507328, 0, 1, -1507308, 0, 1, -1507301, 0, 1, -1441792, 0, 1, -1441772, 0, 1, -1441765, 0, 1, -1376256, 0, 1, -1376236, 0, 1, -1376229, 0, 1, -1310720, 0, 1, -1310700, 0, 1, -1310693, 0, 1, -1245184, 0, 1, -1245164, 0, 1, -1245157, 0, 65536, -1245156, 0, 65537, -1245155, 0, 65537, -1245154, 0, 65537, -1245153, 0, 65538, -1179648, 0, 65536, -1179647, 0, 65537, -1179646, 0, 65537, -1179645, 0, 65537, -1179644, 0, 65537, -1179643, 0, 65537, -1179642, 0, 65537, -1179641, 0, 65537, -1179640, 0, 65538, -1179638, 0, 65536, -1179637, 0, 65537, -1179636, 0, 65537, -1179635, 0, 65538, -1179631, 0, 65536, -1179630, 0, 65537, -1179629, 0, 65537, -1179628, 0, 65538, -917480, 0, 65536, -917479, 0, 65537, -917478, 0, 65537, -917477, 0, 65538, -851955, 0, 65536, -851954, 0, 65537, -851953, 0, 65538, -655359, 0, 65536, -655358, 0, 65537, -655357, 0, 65537, -655356, 0, 65537, -655355, 0, 65538, -655340, 0, 65536, -655339, 0, 65537, -655338, 0, 65537, -655337, 0, 65537, -655336, 0, 65537, -655335, 0, 65537, -655334, 0, 65537, -655333, 0, 65538, -458743, 0, 0, -458742, 0, 0, -458741, 0, 0, -458740, 0, 0, -458739, 0, 0, -458738, 0, 0, -458737, 0, 0, -458736, 0, 0, -458735, 0, 0, -458734, 0, 0, -458733, 0, 0, -458732, 0, 0, -458731, 0, 0, -393207, 0, 1, -327671, 0, 1, -262135, 0, 1, -262129, 0, 0, -262128, 0, 0, -262127, 0, 0, -262121, 0, 0, -262120, 0, 0, -262119, 0, 0, -262118, 0, 0, -262117, 0, 0, -262116, 0, 0, -262115, 0, 0, -262114, 0, 0, -262113, 0, 0, -196599, 0, 1, -196591, 0, 1, -131068, 0, 0, -131067, 0, 0, -131066, 0, 0, -131065, 0, 0, -131063, 0, 1, -131059, 0, 65536, -131058, 0, 65538, -131055, 0, 1, -65527, 0, 1, -65526, 0, 0, -65519, 0, 1, -65515, 0, 65536, -65514, 0, 65537, -65513, 0, 65536, -65512, 0, 65537, -65511, 0, 65537, -65510, 0, 65537, -65509, 0, 65537, -65508, 0, 65537, -65507, 0, 65537, -65506, 0, 65537, -65505, 0, 65537, 9, 0, 1, 17, 0, 1, 65545, 0, 1, 65553, 0, 1, 131081, 0, 1, 131089, 0, 1, 196617, 0, 1, 196619, 0, 65536, 196620, 0, 65537, 196621, 0, 65537, 196622, 0, 65537, 196623, 0, 65537, 196624, 0, 65538, 196625, 0, 1, 262153, 0, 1, 262161, 0, 1, 262172, 0, 0, 262173, 0, 0, 262174, 0, 0, 327689, 0, 1, 327697, 0, 1, 393225, 0, 1, 393233, 0, 0, 458757, 0, 0, 458758, 0, 0, 458759, 0, 0, 458761, 0, 1, 524297, 0, 0, 524298, 0, 0, 524299, 0, 0, 524300, 0, 0, 524301, 0, 0, 524302, 0, 0, 720910, 0, 0, 720911, 0, 0, 720912, 0, 0, 720913, 0, 0, 720914, 0, 0, 720915, 0, 0, 720920, 0, 196609, 720921, 0, 196609, 720922, 0, 196609, 720923, 0, 196609, 720924, 0, 196609, 720925, 0, 196609, 720926, 0, 196609, 720927, 0, 196609, 851969, 0, 65536, 851970, 0, 65537, 851971, 0, 65537, 851972, 0, 65537, 851973, 0, 65537, 851974, 0, 65537, 851975, 0, 65538, 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="Camera2D" parent="." instance=ExtResource( 1 )] scroll_h = false @@ -249,7 +249,7 @@ position = Vector2( 160, -208 ) [node name="Barrier" parent="Environment" instance=ExtResource( 20 )] position = Vector2( 140, -48 ) -scale = Vector2( 1, 24 ) +scale = Vector2( 1, 16 ) cost = 30 [node name="Barrier2" parent="Environment" instance=ExtResource( 20 )] @@ -350,11 +350,11 @@ color = 4 [node name="Star4" parent="Collectibles" instance=ExtResource( 14 )] position = Vector2( 36, -176 ) -color = 2 +color = 3 [node name="Star5" parent="Collectibles" instance=ExtResource( 14 )] position = Vector2( -68, -144 ) -color = 1 +color = 2 [node name="Gold" parent="Collectibles" instance=ExtResource( 18 )] position = Vector2( -124, -64 ) diff --git a/maps/test_room.tscn b/maps/test_room.tscn index ff01d38..c7196f6 100644 --- a/maps/test_room.tscn +++ b/maps/test_room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=30 format=2] +[gd_scene load_steps=32 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] @@ -24,6 +24,8 @@ [ext_resource path="res://objects/enemy/rolling_fiend.tscn" type="PackedScene" id=22] [ext_resource path="res://objects/enemy/steam.tscn" type="PackedScene" id=23] [ext_resource path="res://objects/enemy/laser_wall.tscn" type="PackedScene" id=24] +[ext_resource path="res://objects/enemy/cop.tscn" type="PackedScene" id=25] +[ext_resource path="res://objects/environment/turret/turret_bullet.tscn" type="PackedScene" id=26] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 16, 20 ) @@ -70,7 +72,7 @@ tile_set = ExtResource( 3 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 -tile_data = PoolIntArray( 196630, 1, 0, 262166, 1, 0, 327702, 1, 0, 393238, 1, 0, 458774, 1, 0, 524310, 1, 0, 589846, 1, 0, 655382, 1, 0, 655388, 0, 196609, 983065, 0, 65537, 983066, 0, 65537, 983067, 0, 65537, 983068, 0, 65537, 983069, 0, 65537, 1048579, 0, 65537, 1048580, 0, 65537, 1048581, 0, 65537, 1048582, 0, 65537, 1048583, 0, 65537, 1048594, 0, 65537, 1048595, 0, 65537, 1048596, 0, 65537, 1048597, 0, 65537, 1114125, 0, 0, 1114126, 0, 0, 1114127, 0, 0, 1179663, 0, 0, 1245199, 0, 0, 1245202, 0, 0, 1310734, 0, 0, 1310735, 0, 0, 1310736, 0, 0, 1310737, 0, 65537, 1310738, 0, 0, 1310739, 0, 0, 1310740, 0, 0, 1310741, 0, 0, 1310742, 0, 0, 1310743, 0, 0, 1310744, 0, 0, 1310745, 0, 65537, 1310746, 0, 65537, 1310747, 0, 65537, 1310748, 0, 65537, 1310749, 0, 65537, 1310750, 0, 65537, 1310751, 0, 65537, 1310752, 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, 1, 1507329, 0, 1, 1507330, 0, 1, 1507331, 0, 1, 1507332, 0, 1, 1507333, 0, 1, 1507334, 0, 1, 1507335, 0, 1, 1507336, 0, 1, 1507337, 0, 1, 1507338, 0, 1, 1507339, 0, 1, 1507340, 0, 1, 1507341, 0, 1, 1507342, 0, 1, 1507343, 0, 1, 1507344, 0, 1, 1507345, 0, 1, 1507346, 0, 1, 1507347, 0, 1, 1507348, 0, 1, 1507349, 0, 1, 1507350, 0, 1, 1507351, 0, 1, 1507352, 0, 1, 1507353, 0, 1, 1507354, 0, 1, 1507355, 0, 1, 1507356, 0, 1, 1507357, 0, 1, 1507358, 0, 1, 1507359, 0, 1 ) +tile_data = PoolIntArray( 196630, 1, 0, 262166, 1, 0, 327702, 1, 0, 393238, 1, 0, 458774, 1, 0, 524310, 1, 0, 589846, 1, 0, 655382, 1, 0, 655388, 0, 196609, 983062, 0, 65537, 983063, 0, 65537, 983064, 0, 65537, 983065, 0, 65537, 983066, 0, 65537, 983067, 0, 65537, 983068, 0, 65537, 983069, 0, 65537, 1048579, 0, 65537, 1048580, 0, 65537, 1048581, 0, 65537, 1048582, 0, 65537, 1048583, 0, 65537, 1048594, 0, 65537, 1048595, 0, 65537, 1048596, 0, 65537, 1048597, 0, 65537, 1114125, 0, 0, 1114126, 0, 0, 1114127, 0, 0, 1179663, 0, 0, 1245199, 0, 0, 1245202, 0, 0, 1310734, 0, 0, 1310735, 0, 0, 1310736, 0, 0, 1310737, 0, 65537, 1310738, 0, 0, 1310739, 0, 0, 1310740, 0, 0, 1310741, 0, 0, 1310742, 0, 0, 1310743, 0, 0, 1310744, 0, 0, 1310745, 0, 65537, 1310746, 0, 65537, 1310747, 0, 65537, 1310748, 0, 65537, 1310749, 0, 65537, 1310750, 0, 65537, 1310751, 0, 65537, 1310752, 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, 1, 1507329, 0, 1, 1507330, 0, 1, 1507331, 0, 1, 1507332, 0, 1, 1507333, 0, 1, 1507334, 0, 1, 1507335, 0, 1, 1507336, 0, 1, 1507337, 0, 1, 1507338, 0, 1, 1507339, 0, 1, 1507340, 0, 1, 1507341, 0, 1, 1507342, 0, 1, 1507343, 0, 1, 1507344, 0, 1, 1507345, 0, 1, 1507346, 0, 1, 1507347, 0, 1, 1507348, 0, 1, 1507349, 0, 1, 1507350, 0, 1, 1507351, 0, 1, 1507352, 0, 1, 1507353, 0, 1, 1507354, 0, 1, 1507355, 0, 1, 1507356, 0, 1, 1507357, 0, 1, 1507358, 0, 1, 1507359, 0, 1 ) [node name="Rock" parent="." instance=ExtResource( 9 )] position = Vector2( 152, 120 ) @@ -94,7 +96,7 @@ position = Vector2( 216, 168 ) position = Vector2( 104, 120 ) [node name="Player" parent="." instance=ExtResource( 1 )] -position = Vector2( 136, 144 ) +position = Vector2( 224, 64 ) [node name="Ladder3" parent="." instance=ExtResource( 8 )] position = Vector2( 40, 136 ) @@ -155,6 +157,7 @@ material = SubResource( 4 ) position = Vector2( 120, 168 ) z_index = -3 frames = SubResource( 5 ) +frame = 1 playing = true [node name="SawTest4" type="AnimatedSprite" parent="."] @@ -162,7 +165,6 @@ material = SubResource( 4 ) position = Vector2( 160, 168 ) z_index = -3 frames = SubResource( 5 ) -frame = 1 playing = true [node name="SawTest5" type="AnimatedSprite" parent="."] @@ -170,7 +172,6 @@ material = SubResource( 4 ) position = Vector2( 56, 176 ) z_index = -3 frames = SubResource( 5 ) -frame = 1 playing = true [node name="RollingFiend" parent="." instance=ExtResource( 22 )] @@ -185,6 +186,7 @@ material = SubResource( 4 ) position = Vector2( 4, 4 ) z_index = -3 frames = SubResource( 5 ) +frame = 1 playing = true [node name="Steam" parent="." instance=ExtResource( 23 )] @@ -206,11 +208,18 @@ left_up_boundary = 5.0 right_down_boundary = 5.0 [node name="MsX" parent="." groups=["a"] instance=ExtResource( 15 )] -position = Vector2( 160, 104 ) +position = Vector2( 296, 144 ) scale = Vector2( -1, 1 ) [node name="Skelarcher" parent="." instance=ExtResource( 18 )] position = Vector2( 248, 152 ) scale = Vector2( -1, 1 ) +[node name="Cop" parent="." instance=ExtResource( 25 )] +position = Vector2( 184, 112 ) +turn_time = inf + +[node name="TurretBullet" parent="." instance=ExtResource( 26 )] +position = Vector2( 152, 72 ) + [editable path="RollingFiend"] diff --git a/objects/enemy/artificial_soul.tscn b/objects/enemy/artificial_soul.tscn new file mode 100644 index 0000000..86250f2 --- /dev/null +++ b/objects/enemy/artificial_soul.tscn @@ -0,0 +1,74 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://graphics/enemy/tin_eye.png" type="Texture" id=1] +[ext_resource path="res://objects/enemy/ghost_scholar.gd" type="Script" id=2] +[ext_resource path="res://graphics/enemy/artificial_soul.png" type="Texture" id=3] + +[sub_resource type="Animation" id=2] +resource_name = "eye hue" +loop = true +step = 0.125 +tracks/0/type = "value" +tracks/0/path = NodePath("Eye:modulate") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.5, 1 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 0, +"values": [ Color( 0.560784, 1, 0.560784, 1 ), Color( 1, 0.560784, 0.568627, 1 ), Color( 0.560784, 1, 0.560784, 1 ) ] +} +tracks/1/type = "value" +tracks/1/path = NodePath(".:rotation_degrees") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0, 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 0.875, 1 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ 360.0, -90.0, -180.0, -270.0, -360.0, -90.0, -180.0, -270.0, -360.0 ] +} + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 3, 3.5 ) + +[node name="Ghost" type="Node2D"] +script = ExtResource( 2 ) +radius = 4.0 +speed = 2.0 + +[node name="Hitbox" type="Area2D" parent="." groups=["enemy_hitbox"]] +position = Vector2( 36, 4 ) + +[node name="Sprite" type="Sprite" parent="Hitbox"] +unique_name_in_owner = true +rotation = 6.28319 +texture = ExtResource( 3 ) + +[node name="Eye" type="Sprite" parent="Hitbox/Sprite"] +modulate = Color( 0.580934, 0.97985, 0.561144, 1 ) +position = Vector2( 1, 0 ) +texture = ExtResource( 1 ) + +[node name="EyeAnim" type="AnimationPlayer" parent="Hitbox/Sprite"] +autoplay = "eye hue" +"anims/eye hue" = SubResource( 2 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"] +position = Vector2( 0, -0.5 ) +shape = SubResource( 1 ) + +[node name="Pivot" type="Node2D" parent="."] +position = Vector2( 4, 4 ) + +[node name="RemoteTransform" type="RemoteTransform2D" parent="Pivot"] +position = Vector2( 32, 0 ) +remote_path = NodePath("../../Hitbox") +update_rotation = false +update_scale = false + +[connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"] diff --git a/objects/enemy/cop.gd b/objects/enemy/cop.gd index 7c7786b..a853a6a 100644 --- a/objects/enemy/cop.gd +++ b/objects/enemy/cop.gd @@ -24,6 +24,7 @@ var shooting = false var turns = 0 const BoneParticle = preload("res://objects/enemy/bone_particle.tscn") +const EasyBullet = preload("res://objects/environment/turret/turret_bullet.tscn") func _ready(): if Engine.editor_hint: @@ -38,6 +39,11 @@ func _ready(): sprite.speed_scale = inverse_lerp(0.0, 25.0, walk_speed) func _physics_process(delta): + var easy_bullet = EasyBullet.instance() + easy_bullet.direction = Vector2.RIGHT + easy_bullet.global_position = global_position + get_parent().call_deferred("add_child", easy_bullet) + Game.instance_node(EasyBullet,global_position.x,global_position.y,self) if Engine.editor_hint: return if !shooting: @@ -45,8 +51,12 @@ func _physics_process(delta): var collider = shoot_cast.get_collider() if collider != null && (collider.is_in_group("player") or collider.is_in_group("msx")): if Game.get_sector(global_position) == Game.get_sector(collider.global_position): - # kill player and enter shooting state temporarily - collider.get_parent().die() + if Game.is_easy_mode: + #Console.print("test") + Game.instance_node(EasyBullet,global_position.x,global_position.y,self) + else: + # kill player and enter shooting state temporarily + collider.get_parent().die() # play sound Audio.play_sound(Audio.a_die_robot, Audio.ac_boss) # muzzle flash diff --git a/objects/enemy/ghost_scholar.tscn b/objects/enemy/ghost_scholar.tscn deleted file mode 100644 index 74d6dc0..0000000 --- a/objects/enemy/ghost_scholar.tscn +++ /dev/null @@ -1,35 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://objects/enemy/ghost_scholar.gd" type="Script" id=1] -[ext_resource path="res://graphics/enemy/ghost.png" type="Texture" id=2] - -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 3, 3.5 ) - -[node name="Ghost" type="Node2D"] -script = ExtResource( 1 ) -radius = 4.0 -speed = 2.0 - -[node name="Hitbox" type="Area2D" parent="." groups=["enemy_hitbox"]] -position = Vector2( 36, 4 ) - -[node name="Sprite" type="Sprite" parent="Hitbox"] -unique_name_in_owner = true -texture = ExtResource( 2 ) -hframes = 2 - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"] -position = Vector2( 0, -0.5 ) -shape = SubResource( 1 ) - -[node name="Pivot" type="Node2D" parent="."] -position = Vector2( 4, 4 ) - -[node name="RemoteTransform" type="RemoteTransform2D" parent="Pivot"] -position = Vector2( 32, 0 ) -remote_path = NodePath("../../Hitbox") -update_rotation = false -update_scale = false - -[connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"] diff --git a/objects/enemy/rolling_fiend.tscn b/objects/enemy/rolling_fiend.tscn index 8506ea8..82b2861 100644 --- a/objects/enemy/rolling_fiend.tscn +++ b/objects/enemy/rolling_fiend.tscn @@ -40,6 +40,7 @@ move_speed = 50.0 material = SubResource( 5 ) position = Vector2( 4, 4 ) frames = SubResource( 3 ) +frame = 1 playing = true [node name="FloorTestShape" type="CollisionShape2D" parent="."]