Merge pull request #10 from 2-shot/justin/navigation

Justin/navigation
2-shot · Sep 7, 2024 · 96e1e47 · 96e1e47
2 parents 2c4627a + 032c8e0
commit 96e1e47
Show file tree

Hide file tree

Showing 23 changed files with 1,510 additions and 1,053 deletions.
diff --git a/Characters/Enemy/EnemyGreenOoze.tscn b/Characters/Enemy/EnemyGreenOoze.tscn
@@ -4,8 +4,9 @@
 [ext_resource type="Texture2D" uid="uid://cgyibdo5bbc4o" path="res://Characters/Art/GreenOoozeAnimations.png" id="2_gujc2"]
 [ext_resource type="Script" path="res://Characters/line_of_sight.gd" id="3_lpnfg"]
 
-[sub_resource type="CircleShape2D" id="CircleShape2D_tje30"]
-radius = 8.06226
+[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_mmf26"]
+radius = 5.0
+height = 18.5
 
 [sub_resource type="Animation" id="Animation_3layy"]
 resource_name = "Idle"
@@ -180,16 +181,16 @@ states/run/position = Vector2(328, 261)
 transitions = ["Start", "idle", SubResource("AnimationNodeStateMachineTransition_on6sh"), "idle", "run", SubResource("AnimationNodeStateMachineTransition_75hwq"), "run", "idle", SubResource("AnimationNodeStateMachineTransition_swycp"), "idle", "eaten_left", SubResource("AnimationNodeStateMachineTransition_chj2c"), "eaten_left", "End", SubResource("AnimationNodeStateMachineTransition_qul8h"), "run", "eaten_left", SubResource("AnimationNodeStateMachineTransition_01n5f"), "idle", "eaten_right", SubResource("AnimationNodeStateMachineTransition_vvhs2"), "eaten_right", "End", SubResource("AnimationNodeStateMachineTransition_h64ga"), "run", "eaten_right", SubResource("AnimationNodeStateMachineTransition_8nv36")]
 graph_offset = Vector2(-41, 3)
 
-[node name="EnemyGreenOoze" type="CharacterBody2D" groups=["Enemy"]]
+[node name="EnemyGreenOoze" type="CharacterBody2D" groups=["Enemy", "navigation"]]
 collision_layer = 5
 motion_mode = 1
 wall_min_slide_angle = 0.0
 script = ExtResource("1_7s7n4")
 
 [node name="Collision" type="CollisionShape2D" parent="."]
-position = Vector2(-1, 3)
+position = Vector2(0, 4)
 rotation = 1.5708
-shape = SubResource("CircleShape2D_tje30")
+shape = SubResource("CapsuleShape2D_mmf26")
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
 scale = Vector2(0.5, 0.5)
@@ -201,6 +202,7 @@ frame = 7
 [node name="NavigationAgent2D" type="NavigationAgent2D" parent="."]
 radius = 16.0
 avoidance_mask = 0
+debug_enabled = true
 
 [node name="Timer" type="Timer" parent="."]
 wait_time = 0.5

diff --git a/Levels/level_01/Level_01.tscn b/Levels/level_01/Level_01.tscn
diff --git a/Levels/level_02/Level_02.tscn b/Levels/level_02/Level_02.tscn
diff --git a/Levels/level_03/Level_03.tscn b/Levels/level_03/Level_03.tscn
diff --git a/Levels/level_04/Level_04.tscn b/Levels/level_04/Level_04.tscn
diff --git a/Levels/level_05/Level_05.tscn b/Levels/level_05/Level_05.tscn
diff --git a/Levels/level_06/Level_06.tscn b/Levels/level_06/Level_06.tscn
diff --git a/Objects/Props/Barrels/Obj_Barrel_01.tscn b/Objects/Props/Barrels/Obj_Barrel_01.tscn
@@ -5,7 +5,7 @@
 [sub_resource type="CircleShape2D" id="CircleShape2D_ifetp"]
 radius = 9.21954
 
-[node name="StaticBody2D" type="StaticBody2D"]
+[node name="StaticBody2D" type="StaticBody2D" groups=["navigation"]]
 y_sort_enabled = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]

diff --git a/Objects/Props/Beds/Obj_Bed_01.tscn b/Objects/Props/Beds/Obj_Bed_01.tscn
@@ -5,7 +5,7 @@
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_1x5br"]
 size = Vector2(32, 43)
 
-[node name="StaticBody2D" type="StaticBody2D"]
+[node name="StaticBody2D" type="StaticBody2D" groups=["navigation"]]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 y_sort_enabled = true

diff --git a/Objects/Props/Book/Obj_Book_01.tscn b/Objects/Props/Book/Obj_Book_01.tscn
@@ -5,7 +5,7 @@
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_1x5br"]
 size = Vector2(12, 16)
 
