diff --git a/graphics/tiles/abyss.png b/graphics/tiles/abyss.png index d58814c..b0612fb 100644 Binary files a/graphics/tiles/abyss.png and b/graphics/tiles/abyss.png differ diff --git a/objects/player/player.tscn b/objects/player/player.tscn index 2ebfdab..3dedb22 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1312,7 +1312,7 @@ custom_styles/bg = SubResource( 4 ) script = ExtResource( 8 ) [node name="OxygenTimer" type="Timer" parent="."] -wait_time = 20.0 +wait_time = 10.0 autostart = true [node name="JumpPeakTimer" type="Timer" parent="."] @@ -1331,8 +1331,8 @@ align = 1 [connection signal="state_physics_processing" from="StateChart/Root/Movement" to="." method="_process_movement"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded" to="." method="_on_Grounded_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded" to="." method="_process_grounded"] -[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_horizontal_movement_grounded"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_can_walk"] +[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_horizontal_movement_grounded"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Still" to="." method="_on_Still_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Walking" to="." method="_on_Walking_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Blinking" to="." method="_on_Blinking_state_entered"] diff --git a/tilesets/t_abyss.tres b/tilesets/t_abyss.tres index 441da17..4f07158 100644 --- a/tilesets/t_abyss.tres +++ b/tilesets/t_abyss.tres @@ -1,4 +1,4 @@ -[gd_resource type="TileSet" load_steps=22 format=2] +[gd_resource type="TileSet" load_steps=23 format=2] [ext_resource path="res://graphics/tiles/abyss.png" type="Texture" id=1] @@ -62,6 +62,9 @@ points = PoolVector2Array( 8, 4, 0, 4, 0, 0, 8, 0 ) [sub_resource type="ConvexPolygonShape2D" id=20] points = PoolVector2Array( 8, 4, 0, 4, 0, 0, 8, 0 ) +[sub_resource type="ConvexPolygonShape2D" id=21] +points = PoolVector2Array( 8, 2, 0, 2, 0, 2, 8, 2 ) + [resource] 0/name = "shale" 0/texture = ExtResource( 1 ) @@ -235,7 +238,7 @@ points = PoolVector2Array( 8, 4, 0, 4, 0, 0, 8, 0 ) 2/texture = ExtResource( 1 ) 2/tex_offset = Vector2( 0, 0 ) 2/modulate = Color( 1, 1, 1, 1 ) -2/region = Rect2( 0, 0, 32, 24 ) +2/region = Rect2( 0, 0, 32, 32 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) 2/autotile/tile_size = Vector2( 8, 8 ) @@ -252,3 +255,31 @@ points = PoolVector2Array( 8, 4, 0, 4, 0, 0, 8, 0 ) 2/shape_one_way_margin = 0.0 2/shapes = [ ] 2/z_index = 0 +3/name = "one way" +3/texture = ExtResource( 1 ) +3/tex_offset = Vector2( 0, 0 ) +3/modulate = Color( 1, 1, 1, 1 ) +3/region = Rect2( 0, 8, 8, 8 ) +3/tile_mode = 2 +3/autotile/icon_coordinate = Vector2( 0, 0 ) +3/autotile/tile_size = Vector2( 8, 8 ) +3/autotile/spacing = 0 +3/autotile/occluder_map = [ ] +3/autotile/navpoly_map = [ ] +3/autotile/priority_map = [ ] +3/autotile/z_index_map = [ ] +3/occluder_offset = Vector2( 0, 0 ) +3/navigation_offset = Vector2( 0, 0 ) +3/shape_offset = Vector2( 0, 0 ) +3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +3/shape = SubResource( 21 ) +3/shape_one_way = true +3/shape_one_way_margin = 1.0 +3/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": true, +"one_way_margin": 1.0, +"shape": SubResource( 21 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +3/z_index = 0