From fe0c126d475be595129e4078265638fb4f8afa7b Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Fri, 8 Sep 2023 22:14:04 -0400 Subject: [PATCH] more work on lab --- maps/lab.tscn | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/maps/lab.tscn b/maps/lab.tscn index 35974ae..557cac2 100644 --- a/maps/lab.tscn +++ b/maps/lab.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=33 format=2] +[gd_scene load_steps=34 format=2] [ext_resource path="res://graphics/backgrounds/factory.png" type="Texture" id=1] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=2] @@ -30,6 +30,7 @@ [ext_resource path="res://objects/environment/electric_tiles/electric_tiles.tscn" type="PackedScene" id=28] [ext_resource path="res://objects/collectibles/key.tscn" type="PackedScene" id=29] [ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=30] +[ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=31] [sub_resource type="RectangleShape2D" id=2] extents = Vector2( 20.1613, 4.03226 ) @@ -61,7 +62,7 @@ __meta__ = { tile_set = ExtResource( 4 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 393220, 1, 196609, 393221, 1, 196610, 393222, 1, 196610, 393223, 1, 196610, 393224, 1, 196610, 393225, 1, 3, 393233, 1, 1, 393234, 1, 196610, 393235, 1, 196610, 393236, 1, 196610, 393237, 1, 196610, 393238, 1, 196610, 393239, 1, 196610, 393240, 1, 196610, 393241, 1, 196610, 393242, 1, 196610, 393243, 1, 196610, 393244, 1, 196610, 393245, 1, 196610, 393246, 1, 196610, 393247, 1, 196610, 393248, 1, 196610, 393249, 1, 196610, 393250, 1, 3, 458761, 1, 131073, 458762, 1, 196610, 458763, 1, 196610, 458764, 1, 196610, 458765, 1, 196610, 458766, 1, 196610, 458767, 1, 196610, 458768, 1, 196610, 458769, 1, 131075, 458786, 1, 65536, 524322, 1, 65536, 589858, 1, 65536, 655390, 1, 196609, 655391, 1, 196610, 655392, 1, 196611, 655394, 1, 65536, 720916, 1, 0, 720920, 1, 196608, 720930, 1, 65536, 786436, 1, 196609, 786437, 1, 196610, 786438, 1, 196610, 786439, 1, 196610, 786440, 1, 196610, 786441, 1, 196611, 786444, 1, 196609, 786445, 1, 196610, 786446, 1, 196610, 786447, 1, 196610, 786448, 1, 196610, 786449, 1, 196610, 786450, 1, 196611, 786452, 1, 131072, 786466, 1, 65536, 851998, 1, 196609, 851999, 1, 196610, 852000, 1, 196610, 852001, 1, 196610, 852002, 1, 131075, 1048579, 1, 1, 1048580, 1, 3, 1048586, 1, 196609, 1048587, 1, 196611, 1048594, 1, 196609, 1048595, 1, 196611, 1114112, 1, 196609, 1114113, 1, 196610, 1114114, 1, 196610, 1114115, 1, 131074, 1114116, 1, 131074, 1114117, 1, 3, 1114140, 1, 196609, 1114141, 1, 196610, 1114142, 1, 196610, 1114143, 1, 196611, 1179653, 1, 131073, 1179654, 1, 2, 1179655, 1, 3, 1179662, 1, 0, 1245190, 1, 131073, 1245191, 1, 131074, 1245192, 1, 196610, 1245193, 1, 196610, 1245194, 1, 196610, 1245195, 1, 196610, 1245196, 1, 196610, 1245197, 1, 196610, 1245198, 1, 131074, 1245199, 1, 196610, 1245200, 1, 196610, 1245201, 1, 196611, 1245207, 2, 1, 1245208, 2, 2, 1245209, 2, 2, 1245210, 2, 3, 1310742, 2, 1, 1310743, 2, 65538, 1310744, 2, 65538, 1310745, 2, 65538, 1310746, 2, 65539, 1376277, 2, 196609, 1376278, 2, 131074, 1376279, 2, 131074, 1376280, 2, 131074, 1376281, 2, 131074, 1376282, 2, 131075, 1441792, 0, 1, 1441793, 0, 2, 1441794, 0, 2, 1441795, 0, 2, 1441796, 0, 2, 1441797, 0, 2, 1441798, 0, 2, 1441799, 0, 2, 1441800, 0, 2, 1441801, 0, 2, 1441802, 0, 2, 1441803, 0, 2, 1441804, 0, 2, 1441805, 0, 2, 1441806, 0, 2, 1441807, 0, 2, 1441808, 0, 2, 1441809, 0, 2, 1441810, 0, 2, 1441811, 0, 2, 1441812, 0, 2, 1441813, 0, 2, 1441814, 0, 2, 1441815, 0, 2, 1441816, 0, 2, 1441817, 0, 2, 1441818, 0, 2, 1441819, 0, 2, 1441820, 0, 2, 1441821, 0, 2, 1441822, 0, 2, 1441823, 0, 3, 1507328, 1, 196609, 1507329, 1, 196610, 1507330, 1, 196610, 1507331, 1, 196610, 1507332, 1, 196610, 1507333, 1, 196610, 1507334, 1, 196610, 1507335, 1, 196610, 1507336, 1, 196610, 1507337, 1, 196610, 1507338, 1, 196610, 1507339, 1, 196610, 1507340, 1, 196610, 1507341, 1, 196610, 1507342, 1, 196610, 1507343, 1, 196610, 1507344, 1, 196610, 1507345, 1, 196610, 1507346, 1, 196610, 1507347, 1, 196610, 1507348, 1, 196610, 1507349, 1, 196610, 1507350, 1, 196610, 1507351, 1, 196610, 1507352, 1, 196610, 1507353, 1, 196610, 1507354, 1, 196610, 1507355, 1, 196610, 1507356, 1, 196610, 1507357, 1, 196610, 1507358, 1, 196610, 1507359, 1, 196611 ) +tile_data = PoolIntArray( 393220, 1, 196609, 393221, 1, 196610, 393222, 1, 196610, 393223, 1, 196610, 393224, 1, 196610, 393225, 1, 3, 393233, 1, 1, 393234, 1, 196610, 393235, 1, 196610, 393236, 1, 196610, 393237, 1, 196610, 393238, 1, 196610, 393239, 1, 196610, 393240, 1, 196610, 393241, 1, 196610, 393242, 1, 196610, 393243, 1, 196610, 393244, 1, 196610, 393245, 1, 196610, 393246, 1, 196610, 393247, 1, 196610, 393248, 1, 196610, 393249, 1, 196610, 393250, 1, 3, 458761, 1, 131073, 458762, 1, 196610, 458763, 1, 196610, 458764, 1, 196610, 458765, 1, 196610, 458766, 1, 196610, 458767, 1, 196610, 458768, 1, 196610, 458769, 1, 131075, 458786, 1, 65536, 524322, 1, 65536, 589858, 1, 65536, 655390, 1, 196609, 655391, 1, 196610, 655392, 1, 196611, 655394, 1, 65536, 720899, 1, 0, 720916, 1, 0, 720920, 1, 0, 720930, 1, 65536, 786435, 1, 131073, 786436, 1, 196610, 786437, 1, 196610, 786438, 1, 196610, 786439, 1, 196610, 786440, 1, 196610, 786441, 1, 196611, 786444, 1, 196609, 786445, 1, 196610, 786446, 1, 196610, 786447, 1, 196610, 786448, 1, 196610, 786449, 1, 196610, 786450, 1, 196611, 786452, 1, 65536, 786456, 1, 65536, 786466, 1, 65536, 851988, 1, 131073, 851989, 1, 196610, 851990, 1, 196610, 851991, 1, 196610, 851992, 1, 131074, 851993, 1, 196610, 851994, 1, 196610, 851995, 1, 196610, 851996, 1, 196610, 851997, 1, 196611, 851999, 1, 196609, 852000, 1, 196610, 852001, 1, 196610, 852002, 1, 131075, 1048579, 1, 1, 1048580, 1, 3, 1048586, 1, 196609, 1048587, 1, 196611, 1048594, 1, 196609, 1048595, 1, 196611, 1114112, 1, 196609, 1114113, 1, 196610, 1114114, 1, 196610, 1114115, 1, 131074, 1114116, 1, 131074, 1114117, 1, 3, 1114140, 1, 196609, 1114141, 1, 196610, 1114142, 1, 196610, 1114143, 1, 196611, 1179653, 1, 131073, 1179654, 1, 2, 1179655, 1, 3, 1179662, 1, 0, 1245190, 1, 131073, 1245191, 1, 131074, 1245192, 1, 196610, 1245193, 1, 196610, 1245194, 1, 196610, 1245195, 1, 196610, 1245196, 1, 196610, 1245197, 1, 196610, 1245198, 1, 131074, 1245199, 1, 196610, 1245200, 1, 196610, 1245201, 1, 196611, 1245207, 2, 1, 1245208, 2, 2, 1245209, 2, 2, 1245210, 2, 3, 1310742, 2, 1, 1310743, 2, 65538, 1310744, 2, 65538, 1310745, 2, 65538, 1310746, 2, 65539, 1376277, 2, 196609, 1376278, 2, 131074, 1376279, 2, 131074, 1376280, 2, 131074, 1376281, 2, 131074, 1376282, 2, 131075, 1441792, 0, 1, 1441793, 0, 2, 1441794, 0, 2, 1441795, 0, 2, 1441796, 0, 2, 1441797, 0, 2, 1441798, 0, 2, 1441799, 0, 2, 1441800, 0, 2, 1441801, 0, 2, 1441802, 0, 2, 1441803, 0, 2, 1441804, 0, 2, 1441805, 0, 2, 1441806, 0, 2, 1441807, 0, 2, 1441808, 0, 2, 1441809, 0, 2, 1441810, 0, 2, 1441811, 0, 2, 1441812, 0, 2, 1441813, 0, 2, 1441814, 0, 2, 1441815, 0, 2, 1441816, 0, 2, 1441817, 0, 2, 1441818, 0, 2, 1441819, 0, 2, 1441820, 0, 2, 1441821, 0, 2, 1441822, 0, 2, 1441823, 0, 3, 1507328, 1, 196609, 1507329, 1, 196610, 1507330, 1, 196610, 1507331, 1, 196610, 1507332, 1, 196610, 1507333, 1, 196610, 1507334, 1, 196610, 1507335, 1, 196610, 1507336, 1, 196610, 1507337, 1, 196610, 1507338, 1, 196610, 1507339, 1, 196610, 1507340, 1, 196610, 1507341, 1, 196610, 1507342, 1, 196610, 1507343, 1, 196610, 1507344, 1, 196610, 1507345, 1, 196610, 1507346, 1, 196610, 1507347, 1, 196610, 1507348, 1, 196610, 1507349, 1, 196610, 1507350, 1, 196610, 1507351, 1, 196610, 1507352, 1, 196610, 1507353, 1, 196610, 1507354, 1, 196610, 1507355, 1, 196610, 1507356, 1, 196610, 1507357, 1, 196610, 1507358, 1, 196610, 1507359, 1, 196611 ) [node name="ElectricTiles" parent="." instance=ExtResource( 28 )] position = Vector2( -152, 16 ) @@ -69,11 +70,9 @@ tile_data = PoolIntArray( 786436, 2, 196609, 786437, 2, 196610, 786438, 2, 19661 [node name="CollisionShape2D" parent="ElectricTiles/DeathTile" index="0"] position = Vector2( -31.4516, -28.2258 ) -scale = Vector2( 1, 1 ) [node name="CollisionShape2D2" type="CollisionShape2D" parent="ElectricTiles/DeathTile" index="1"] position = Vector2( -57.2581, -54.0323 ) -scale = Vector2( 1, 1 ) shape = SubResource( 2 ) [node name="Player" parent="." instance=ExtResource( 26 )] @@ -84,7 +83,7 @@ tile_set = ExtResource( 9 ) cell_size = Vector2( 8, 8 ) collision_layer = 32 format = 1 -tile_data = PoolIntArray( 655384, 1, 0, 720902, 1, 0, 720905, 1, 0, 720913, 1, 0, 2031608, 9, 0, 2031609, 6, 0, 2031610, 9, 0, 2031611, 6, 0, 2031612, 9, 0, 2097144, 6, 0, 2097145, 9, 0, 2097146, 6, 0, 2097147, 9, 0, 2097148, 6, 0, 2162680, 9, 0, 2162681, 6, 0, 2162682, 9, 0, 2162683, 6, 0, 2162684, 9, 0, 2228216, 6, 0, 2228217, 9, 0, 2228218, 6, 0, 2228219, 9, 0, 2228220, 6, 0, 2293752, 9, 0, 2293753, 6, 0, 2293754, 9, 0, 2293755, 6, 0, 2293756, 9, 0 ) +tile_data = PoolIntArray( 655384, 1, 0, 720902, 1, 0, 720905, 1, 0, 720913, 1, 0, 786453, 1, 0, 786454, 1, 0, 786455, 1, 0, 786457, 1, 0, 786458, 1, 0, 786459, 1, 0, 786460, 1, 0, 786461, 1, 0, 2031608, 9, 0, 2031609, 6, 0, 2031610, 9, 0, 2031611, 6, 0, 2031612, 9, 0, 2097144, 6, 0, 2097145, 9, 0, 2097146, 6, 0, 2097147, 9, 0, 2097148, 6, 0, 2162680, 9, 0, 2162681, 6, 0, 2162682, 9, 0, 2162683, 6, 0, 2162684, 9, 0, 2228216, 6, 0, 2228217, 9, 0, 2228218, 6, 0, 2228219, 9, 0, 2228220, 6, 0, 2293752, 9, 0, 2293753, 6, 0, 2293754, 9, 0, 2293755, 6, 0, 2293756, 9, 0 ) [node name="Ladder" type="TileMap" parent="."] tile_set = ExtResource( 21 ) @@ -155,6 +154,9 @@ position = Vector2( 120, 88 ) [node name="Key12" parent="Collectibles" instance=ExtResource( 29 )] position = Vector2( 160, 80 ) +[node name="Shard" parent="Collectibles" instance=ExtResource( 31 )] +position = Vector2( 240, 72 ) + [node name="Enemies" type="Node2D" parent="."] [node name="ArtificialSoul" parent="Enemies" instance=ExtResource( 15 )] @@ -227,7 +229,7 @@ position = Vector2( 64, 276 ) position = Vector2( 96, 280 ) [node name="Roboturret2" parent="." instance=ExtResource( 16 )] -position = Vector2( 144, 120 ) +position = Vector2( 146, 120 ) shoot_time = 0.75 [node name="Roboturret3" parent="." instance=ExtResource( 16 )]