new spike graphics + lab falling block

graphics/falling_block/falling_block_lab.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/falling_block_lab.png-6ebf33dbe45acfe91ee6786039182d5d.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://graphics/falling_block/falling_block_lab.png"
+dest_files=[ "res://.import/falling_block_lab.png-6ebf33dbe45acfe91ee6786039182d5d.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

maps/test_room.tscn

@@ -4,7 +4,7 @@
 [ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2]
 [ext_resource path="res://tilesets/t_mountain.tres" type="TileSet" id=3]
 [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=4]
-[ext_resource path="res://objects/environment/electric_tiles/electric_tiles.tscn" type="PackedScene" id=5]
+[ext_resource path="res://objects/enemy/roboturret.tscn" type="PackedScene" id=5]
 [ext_resource path="res://objects/environment/moving_platform/moving_platform.tscn" type="PackedScene" id=6]
 [ext_resource path="res://graphics/backgrounds/canopy.png" type="Texture" id=7]
 [ext_resource path="res://objects/environment/collapse_block/collapse_block.tscn" type="PackedScene" id=8]
@@ -45,7 +45,7 @@ animations = [ {
 "speed": 20.0
 } ]
 
-[node name="Map2" type="Node2D" groups=["map"]]
+[node name="Map3" type="Node2D" groups=["map"]]
 pause_mode = 1
 script = ExtResource( 11 )
 
@@ -66,7 +66,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, 983062, 0, 0, 983063, 0, 0, 983064, 0, 0, 983065, 0, 0, 983066, 0, 0, 983067, 0, 0, 983068, 0, 0, 983069, 0, 0, 1048579, 0, 65537, 1048580, 0, 65537, 1048581, 0, 65537, 1048582, 0, 65537, 1048583, 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, 0, 983063, 0, 0, 983064, 0, 0, 983065, 0, 0, 983066, 0, 0, 983067, 0, 0, 983068, 0, 0, 983069, 0, 0, 1048579, 0, 65537, 1048580, 0, 65537, 1048581, 0, 65537, 1048582, 0, 65537, 1048583, 0, 65537, 1376272, 0, 0, 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="Slime" parent="." instance=ExtResource( 10 )]
 position = Vector2( 264, 168 )
@@ -84,8 +84,6 @@ collision_layer = 9
 format = 1
 tile_data = PoolIntArray( 1114117, 0, 196610, 1179653, 0, 196608, 1245189, 0, 196608, 1310725, 0, 196608, 1376261, 0, 196609 )
 
-[node name="ElectricTiles" parent="." instance=ExtResource( 5 )]
-
 [node name="Turniwood5" parent="." instance=ExtResource( 12 )]
 position = Vector2( 80, 120 )
 
@@ -124,7 +122,6 @@ position = Vector2( 48, 120 )
 
 [node name="AnimatedSprite" parent="RollingFiend" index="0"]
 visible = false
-frame = 1
 
 [node name="SawTest2" type="AnimatedSprite" parent="RollingFiend"]
 material = SubResource( 4 )
@@ -150,7 +147,7 @@ turn_time = inf
 position = Vector2( 152, 72 )
 
 [node name="Player2" parent="." instance=ExtResource( 27 )]
-position = Vector2( 80, 168 )
+position = Vector2( 168, 168 )
 
 [node name="MovingPlatform" parent="." instance=ExtResource( 6 )]
 position = Vector2( 96, 144 )
@@ -178,4 +175,7 @@ position = Vector2( 144, 128 )
 [node name="CollapseBlock3" parent="." instance=ExtResource( 8 )]
 position = Vector2( 152, 128 )
 
+[node name="Roboturret" parent="." instance=ExtResource( 5 )]
+position = Vector2( 112, 168 )
+
 [editable path="RollingFiend"]

objects/environment/falling_block/falling_block_lab.tscn

@@ -0,0 +1,9 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://objects/environment/falling_block/falling_block_cave.tscn" type="PackedScene" id=1]
+[ext_resource path="res://graphics/falling_block/falling_block_lab.png" type="Texture" id=2]
+
+[node name="FallingBlock" instance=ExtResource( 1 )]
+
+[node name="Sprite" parent="." index="0"]
+texture = ExtResource( 2 )

tilesets/t_death.tres

@@ -1,4 +1,4 @@
-[gd_resource type="TileSet" load_steps=15 format=2]
+[gd_resource type="TileSet" load_steps=16 format=2]
 
 [ext_resource path="res://graphics/tiles/water.tres" type="Texture" id=1]
 [ext_resource path="res://graphics/tiles/spike.png" type="Texture" id=2]
@@ -11,11 +11,14 @@
 [ext_resource path="res://graphics/tiles/water_light_bottom.png" type="Texture" id=9]
 
 [sub_resource type="ConvexPolygonShape2D" id=1]
-points = PoolVector2Array( 7, 8, 1, 8, 1, 2, 7, 2 )
+points = PoolVector2Array( 7, 8, 1, 8, 1, 1, 7, 1 )
 
 [sub_resource type="ConvexPolygonShape2D" id=7]
 points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 )
 
+[sub_resource type="ConvexPolygonShape2D" id=8]
+points = PoolVector2Array( 1, 1, 7, 1, 7, 7, 1, 7 )
+
 [sub_resource type="ConvexPolygonShape2D" id=2]
 points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 )
 
@@ -236,3 +239,24 @@ points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 )
 "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
 } ]
 11/z_index = 0
+12/name = "spike.png 12"
+12/texture = ExtResource( 2 )
+12/tex_offset = Vector2( 0, 0 )
+12/modulate = Color( 1, 1, 1, 1 )
+12/region = Rect2( 8, 0, 8, 8 )
+12/tile_mode = 0
+12/occluder_offset = Vector2( 0, 0 )
+12/navigation_offset = Vector2( 0, 0 )
+12/shape_offset = Vector2( 0, 0 )
+12/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+12/shape = SubResource( 8 )
+12/shape_one_way = false
+12/shape_one_way_margin = 1.0
+12/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 8 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+12/z_index = 0