new lighter water

graphics/tiles/water_light.tres

@@ -0,0 +1,14 @@
+[gd_resource type="AnimatedTexture" load_steps=4 format=2]
+
+[ext_resource path="res://graphics/tiles/water_light_3.png" type="Texture" id=1]
+[ext_resource path="res://graphics/tiles/water_light_2.png" type="Texture" id=2]
+[ext_resource path="res://graphics/tiles/water_light_1.png" type="Texture" id=3]
+
+[resource]
+frames = 3
+fps = 5.0
+frame_0/texture = ExtResource( 3 )
+frame_1/texture = ExtResource( 2 )
+frame_1/delay_sec = 0.0
+frame_2/texture = ExtResource( 1 )
+frame_2/delay_sec = 0.0

graphics/tiles/water_light_1.png.import

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

graphics/tiles/water_light_2.png.import

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

graphics/tiles/water_light_3.png.import

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

graphics/tiles/water_light_bottom.png.import

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

@@ -1,19 +1,17 @@
-[gd_scene load_steps=30 format=2]
+[gd_scene load_steps=28 format=2]
 
 [ext_resource path="res://objects/enemy/squig.tscn" type="PackedScene" id=1]
 [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://tilesets/t_death.tres" type="TileSet" 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/hud/letter_block.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/environment/turniwood/turning_platform.tscn" type="PackedScene" id=12]
 [ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=13]
 [ext_resource path="res://objects/environment/hatch/hatch.tscn" type="PackedScene" id=14]
-[ext_resource path="res://objects/npc/msx.tscn" type="PackedScene" id=15]
 [ext_resource path="res://objects/respawn_point.tscn" type="PackedScene" id=16]
 [ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=17]
 [ext_resource path="res://objects/enemy/turtle.tscn" type="PackedScene" id=18]
@@ -66,10 +64,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, 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, 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, 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 )
 
 [node name="Slime" parent="." instance=ExtResource( 10 )]
 position = Vector2( 264, 168 )
@@ -152,10 +147,6 @@ position = Vector2( 40, 120 )
 position = Vector2( 16, 168 )
 target_group = "a"
 
-[node name="MsX" parent="." groups=["a"] instance=ExtResource( 15 )]
-position = Vector2( 240, 160 )
-scale = Vector2( -1, 1 )
-
 [node name="Cop" parent="." instance=ExtResource( 25 )]
 position = Vector2( 184, 112 )
 turn_time = inf
@@ -171,38 +162,17 @@ position = Vector2( 168, 56 )
 left_up_boundary = 5.0
 right_down_boundary = 5.0
 
-[node name="LetterBlock" parent="." instance=ExtResource( 8 )]
-position = Vector2( 184, 160 )
-glyph = 4
-
-[node name="LetterBlock2" parent="." instance=ExtResource( 8 )]
-position = Vector2( 192, 152 )
-glyph = 26
-
-[node name="LetterBlock3" parent="." instance=ExtResource( 8 )]
-position = Vector2( 176, 144 )
-glyph = 12
-
-[node name="LetterBlock4" parent="." instance=ExtResource( 8 )]
-position = Vector2( 192, 136 )
-glyph = 16
-
-[node name="LetterBlock5" parent="." instance=ExtResource( 8 )]
-position = Vector2( 216, 152 )
-glyph = 3
-
-[node name="LetterBlock6" parent="." instance=ExtResource( 8 )]
-position = Vector2( 208, 128 )
-glyph = 30
-
-[node name="LetterBlock7" parent="." instance=ExtResource( 8 )]
-position = Vector2( 224, 136 )
-glyph = 27
-
 [node name="Turtle" parent="." instance=ExtResource( 18 )]
-position = Vector2( 40, 160 )
+position = Vector2( 152, 152 )
-left_up_boundary = 2.0
+left_up_boundary = 4.0
 right_down_boundary = 4.0
-speed = 10
+move_direction = 1
+
+[node name="MovingPlatform" parent="." instance=ExtResource( 6 )]
+position = Vector2( 128, 152 )
+scale = Vector2( 2, 1 )
+left_up_boundary = 4.0
+right_down_boundary = 4.0
+move_direction = 1
 
 [editable path="RollingFiend"]

tilesets/t_death.tres

@@ -7,6 +7,8 @@
 [ext_resource path="res://graphics/tiles/oil.tres" type="Texture" id=5]
 [ext_resource path="res://graphics/tiles/blood_bottom.png" type="Texture" id=6]
 [ext_resource path="res://graphics/tiles/blood.tres" type="Texture" id=7]
