From f19a49f6e70c856db96358f62ef7f80957750feb Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Sat, 11 Feb 2023 02:55:47 -0500 Subject: [PATCH] fixed issue 45 --- maps/canopy.tscn | 36 +++--------------------------------- maps/cave.tscn | 17 +++-------------- 2 files changed, 6 insertions(+), 47 deletions(-) diff --git a/maps/canopy.tscn b/maps/canopy.tscn index d5ed29c..5ff1627 100644 --- a/maps/canopy.tscn +++ b/maps/canopy.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=2] +[gd_scene load_steps=23 format=2] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=1] [ext_resource path="res://maps/map.gd" type="Script" id=2] @@ -18,7 +18,6 @@ [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] [ext_resource path="res://tilesets/t_death.tres" type="TileSet" id=18] -[ext_resource path="res://objects/environment/death tile/death_tile.tscn" type="PackedScene" id=19] [ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=20] [ext_resource path="res://objects/environment/exit/exit.tscn" type="PackedScene" id=21] [ext_resource path="res://audio/music/dusk_park.mp3" type="AudioStream" id=22] @@ -58,9 +57,10 @@ cell_size = Vector2( 8, 8 ) format = 1 tile_data = PoolIntArray( 393303, 0, 196608, 458839, 0, 196608, 524375, 0, 196608, 589911, 0, 196608, 655367, 0, 196608, 655447, 0, 196608, 720903, 0, 196608, 720983, 0, 196608, 786519, 0, 196608, 852055, 0, 196608, 917516, 0, 196608, 917591, 0, 196608, 983052, 0, 196608, 983127, 0, 196608, 1048588, 0, 196608, 1048663, 0, 196608, 1114199, 0, 196608, 1179735, 0, 196608, 1245271, 0, 196608 ) -[node name="Death" type="TileMap" parent="."] +[node name="Death" type="TileMap" parent="." groups=["death"]] tile_set = ExtResource( 18 ) cell_size = Vector2( 8, 8 ) +collision_layer = 32 format = 1 tile_data = PoolIntArray( 589892, 1, 0, 589893, 1, 0, 589894, 1, 0, 589895, 1, 0, 589896, 1, 0, 720916, 1, 0, 720932, 1, 0, 720938, 1, 0, 720939, 1, 0, 720940, 1, 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, 1441864, 0, 0, 1441865, 0, 0, 1441866, 0, 0, 1441869, 0, 0, 1441870, 0, 0, 1441871, 0, 0, 1441883, 0, 0, 1441884, 0, 0, 1441885, 0, 0, 1441886, 0, 0, 1441887, 0, 0, 1507360, 3, 0, 1507361, 3, 0, 1507362, 3, 0, 1507363, 3, 0, 1507364, 3, 0, 1507365, 3, 0, 1507366, 3, 0, 1507367, 3, 0, 1507368, 3, 0, 1507369, 3, 0, 1507370, 3, 0, 1507371, 3, 0, 1507400, 3, 0, 1507401, 3, 0, 1507402, 3, 0, 1507405, 3, 0, 1507406, 3, 0, 1507407, 3, 0, 1507419, 3, 0, 1507420, 3, 0, 1507421, 3, 0, 1507422, 3, 0, 1507423, 3, 0 ) @@ -545,36 +545,6 @@ shape = SubResource( 1 ) position = Vector2( 746, 36 ) cost = 2 -[node name="DeathTile" parent="." instance=ExtResource( 19 )] -position = Vector2( 544, 72 ) -scale = Vector2( 5, 1 ) - -[node name="DeathTile5" parent="." instance=ExtResource( 19 )] -position = Vector2( 728, 192 ) -scale = Vector2( 5, 2 ) - -[node name="DeathTile6" parent="." instance=ExtResource( 19 )] -position = Vector2( 616, 192 ) -scale = Vector2( 3, 2 ) - -[node name="DeathTile7" parent="." instance=ExtResource( 19 )] -position = Vector2( 576, 192 ) -scale = Vector2( 3, 2 ) - -[node name="DeathTile8" parent="." instance=ExtResource( 19 )] -position = Vector2( 256, 192 ) -scale = Vector2( 12, 2 ) - -[node name="DeathTile2" parent="." instance=ExtResource( 19 )] -position = Vector2( 336, 88 ) -scale = Vector2( 3, 1 ) - -[node name="DeathTile3" parent="." instance=ExtResource( 19 )] -position = Vector2( 288, 88 ) - -[node name="DeathTile4" parent="." instance=ExtResource( 19 )] -position = Vector2( 160, 88 ) - [node name="Shard" parent="." instance=ExtResource( 20 )] position = Vector2( 656, 104 ) number = 2 diff --git a/maps/cave.tscn b/maps/cave.tscn index 0638429..c6deaf6 100644 --- a/maps/cave.tscn +++ b/maps/cave.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=26 format=2] +[gd_scene load_steps=25 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] @@ -21,7 +21,6 @@ [ext_resource path="res://scripts/delete_on_game_running.gd" type="Script" id=19] [ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=20] [ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=21] -[ext_resource path="res://objects/environment/death tile/death_tile.tscn" type="PackedScene" id=22] [ext_resource path="res://objects/environment/barrier/barrier.tscn" type="PackedScene" id=23] [ext_resource path="res://objects/environment/exit/exit.tscn" type="PackedScene" id=24] @@ -64,9 +63,10 @@ collision_layer = 9 format = 1 tile_data = PoolIntArray( 393236, 0, 196610, 458772, 0, 196608, 524308, 0, 196608, 589844, 0, 196608, 786445, 0, 196610, 786460, 0, 196610, 851981, 0, 196608, 851996, 0, 196608, 917517, 0, 196608, 917532, 0, 196608, 983053, 0, 196608, 983068, 0, 196608, 983078, 0, 196610, 1048589, 0, 196608, 1048604, 0, 196608, 1048614, 0, 196608, 1114125, 0, 196608, 1114150, 0, 196608, 1179661, 0, 196608, 1179686, 0, 196608, 1245197, 0, 196608, 1245222, 0, 196608, 1310733, 0, 196608, 1310758, 0, 196608, 1376268, 0, 262144, 1376269, 0, 196609, 1376274, 0, 262144, 1376284, 0, 262144, 1376294, 0, 196609 ) -[node name="Death" type="TileMap" parent="."] +[node name="Death" type="TileMap" parent="." groups=["death"]] tile_set = ExtResource( 5 ) cell_size = Vector2( 8, 8 ) +collision_layer = 32 format = 1 tile_data = PoolIntArray( 720951, 1, 0, 720952, 1, 0, 720977, 1, 0, 720978, 1, 0, 983091, 1, 0 ) @@ -186,17 +186,6 @@ position = Vector2( 528, 160 ) [node name="Turniwood2" parent="Platforms" instance=ExtResource( 21 )] position = Vector2( 320, 32 ) -[node name="Area2D2" parent="Platforms" instance=ExtResource( 22 )] -position = Vector2( 440, 88 ) -scale = Vector2( 2, 1 ) - -[node name="Area2D5" parent="Platforms" instance=ExtResource( 22 )] -position = Vector2( 648, 88 ) -scale = Vector2( 2, 1 ) - -[node name="Area2D4" parent="Platforms" instance=ExtResource( 22 )] -position = Vector2( 408, 120 ) - [node name="Barrier" parent="Platforms" instance=ExtResource( 23 )] position = Vector2( 496, 152 ) scale = Vector2( 1, 24 )