-[node name="StaticBody2D" type="StaticBody2D"]
+[node name="StaticBody2D" type="StaticBody2D" groups=["navigation"]]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 y_sort_enabled = true

diff --git a/Objects/Props/Bookcases/Obj_Bookcase_01.tscn b/Objects/Props/Bookcases/Obj_Bookcase_01.tscn
@@ -12,7 +12,7 @@ y_sort_enabled = true
 position = Vector2(0, 0.5)
 shape = SubResource("RectangleShape2D_1x5br")
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="." groups=["navigation"]]
 position = Vector2(2.68221e-07, -11)
 scale = Vector2(0.631579, 0.592593)
 texture = ExtResource("1_c1se4")

diff --git a/Objects/Props/Chairs/Obj_Chair_01.tscn b/Objects/Props/Chairs/Obj_Chair_01.tscn
@@ -5,7 +5,7 @@
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_1x5br"]
 size = Vector2(16, 8)
 
-[node name="StaticBody2D" type="StaticBody2D"]
+[node name="StaticBody2D" type="StaticBody2D" groups=["navigation"]]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 y_sort_enabled = true

diff --git a/Objects/Props/Chairs/Obj_Chair_Facing_Left_01.tscn b/Objects/Props/Chairs/Obj_Chair_Facing_Left_01.tscn
@@ -5,7 +5,7 @@
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_1x5br"]
 size = Vector2(16, 16)
 
-[node name="StaticBody2D" type="StaticBody2D"]
+[node name="StaticBody2D" type="StaticBody2D" groups=["navigation"]]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 y_sort_enabled = true

diff --git a/Objects/Props/Chairs/Obj_Chair_Facing_Right_01.tscn b/Objects/Props/Chairs/Obj_Chair_Facing_Right_01.tscn
@@ -5,7 +5,7 @@
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_1x5br"]
 size = Vector2(16, 16)
 
-[node name="StaticBody2D" type="StaticBody2D"]
+[node name="StaticBody2D" type="StaticBody2D" groups=["navigation"]]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 y_sort_enabled = true

diff --git a/Objects/Props/Chests/Obj_Chest_01.tscn b/Objects/Props/Chests/Obj_Chest_01.tscn
@@ -5,7 +5,7 @@
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_1x5br"]
 size = Vector2(32, 8)
 
-[node name="StaticBody2D" type="StaticBody2D"]
+[node name="StaticBody2D" type="StaticBody2D" groups=["navigation"]]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 y_sort_enabled = true

diff --git a/Objects/Props/Crate/Obj_Crate_01.tscn b/Objects/Props/Crate/Obj_Crate_01.tscn
@@ -5,7 +5,7 @@
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_1x5br"]
 size = Vector2(16, 16)
 
-[node name="StaticBody2D" type="StaticBody2D"]
+[node name="StaticBody2D" type="StaticBody2D" groups=["navigation"]]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 y_sort_enabled = true

diff --git a/Objects/Props/Pencil/Obj_Pencil_01.tscn b/Objects/Props/Pencil/Obj_Pencil_01.tscn
@@ -5,7 +5,7 @@
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_1x5br"]
 size = Vector2(6, 34)
 
-[node name="StaticBody2D" type="StaticBody2D"]
+[node name="StaticBody2D" type="StaticBody2D" groups=["navigation"]]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 y_sort_enabled = true

diff --git a/Objects/Props/Pillars/Obj_Pillar_01.tscn b/Objects/Props/Pillars/Obj_Pillar_01.tscn
@@ -5,7 +5,7 @@
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_1x5br"]
 size = Vector2(16, 8)
 
-[node name="StaticBody2D" type="StaticBody2D"]
+[node name="StaticBody2D" type="StaticBody2D" groups=["navigation"]]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 y_sort_enabled = true

diff --git a/Objects/Props/Tables/Obj_Table_01.tscn b/Objects/Props/Tables/Obj_Table_01.tscn
@@ -5,7 +5,7 @@
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_1x5br"]
 size = Vector2(32, 28)
 
-[node name="StaticBody2D" type="StaticBody2D"]
+[node name="StaticBody2D" type="StaticBody2D" groups=["navigation"]]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 y_sort_enabled = true

diff --git a/Objects/Props/Tables/Obj_Table_02.tscn b/Objects/Props/Tables/Obj_Table_02.tscn
@@ -5,7 +5,7 @@
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_1x5br"]
 size = Vector2(32, 22)
 
-[node name="StaticBody2D" type="StaticBody2D"]
+[node name="StaticBody2D" type="StaticBody2D" groups=["navigation"]]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 y_sort_enabled = true