diff options
Diffstat (limited to 'Assets/Map')
| -rw-r--r-- | Assets/Map/TileMapLayer.tscn | 31 | ||||
| -rw-r--r-- | Assets/Map/tile_map_layer.gd | 2 | ||||
| -rw-r--r-- | Assets/Map/tileset.png | bin | 38805 -> 40520 bytes | |||
| -rw-r--r-- | Assets/Map/tileset.png~ | bin | 38849 -> 40529 bytes |
4 files changed, 31 insertions, 2 deletions
diff --git a/Assets/Map/TileMapLayer.tscn b/Assets/Map/TileMapLayer.tscn index 8057950..f304f16 100644 --- a/Assets/Map/TileMapLayer.tscn +++ b/Assets/Map/TileMapLayer.tscn @@ -1,8 +1,11 @@ -[gd_scene load_steps=5 format=3 uid="uid://b1si77qfmut5x"] +[gd_scene load_steps=6 format=3 uid="uid://b1si77qfmut5x"] [ext_resource type="Texture2D" uid="uid://mcgvpb1lh3ve" path="res://Assets/Map/tileset.png" id="1_odmhe"] [ext_resource type="Script" path="res://Assets/Map/tile_map_layer.gd" id="2_qi2a0"] +[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_3qgmv"] +friction = 0.0 + [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_iu5yc"] texture = ExtResource("1_odmhe") margins = Vector2i(1, 1) @@ -331,6 +334,7 @@ separation = Vector2i(2, 2) 13:11/0 = 0 14:11/0 = 0 15:11/0 = 0 +15:11/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, -8, 8, 8, 8, 8, -8) 16:11/0 = 0 17:11/0 = 0 18:11/0 = 0 @@ -475,10 +479,35 @@ separation = Vector2i(2, 2) 29:15/0 = 0 30:15/0 = 0 31:15/0 = 0 +22:7/animation_frame_0/duration = 0.5 +22:7/animation_frame_1/duration = 0.5 +22:7/0 = 0 +22:7/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, 5, 8, 5, 8, 8, -8, 8) +24:7/animation_frame_0/duration = 0.5 +24:7/animation_frame_1/duration = 0.5 +24:7/0 = 0 +24:7/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, 5, 8, 5, 8, 8, -8, 8) +18:8/0 = 0 +18:8/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, -8, 8, 8, 8, 8, -8) +22:6/animation_frame_0/duration = 0.5 +22:6/animation_frame_1/duration = 0.5 +22:6/0 = 0 +22:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, 8, 8, 8, 8, -8, -8, -8) +24:6/animation_frame_0/duration = 0.5 +24:6/animation_frame_1/duration = 0.5 +24:6/0 = 0 +24:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, -8, 8, 8, 8, 8, -8) +26:6/animation_frame_0/duration = 0.5 +26:6/animation_frame_1/duration = 0.5 +26:6/0 = 0 +26:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, -8, 8, 8, 8, 8, -8) [sub_resource type="TileSet" id="TileSet_8jo18"] physics_layer_0/collision_layer = 16 physics_layer_0/collision_mask = 0 +physics_layer_1/collision_layer = 128 +physics_layer_1/collision_mask = 0 +physics_layer_1/physics_material = SubResource("PhysicsMaterial_3qgmv") sources/0 = SubResource("TileSetAtlasSource_iu5yc") [node name="TileMapLayer" type="TileMapLayer"] diff --git a/Assets/Map/tile_map_layer.gd b/Assets/Map/tile_map_layer.gd index 47e9c33..b61d954 100644 --- a/Assets/Map/tile_map_layer.gd +++ b/Assets/Map/tile_map_layer.gd @@ -6,5 +6,5 @@ func get_wall_limits(): "top": (get_used_rect().position.y + 1) * tile_set.tile_size.y, "bottom": (get_used_rect().position.y + get_used_rect().size.y + 1) * tile_set.tile_size.y, "left": (get_used_rect().position.x + 1) * tile_set.tile_size.x, - "right": (get_used_rect().position.x + get_used_rect().size.x + 1) * tile_set.tile_size.x, + "right": (get_used_rect().position.x + get_used_rect().size.x - 1) * tile_set.tile_size.x, } diff --git a/Assets/Map/tileset.png b/Assets/Map/tileset.png Binary files differindex cd85a12..ee740c1 100644 --- a/Assets/Map/tileset.png +++ b/Assets/Map/tileset.png diff --git a/Assets/Map/tileset.png~ b/Assets/Map/tileset.png~ Binary files differindex 7cbee38..abbf411 100644 --- a/Assets/Map/tileset.png~ +++ b/Assets/Map/tileset.png~ |
