From 49e2030c06281d4ecdffcaa9a2e92286dfd13dad Mon Sep 17 00:00:00 2001 From: Dustin Date: Thu, 12 Jun 2025 22:08:06 -0700 Subject: [PATCH] Ladder fix. --- .../LegacyFantasy-High_Forest/tileset.tres | 36 ++++++++++++++----- project.godot | 3 +- src/actors/players/playerE/PlayerE.tscn | 6 ++-- src/levels/TC_05.tscn | 8 ++--- 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/assets/levels/LegacyFantasy-High_Forest/tileset.tres b/assets/levels/LegacyFantasy-High_Forest/tileset.tres index e4a135a..5464659 100644 --- a/assets/levels/LegacyFantasy-High_Forest/tileset.tres +++ b/assets/levels/LegacyFantasy-High_Forest/tileset.tres @@ -1,4 +1,4 @@ -[gd_resource type="TileSet" load_steps=24 format=2] +[gd_resource type="TileSet" load_steps=26 format=2] [ext_resource path="res://assets/levels/LegacyFantasy-High_Forest/Tiles/Tiles.png" type="Texture" id=1] @@ -62,10 +62,16 @@ points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) [sub_resource type="ConvexPolygonShape2D" id=20] points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) -[sub_resource type="ConvexPolygonShape2D" id=21] +[sub_resource type="ConvexPolygonShape2D" id=22] points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) -[sub_resource type="ConvexPolygonShape2D" id=22] +[sub_resource type="ConvexPolygonShape2D" id=23] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=24] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=25] points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) [resource] @@ -320,16 +326,28 @@ points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) "shape": SubResource( 20 ), "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) }, { -"autotile_coord": Vector2( 2, 2 ), -"one_way": true, -"one_way_margin": 1.0, -"shape": SubResource( 21 ), -"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) -}, { "autotile_coord": Vector2( 3, 2 ), "one_way": true, "one_way_margin": 1.0, "shape": SubResource( 22 ), "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 2, 2 ), +"one_way": true, +"one_way_margin": 1.0, +"shape": SubResource( 23 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 0, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 24 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 4, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 25 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) } ] 5/z_index = 0 diff --git a/project.godot b/project.godot index 356237d..8bd23ab 100644 --- a/project.godot +++ b/project.godot @@ -422,7 +422,8 @@ dash_2={ 2d_physics/layer_6="EnemyHurtbox" 2d_physics/layer_7="PlayerHitbox" 2d_physics/layer_8="EnemyHitbox" -2d_physics/layer_9="World-OneWay" +2d_physics/layer_9="CameraBounds" +2d_physics/layer_10="World-OneWay" 2d_physics/layer_11="Climbable" common/enable_pause_aware_picking=true 2d/default_gravity=600 diff --git a/src/actors/players/playerE/PlayerE.tscn b/src/actors/players/playerE/PlayerE.tscn index fe900c5..00a2b51 100644 --- a/src/actors/players/playerE/PlayerE.tscn +++ b/src/actors/players/playerE/PlayerE.tscn @@ -94,7 +94,7 @@ extents = Vector2( 9, 15 ) extents = Vector2( 4, 3 ) [node name="PlayerE" instance=ExtResource( 1 )] -collision_mask = 257 +collision_mask = 513 script = ExtResource( 3 ) actor_type = "Player" player_number = 1 @@ -106,7 +106,7 @@ states = [ ExtResource( 4 ), ExtResource( 9 ), ExtResource( 7 ), ExtResource( 8 [node name="AnimatedSprite_StateReceiver" parent="." index="1"] frames = ExtResource( 2 ) -animation = "jump" +animation = "climb" script = ExtResource( 5 ) __meta__ = { "_aseprite_wizard_config_": { @@ -162,7 +162,7 @@ cast_to = Vector2( -5, -14 ) unique_name_in_owner = true modulate = Color( 0, 1, 0, 1 ) enabled = true -cast_to = Vector2( 1.36422e-12, 20 ) +cast_to = Vector2( 1.36422e-12, 16 ) collision_mask = 1024 collide_with_areas = true collide_with_bodies = false diff --git a/src/levels/TC_05.tscn b/src/levels/TC_05.tscn index 3c0d037..f8576a5 100644 --- a/src/levels/TC_05.tscn +++ b/src/levels/TC_05.tscn @@ -18,10 +18,10 @@ z_index = -2 tile_set = ExtResource( 2 ) cell_size = Vector2( 16, 16 ) show_collision = true -collision_layer = 256 -collision_mask = 256 +collision_layer = 512 +collision_mask = 0 format = 1 -tile_data = PoolIntArray( 65540, 5, 0, 65544, 5, 4, 65548, 5, 0, 65552, 5, 4, 131076, 5, 65536, 131077, 5, 65537, 131078, 5, 65538, 131079, 5, 65539, 131080, 5, 65540, 131084, 5, 65536, 131085, 5, 65537, 131086, 5, 65538, 131087, 5, 65539, 131088, 5, 65540, 196612, 5, 131072, 196613, 5, 131073, 196614, 5, 131074, 196615, 5, 131075, 196616, 5, 131076, 196620, 5, 131072, 196621, 5, 131073, 196622, 5, 131074, 196623, 5, 131075, 196624, 5, 131076, 262152, 5, 0, 262156, 5, 4, 327688, 5, 65536, 327689, 5, 65537, 327690, 5, 65538, 327691, 5, 65539, 327692, 5, 65540, 393224, 5, 131072, 393225, 5, 131073, 393226, 5, 131074, 393227, 5, 131075, 393228, 5, 131076 ) +tile_data = PoolIntArray( 65540, 5, 0, 65544, 5, 4, 65548, 5, 0, 65552, 5, 4, 131076, 5, 65536, 131077, 5, 65537, 131078, 5, 65538, 131079, 5, 65539, 131080, 5, 65540, 131084, 5, 65536, 131085, 5, 65537, 131086, 5, 65538, 131087, 5, 65539, 131088, 5, 65540, 196612, 5, 131072, 196613, 5, 131073, 196614, 5, 131074, 196615, 5, 131075, 196616, 5, 131076, 196620, 5, 131072, 196621, 5, 131073, 196622, 5, 131074, 196623, 5, 131075, 196624, 5, 131076, 262152, 5, 0, 262156, 5, 4, 327688, 5, 65536, 327689, 5, 65537, 327690, 5, 65538, 327691, 5, 65539, 327692, 5, 65540, 393225, 5, 131073, 393226, 5, 131074, 393227, 5, 131075 ) [node name="TileMap Background" parent="." index="1"] z_index = -2 @@ -73,7 +73,7 @@ __meta__ = { } [node name="Camera Bounds" parent="." index="9"] -tile_data = PoolIntArray( -65536, 0, 0, -65521, 0, 0, 65535, 0, 0, 16, 0, 0, 524287, 0, 0, 458768, 0, 0, 589824, 0, 0, 589839, 0, 0 ) +tile_data = PoolIntArray( -65536, 0, 0, -65521, 0, 0, 65535, 0, 0, 16, 0, 0, 589823, 0, 0, 524304, 0, 0, 589824, 0, 0, 589839, 0, 0 ) [node name="Label" type="Label" parent="." index="10"] margin_left = 78.0