From bfb8b5b7fdb1bb193c21f6c31769c8bb50df2bd9 Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 24 Feb 2025 22:03:01 +0100 Subject: [PATCH] =?UTF-8?q?la=20porte=20de=20la=20boulangerie=20est=20r?= =?UTF-8?q?=C3=A9par=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bonne nuit --- assest/tilesets/exterieur.tres | 12 ++++++++---- buildings/bakery.tscn | 2 +- caracters/player/player.tscn | 3 +-- maps/world.tscn | 7 +++---- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/assest/tilesets/exterieur.tres b/assest/tilesets/exterieur.tres index 9296dff..0ba4d8f 100644 --- a/assest/tilesets/exterieur.tres +++ b/assest/tilesets/exterieur.tres @@ -50666,14 +50666,17 @@ texture_region_size = Vector2i(48, 48) 4:137/0 = 0 4:137/0/physics_layer_0/polygon_0/points = PackedVector2Array(-24, -24, 24, -24, 24, 24, -24, 24) 5:137/0 = 0 -5:137/0/physics_layer_0/polygon_0/points = PackedVector2Array(24, -24, -24, -24, -24.5833, 27, 1.91667, 25.6667, 0.75, 24, 0.916666, 6.33333, 24, 6.83333) +5:137/0/physics_layer_0/polygon_0/points = PackedVector2Array(-24, -24, 24, -24, 24, 4.33334, 4.16666, 4, 3.08333, 24, -24, 24) +5:137/0/physics_layer_1/polygon_0/points = PackedVector2Array(-24, -24, 24, -24, 24, 24, -24, 24) 6:137/0 = 0 -6:137/0/physics_layer_0/polygon_0/points = PackedVector2Array(-24, -24, 24, -24, 24.5833, 27, 24, 6.5, -24, 6.83333) +6:137/0/physics_layer_0/polygon_0/points = PackedVector2Array(-24, -24, 24, -24, 24, 4.66667, -24, 3.66667) 6:137/0/physics_layer_1/polygon_0/points = PackedVector2Array(-24, -24, 24, -24, 24, 24, -24, 24) 7:137/0 = 0 -7:137/0/physics_layer_0/polygon_0/points = PackedVector2Array(-24, -24, 24, -24, 24.5833, 27, -1.91667, 25.6667, -0.75, 24, -0.916666, 6.33333, -24, 6.83333) +7:137/0/physics_layer_0/polygon_0/points = PackedVector2Array(24, -24, -24, -24, -24, 4.33334, -4.16666, 4, -3.08333, 24, 24, 24) +7:137/0/physics_layer_1/polygon_0/points = PackedVector2Array(-24, -24, 24, -24, 24, 24, -24, 24) 8:137/0 = 0 -8:137/0/physics_layer_0/polygon_0/points = PackedVector2Array(-24, -24, 24, -24, 24.5833, 27, -1.91667, 25.6667, -0.75, 24, -0.916666, 6.33333, -24, 6.83333) +8:137/0/physics_layer_0/polygon_0/points = PackedVector2Array(24, -24, -24, -24, -24, 4.33334, -4.16666, 4, -3.08333, 24, 24, 24) +8:137/0/physics_layer_1/polygon_0/points = PackedVector2Array(-24, -24, 24, -24, 24, 24, -24, 24) 10:137/0 = 0 11:137/0 = 0 11:137/0/physics_layer_0/polygon_0/points = PackedVector2Array(-24, -24, 24, -24, 24, 24, -24, 24) @@ -57240,6 +57243,7 @@ texture_region_size = Vector2i(48, 48) tile_size = Vector2i(48, 48) physics_layer_0/collision_layer = 1 physics_layer_1/collision_layer = 4 +physics_layer_1/collision_mask = 4 sources/2 = SubResource("TileSetAtlasSource_p8can") sources/3 = SubResource("TileSetAtlasSource_sd7ui") sources/4 = SubResource("TileSetAtlasSource_g6hoh") diff --git a/buildings/bakery.tscn b/buildings/bakery.tscn index 9fe7c1b..2ee2934 100644 --- a/buildings/bakery.tscn +++ b/buildings/bakery.tscn @@ -4,7 +4,7 @@ [node name="boulangerie" type="TileMapLayer"] position = Vector2(160, -96) -tile_map_data = PackedByteArray("AAD8//3/BgABAIcAAAD8//7/BgABAIgAAAD8////BgABAIkAAAD9//z/BgACAHIAAAD9//3/BgACAIcAAAD9//7/BgACAIgAAAD9////BgACAIkAAAD+//v/BgADAHEAAAD+//z/BgADAHIAAAD+//3/BgADAIcAAAD+//7/BgADAIgAAAD+////BgADAIkAAAD///v/BgAEAHEAAAD///z/BgAEAHIAAAD///3/BgAEAIcAAAD///7/BgAEAIgAAAD/////BgAEAIkAAAAAAPv/BgAFAHEAAAAAAPz/BgAFAHIAAAAAAP3/BgAFAIcAAAAAAP7/BgAFAIgAAAAAAP//BgAFAIkAAAABAPz/BgAGAHIAAAABAP3/BgAGAIcAAAABAP7/BgAGAIgAAAABAP//BgAGAIkAAAACAP3/BgAHAIcAAAACAP7/BgAHAIgAAAACAP//BgAHAIkAAAD8//n/BgABAG8AAAD8//r/BgABAHAAAAD8//v/BgABAHEAAAD8//z/BgABAHIAAAD9//n/BgACAG8AAAD9//r/BgACAHAAAAD9//v/BgACAHEAAAD+//n/BgADAG8AAAD+//r/BgADAHAAAAD///n/BgAEAG8AAAD///r/BgAEAHAAAAAAAPn/BgAFAG8AAAAAAPr/BgAFAHAAAAABAPn/BgAGAG8AAAABAPr/BgAGAHAAAAABAPv/BgAGAHEAAAACAPn/BgAHAG8AAAACAPr/BgAHAHAAAAACAPv/BgAHAHEAAAACAPz/BgAHAHIAAAA=") +tile_map_data = PackedByteArray("AAD8//n/BgABAG8AAAD8//r/BgABAHAAAAD8//v/BgABAHEAAAD8//z/BgABAHIAAAD8//3/BgABAIcAAAD8//7/BgABAIgAAAD8////BgABAIkAAAD9//n/BgACAG8AAAD9//r/BgACAHAAAAD9//v/BgACAHEAAAD9//z/BgACAHIAAAD9//3/BgACAIcAAAD9//7/BgACAIgAAAD9////BgACAIkAAAD+//n/BgADAG8AAAD+//r/BgADAHAAAAD+//v/BgADAHEAAAD+//z/BgADAHIAAAD+//3/BgADAIcAAAD+//7/BgADAIgAAAD+////BgADAIkAAAD///n/BgAEAG8AAAD///r/BgAEAHAAAAD///v/BgAEAHEAAAD///z/BgAEAHIAAAD///3/BgAEAIcAAAD///7/BgAEAIgAAAD/////BgAEAIkAAAAAAPn/BgAFAG8AAAAAAPr/BgAFAHAAAAAAAPv/BgAFAHEAAAAAAPz/BgAFAHIAAAAAAP3/BgAFAIcAAAAAAP7/BgAFAIgAAAAAAP//BgAFAIkAAAABAPn/BgAGAG8AAAABAPr/BgAGAHAAAAABAPv/BgAGAHEAAAABAPz/BgAGAHIAAAABAP3/BgAGAIcAAAABAP7/BgAGAIgAAAABAP//BgAGAIkAAAACAPn/BgAHAG8AAAACAPr/BgAHAHAAAAACAPv/BgAHAHEAAAACAPz/BgAHAHIAAAACAP3/BgAHAIcAAAACAP7/BgAHAIgAAAACAP//BgAHAIkAAAA=") tile_set = ExtResource("1_5ugra") [node name="toit" type="TileMapLayer" parent="."] diff --git a/caracters/player/player.tscn b/caracters/player/player.tscn index 2317d2d..8bb7030 100644 --- a/caracters/player/player.tscn +++ b/caracters/player/player.tscn @@ -13,7 +13,6 @@ height = 48.0 [sub_resource type="AnimationNodeTimeScale" id="AnimationNodeTimeScale_85jde"] [sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_iwsa7"] -graph_offset = Vector2(0, -54) nodes/HumanState/node = ExtResource("3_1y7fn") nodes/HumanState/position = Vector2(133.333, 120) nodes/TimeScale/node = SubResource("AnimationNodeTimeScale_85jde") @@ -47,7 +46,7 @@ anim_player = NodePath("../AnimationPlayer") parameters/HumanState/grabing/blend_position = Vector2(0, 0) parameters/HumanState/idling/blend_position = Vector2(0, 0) parameters/HumanState/walking/blend_position = Vector2(0, 0) -parameters/TimeScale/scale = 1.55 +parameters/TimeScale/scale = 1.0 [node name="AnimationPlayer" parent="." instance=ExtResource("3_c286j")] diff --git a/maps/world.tscn b/maps/world.tscn index b0b68c3..304704a 100644 --- a/maps/world.tscn +++ b/maps/world.tscn @@ -24,10 +24,6 @@ tile_set = ExtResource("1_s310m") [node name="immeuble1" parent="maisons" instance=ExtResource("2_cfh67")] -[node name="boulangerie" parent="maisons" instance=ExtResource("3_tn4jn")] -position = Vector2(-177, -100) -tile_map_data = PackedByteArray("AAD8//3/BgABAIcAAAD8//7/BgABAIgAAAD8////BgABAIkAAAD9//z/BgACAHIAAAD9//3/BgACAIcAAAD9//7/BgACAIgAAAD9////BgACAIkAAAD+//v/BgADAHEAAAD+//z/BgADAHIAAAD+//3/BgADAIcAAAD+//7/BgADAIgAAAD+////BgADAIkAAAD///v/BgAEAHEAAAD///z/BgAEAHIAAAD///3/BgAEAIcAAAD///7/BgAEAIgAAAD/////BgAEAIkAAAAAAPv/BgAFAHEAAAAAAPz/BgAFAHIAAAAAAP3/BgAFAIcAAAAAAP7/BgAFAIgAAAAAAP//BgAFAIkAAAABAPz/BgAGAHIAAAABAP3/BgAGAIcAAAABAP7/BgAGAIgAAAABAP//BgAGAIkAAAACAP3/BgAHAIcAAAACAP7/BgAHAIgAAAACAP//BgAHAIkAAAD8//n/BgABAG8AAAD8//r/BgABAHAAAAD8//v/BgABAHEAAAD8//z/BgABAHIAAAD9//n/BgACAG8AAAD9//r/BgACAHAAAAD9//v/BgACAHEAAAD+//n/BgADAG8AAAD+//r/BgADAHAAAAD///n/BgAEAG8AAAD///r/BgAEAHAAAAAAAPn/BgAFAG8AAAAAAPr/BgAFAHAAAAABAPn/BgAGAG8AAAABAPr/BgAGAHAAAAABAPv/BgAGAHEAAAACAPn/BgAHAG8AAAACAPr/BgAHAHAAAAACAPv/BgAHAHEAAAACAPz/BgAHAHIAAAD///f/AwAnAAAAAAD///j/AwAnAAEAAAAAAPf/AwAoAAAAAAAAAPj/AwAoAAEAAAA=") - [node name="TileMapLayer" type="TileMapLayer" parent="maisons"] position = Vector2(113, -273) tile_map_data = PackedByteArray("AAD+//r/BQAXAGgAAAD+//v/BQAXAGkAAAD+//z/BQAXAGoAAAD+//3/BQAXAGsAAAD+//7/BQAXAGwAAAD+////BQAXAG0AAAD+/wAABQAXAG4AAAD///r/BQAYAGgAAAD///v/BQAYAGkAAAD///z/BQAYAGoAAAD///3/BQAYAGsAAAD///7/BQAYAGwAAAD/////BQAYAG0AAAD//wAABQAYAG4AAAAAAPr/BQAZAGgAAAAAAPv/BQAZAGkAAAAAAPz/BQAZAGoAAAAAAP3/BQAZAGsAAAAAAP7/BQAZAGwAAAAAAP//BQAZAG0AAAAAAAAABQAZAG4AAAABAPr/BQAaAGgAAAABAPv/BQAaAGkAAAABAPz/BQAaAGoAAAABAP3/BQAaAGsAAAABAP7/BQAaAGwAAAABAP//BQAaAG0AAAABAAAABQAaAG4AAAACAPr/BQAbAGgAAAACAPv/BQAbAGkAAAACAPz/BQAbAGoAAAACAP3/BQAbAGsAAAACAP7/BQAbAGwAAAACAP//BQAbAG0AAAACAAAABQAbAG4AAAADAPr/BQAcAGgAAAADAPv/BQAcAGkAAAADAPz/BQAcAGoAAAADAP3/BQAcAGsAAAADAP7/BQAcAGwAAAADAP//BQAcAG0AAAADAAAABQAcAG4AAAA=") @@ -76,3 +72,6 @@ fullStop = false [node name="CollisionShape2D" type="CollisionShape2D" parent="brakeZones/Area2D"] position = Vector2(-9.5, 6) shape = SubResource("RectangleShape2D_keblk") + +[node name="boulangerie" parent="." instance=ExtResource("3_tn4jn")] +position = Vector2(-227, -102)