+[ext_resource path="res://graphics/tiles/water_light.tres" type="Texture" id=8]
+[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 )
@@ -14,12 +16,6 @@ points = PoolVector2Array( 7, 8, 1, 8, 1, 2, 7, 2 )
 [sub_resource type="ConvexPolygonShape2D" id=2]
 points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 )
 
-[sub_resource type="ConvexPolygonShape2D" id=3]
-points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 )
-
-[sub_resource type="ConvexPolygonShape2D" id=4]
-points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 )
-
 [sub_resource type="ConvexPolygonShape2D" id=5]
 points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 )
 
@@ -69,20 +65,6 @@ points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 )
 "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
 } ]
 1/z_index = 0
-2/name = "spike.png 2"
-2/texture = ExtResource( 2 )
-2/tex_offset = Vector2( 0, 0 )
-2/modulate = Color( 1, 1, 1, 1 )
-2/region = Rect2( 8, 0, 8, 8 )
-2/tile_mode = 0
-2/occluder_offset = Vector2( 0, 0 )
-2/navigation_offset = Vector2( 0, 0 )
-2/shape_offset = Vector2( 0, 0 )
-2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-2/shape_one_way = false
-2/shape_one_way_margin = 0.0
-2/shapes = [  ]
-2/z_index = 0
 3/name = "water_bottom.png 3"
 3/texture = ExtResource( 3 )
 3/tex_offset = Vector2( 0, 0 )
@@ -104,40 +86,6 @@ points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 )
 "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
 } ]
 3/z_index = 10
-4/name = "water_bottom.png 4"
-4/texture = ExtResource( 3 )
-4/tex_offset = Vector2( 0, 0 )
-4/modulate = Color( 1, 1, 1, 1 )
-4/region = Rect2( 0, 0, 8, 8 )
-4/tile_mode = 2
-4/autotile/icon_coordinate = Vector2( 0, 0 )
-4/autotile/tile_size = Vector2( 8, 8 )
-4/autotile/spacing = 0
-4/autotile/occluder_map = [  ]
-4/autotile/navpoly_map = [  ]
-4/autotile/priority_map = [  ]
-4/autotile/z_index_map = [  ]
-4/occluder_offset = Vector2( 0, 0 )
-4/navigation_offset = Vector2( 0, 0 )
-4/shape_offset = Vector2( 0, 0 )
-4/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-4/shape = SubResource( 3 )
-4/shape_one_way = false
-4/shape_one_way_margin = 1.0
-4/shapes = [ {
-"autotile_coord": Vector2( 0, 0 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 3 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 0, 0 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 4 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-} ]
-4/z_index = 0
 6/name = "oil_bottom.png 6"
 6/texture = ExtResource( 4 )
 6/tex_offset = Vector2( 0, 0 )
@@ -236,3 +184,45 @@ points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 )
 "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
 } ]
 9/z_index = 0
+10/name = "water_light.tres 10"
+10/texture = ExtResource( 8 )
+10/tex_offset = Vector2( 0, 0 )
+10/modulate = Color( 1, 1, 1, 1 )
+10/region = Rect2( 0, 0, 8, 8 )
+10/tile_mode = 2
+10/autotile/icon_coordinate = Vector2( 0, 0 )
+10/autotile/tile_size = Vector2( 8, 8 )
+10/autotile/spacing = 0
+10/autotile/occluder_map = [  ]
+10/autotile/navpoly_map = [  ]
+10/autotile/priority_map = [  ]
+10/autotile/z_index_map = [  ]
+10/occluder_offset = Vector2( 0, 0 )
+10/navigation_offset = Vector2( 0, 0 )
+10/shape_offset = Vector2( 0, 0 )
+10/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+10/shape_one_way = false
+10/shape_one_way_margin = 0.0
+10/shapes = [  ]
+10/z_index = 0
+11/name = "water_light_bottom.png 11"
+11/texture = ExtResource( 9 )
+11/tex_offset = Vector2( 0, 0 )
+11/modulate = Color( 1, 1, 1, 1 )
+11/region = Rect2( 0, 0, 8, 8 )
+11/tile_mode = 2
+11/autotile/icon_coordinate = Vector2( 0, 0 )
+11/autotile/tile_size = Vector2( 8, 8 )
+11/autotile/spacing = 0
+11/autotile/occluder_map = [  ]
+11/autotile/navpoly_map = [  ]
+11/autotile/priority_map = [  ]
+11/autotile/z_index_map = [  ]
+11/occluder_offset = Vector2( 0, 0 )
+11/navigation_offset = Vector2( 0, 0 )
+11/shape_offset = Vector2( 0, 0 )
+11/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+11/shape_one_way = false
+11/shape_one_way_margin = 0.0
+11/shapes = [  ]
+11/z_index = 0