From fbe731136f2ccf6fed8c5b457288df498c6f2d70 Mon Sep 17 00:00:00 2001
From: vaporvee <yannik@vaporvee.com>
Date: Wed, 1 Mar 2023 18:57:37 +0100
Subject: [PATCH] fixed collision issues

---
 scenes/base_npc.tscn               | 2 ++
 scenes/overworld.tscn              | 3 ++-
 scenes/player.tscn                 | 1 -
 scenes/tiles/3d_cube_tile.tscn     | 1 +
 scenes/tiles/cupcake.tscn          | 1 +
 scenes/tiles/enemies/slime.tscn    | 3 +--
 scenes/tiles/sound_debug_tile.tscn | 1 +
 7 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/scenes/base_npc.tscn b/scenes/base_npc.tscn
index a0eb9f2..9a3da40 100644
--- a/scenes/base_npc.tscn
+++ b/scenes/base_npc.tscn
@@ -91,6 +91,8 @@ height = 55.9998
 size = Vector2(54, 71)
 
 [node name="base_npc" type="CharacterBody2D"]
+collision_mask = 0
+collision_priority = 15.0
 
 [node name="animated_sprite_2d" type="AnimatedSprite2D" parent="."]
 sprite_frames = SubResource("SpriteFrames_rr6ht")
diff --git a/scenes/overworld.tscn b/scenes/overworld.tscn
index db8c8d7..9dcccec 100644
--- a/scenes/overworld.tscn
+++ b/scenes/overworld.tscn
@@ -65,7 +65,8 @@ position = Vector2(-131, 147)
 metadata/_edit_lock_ = true
 
 [node name="world_border" type="StaticBody2D" parent="."]
-collision_priority = 3.0
+collision_mask = 0
+collision_priority = 20.0
 metadata/_edit_lock_ = true
 
 [node name="collision_shape_2d" type="CollisionShape2D" parent="world_border"]
diff --git a/scenes/player.tscn b/scenes/player.tscn
index 01e84e0..5942087 100644
--- a/scenes/player.tscn
+++ b/scenes/player.tscn
@@ -85,7 +85,6 @@ animations = [{
 }]
 
 [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_38v5o"]
-radius = 10.0
 height = 54.0
 
 [node name="player" type="CharacterBody2D"]
diff --git a/scenes/tiles/3d_cube_tile.tscn b/scenes/tiles/3d_cube_tile.tscn
index e9084be..ec6797c 100644
--- a/scenes/tiles/3d_cube_tile.tscn
+++ b/scenes/tiles/3d_cube_tile.tscn
@@ -22,6 +22,7 @@ pass
 
 [node name="static_body_2d" type="StaticBody2D" parent="."]
 position = Vector2(0, 1)
+collision_priority = 20.0
 
 [node name="collision_shape_2d" type="CollisionShape2D" parent="static_body_2d"]
 position = Vector2(1, -2)
diff --git a/scenes/tiles/cupcake.tscn b/scenes/tiles/cupcake.tscn
index bb32af4..c3f4fba 100644
--- a/scenes/tiles/cupcake.tscn
+++ b/scenes/tiles/cupcake.tscn
@@ -6,6 +6,7 @@
 size = Vector2(64, 14.625)
 
 [node name="dialogdebug_cupcake" type="StaticBody2D"]
+collision_priority = 20.0
 metadata/_edit_lock_ = true
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
diff --git a/scenes/tiles/enemies/slime.tscn b/scenes/tiles/enemies/slime.tscn
index 4c9013e..0c33e54 100644
--- a/scenes/tiles/enemies/slime.tscn
+++ b/scenes/tiles/enemies/slime.tscn
@@ -39,10 +39,9 @@ animations = [{
 radius = 9.0
 height = 46.0
 
-[node name="slime" type="CharacterBody2D"]
+[node name="slime" type="CharacterBody2D" groups=["enemies"]]
 collision_layer = 8
 collision_mask = 9
-collision_priority = 20.0
 motion_mode = 1
 floor_stop_on_slope = false
 floor_constant_speed = true
diff --git a/scenes/tiles/sound_debug_tile.tscn b/scenes/tiles/sound_debug_tile.tscn
index 8e7cb28..37dc8e5 100644
--- a/scenes/tiles/sound_debug_tile.tscn
+++ b/scenes/tiles/sound_debug_tile.tscn
@@ -22,6 +22,7 @@ func OnAudioFinished():
 radius = 30.8058
 
 [node name="sound_debug_tile" type="StaticBody2D"]
+collision_priority = 20.0
 script = SubResource("GDScript_krkfl")
 soundOn = false