Fix enemy scene setups

Zennysoft.Game.Ma/src/enemy/NavigationAgentClient.tscn

@@ -7,6 +7,7 @@ script = ExtResource("1_qwonp")
 
 [node name="NavAgent" type="NavigationAgent3D" parent="."]
 unique_name_in_owner = true
+target_desired_distance = 2.0
 path_max_distance = 3.01
 avoidance_enabled = true
 radius = 1.5

Zennysoft.Game.Ma/src/enemy/enemy_types/05. ballos/Ballos.tscn

@@ -15,11 +15,11 @@ MaxAttack = 20
 MaxDefense = 1
 ExpFromDefeat = 50
 Luck = 0.05
-TelluricResistance = 0.0
+_telluricResistance = 0.0
-AeolicResistance = 0.0
+_aeolicResistance = 0.0
-HydricResistance = 0.0
+_hydricResistance = 0.0
-IgneousResistance = 0.0
+_igneousResistance = 0.0
-FerrumResistance = 0.0
+_ferrumResistance = 0.0
 DropsSoulGemChance = 0.75
 metadata/_custom_type_script = "uid://dnkmr0eq1sij0"
 

Zennysoft.Game.Ma/src/enemy/enemy_types/07. chinthe/Chinthe.cs

@@ -35,7 +35,7 @@ public partial class Chinthe : Enemy, IHasPrimaryAttack, ICanPatrol, ICanActivat
     if (_enemyLogic.Value is not EnemyLogic.State.Activated)
       return;
 
-    if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer && GlobalPosition.DistanceTo(_player.CurrentPosition) < 2.5f)
+    if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer && GlobalPosition.DistanceTo(_player.CurrentPosition) < 4.5f)
       _enemyLogic.Input(new EnemyLogic.Input.StartAttacking());
     if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer && GlobalPosition.DistanceTo(_player.CurrentPosition) > 45f)
       _enemyLogic.Input(new EnemyLogic.Input.LostPlayer());
@@ -43,8 +43,6 @@ public partial class Chinthe : Enemy, IHasPrimaryAttack, ICanPatrol, ICanActivat
       _enemyLogic.Input(new EnemyLogic.Input.Alerted());
 
     _navigationAgentClient.CalculateVelocity(GlobalPosition, EnemyModelView.CanMove);
-
-    base._PhysicsProcess(delta);
   }
 
   public override void Die()

Zennysoft.Game.Ma/src/enemy/enemy_types/07. chinthe/Chinthe.tscn

@@ -67,6 +67,8 @@ autostart = true
 unique_name_in_owner = true
 target_position = Vector3(0, 0, -5)
 collision_mask = 3
+debug_shape_custom_color = Color(0.60023, 7.84531e-06, 0.405364, 1)
+debug_shape_thickness = 5
 
 [node name="EnemyModelView" parent="." instance=ExtResource("3_ncr2e")]
 unique_name_in_owner = true

Zennysoft.Game.Ma/src/enemy/enemy_types/09. Agi/AgiDemon.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=7 format=3 uid="uid://b8ewfgcjv60es"]
+[gd_scene load_steps=8 format=3 uid="uid://b8ewfgcjv60es"]
 
 [ext_resource type="Script" uid="uid://h6duv685n6eh" path="res://src/enemy/enemy_types/09. Agi/AgiDemon.cs" id="1_56f32"]
 [ext_resource type="Resource" uid="uid://2lflwab43lb0" path="res://src/enemy/enemy_types/09. Agi/AgiDemonStats.tres" id="2_qec65"]
 [ext_resource type="PackedScene" uid="uid://bls3mcsyld4vy" path="res://src/enemy/enemy_types/09. Agi/AgiDemonModelView.tscn" id="3_703e7"]
+[ext_resource type="PackedScene" uid="uid://pbnsngx5jvrh" path="res://src/enemy/NavigationAgentClient.tscn" id="4_uaeav"]
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_cwfph"]
 radius = 0.226425
@@ -26,18 +27,11 @@ PrimaryAttackElementalType = 4
 SecondaryAttackElementalType = 4
 _enemyStatResource = ExtResource("2_qec65")
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+[node name="CollisionShape" type="CollisionShape3D" parent="."]
+unique_name_in_owner = true
 transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0)
 shape = SubResource("CapsuleShape3D_cwfph")
 
-[node name="NavAgent" type="NavigationAgent3D" parent="."]
-unique_name_in_owner = true
-path_max_distance = 3.01
-simplify_path = true
-avoidance_enabled = true
-radius = 2.0
-debug_path_custom_color = Color(1, 0, 0, 1)
-
 [node name="LineOfSight" type="Area3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0)
@@ -71,3 +65,7 @@ collision_mask = 0
 shape = SubResource("SphereShape3D_8vcnq")
 
 [node name="EnemyModelView" parent="." instance=ExtResource("3_703e7")]
+unique_name_in_owner = true
+
+[node name="NavigationAgentClient" parent="." instance=ExtResource("4_uaeav")]
+unique_name_in_owner = true

Zennysoft.Game.Ma/src/enemy/enemy_types/9b. Aqueos Demon/AqueosDemon.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=8 format=3 uid="uid://dpq17ej06uah1"]
+[gd_scene load_steps=9 format=3 uid="uid://dpq17ej06uah1"]
 
 [ext_resource type="Script" uid="uid://h6duv685n6eh" path="res://src/enemy/enemy_types/09. Agi/AgiDemon.cs" id="1_wbopj"]
 [ext_resource type="PackedScene" uid="uid://cu7n814hhtjwm" path="res://src/enemy/enemy_types/9b. Aqueos Demon/AqueosModelView.tscn" id="2_0hbxv"]
 [ext_resource type="Script" uid="uid://dnkmr0eq1sij0" path="res://src/enemy/EnemyStatResource.cs" id="2_wtipe"]
+[ext_resource type="PackedScene" uid="uid://pbnsngx5jvrh" path="res://src/enemy/NavigationAgentClient.tscn" id="4_m7ocm"]
 
 [sub_resource type="Resource" id="Resource_m7ocm"]
 script = ExtResource("2_wtipe")
@@ -47,18 +48,11 @@ SecondaryAttackElementalDamageBonus = null
 _enemyStatResource = SubResource("Resource_m7ocm")
 _movementSpeed = null
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+[node name="CollisionShape" type="CollisionShape3D" parent="."]
+unique_name_in_owner = true
 transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0)
 shape = SubResource("CapsuleShape3D_cwfph")
 
-[node name="NavAgent" type="NavigationAgent3D" parent="."]
-unique_name_in_owner = true
-path_max_distance = 3.01
-simplify_path = true
-avoidance_enabled = true
-radius = 2.0
-debug_path_custom_color = Color(1, 0, 0, 1)
-
 [node name="LineOfSight" type="Area3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0)
@@ -93,3 +87,6 @@ shape = SubResource("SphereShape3D_8vcnq")
 
 [node name="EnemyModelView" parent="." instance=ExtResource("2_0hbxv")]
 unique_name_in_owner = true
+
+[node name="NavigationAgentClient" parent="." instance=ExtResource("4_m7ocm")]
+unique_name_in_owner = true

Zennysoft.Game.Ma/src/enemy/state/EnemyLogic.g.puml

@@ -1,14 +1,14 @@
 @startuml EnemyLogic
 state "EnemyLogic State" as Zennysoft_Game_Ma_EnemyLogic_State {
+  state "Defeated" as Zennysoft_Game_Ma_EnemyLogic_State_Defeated
   state "Alive" as Zennysoft_Game_Ma_EnemyLogic_State_Alive {
     state "Activated" as Zennysoft_Game_Ma_EnemyLogic_State_Activated {
-      state "Attacking" as Zennysoft_Game_Ma_EnemyLogic_State_Attacking
       state "FollowPlayer" as Zennysoft_Game_Ma_EnemyLogic_State_FollowPlayer
+      state "Attacking" as Zennysoft_Game_Ma_EnemyLogic_State_Attacking
       state "Patrolling" as Zennysoft_Game_Ma_EnemyLogic_State_Patrolling
     }
     state "Idle" as Zennysoft_Game_Ma_EnemyLogic_State_Idle
   }
-  state "Defeated" as Zennysoft_Game_Ma_EnemyLogic_State_Defeated
 }
 
 Zennysoft_Game_Ma_EnemyLogic_State_Alive --> Zennysoft_Game_Ma_EnemyLogic_State_Attacking : AttackTimer

Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/03. Antechamber A.tscn

@@ -15,8 +15,8 @@
 [ext_resource type="Texture2D" uid="uid://db27h0ufbt5co" path="res://src/map/dungeon/models/Set A/03. Antechamber A/ANTECHAMBER_TYPE1_VER2_hand-tiile.png" id="13_tv8gm"]
 [ext_resource type="Texture2D" uid="uid://chq4yvuxw0err" path="res://src/map/dungeon/models/Set A/03. Antechamber A/ANTECHAMBER_TYPE1_VER2_mother.png" id="14_1wlp7"]
 [ext_resource type="Texture2D" uid="uid://5cprc7yqq5xy" path="res://src/map/dungeon/models/Set A/03. Antechamber A/ANTECHAMBER_TYPE1_VER2_brick3.png" id="15_rowg2"]
+[ext_resource type="Texture2D" uid="uid://d0mag58v6pv4" path="res://src/map/dungeon/door/A1_BLOCKED_DOOR.png" id="16_e81mq"]
 [ext_resource type="PackedScene" uid="uid://twrj4wixcbu7" path="res://src/items/ItemDatabase.tscn" id="17_25wvm"]
-[ext_resource type="Texture2D" uid="uid://bkvegamuqdsdd" path="res://src/map/dungeon/models/Set A/18. Corridor A/CORRIDOR test_FLOOR1.jpg" id="19_06gih"]
 [ext_resource type="Texture2D" uid="uid://del2dfj3etokd" path="res://src/map/dungeon/textures/BLOCKED-DOOR_REGULAR.png" id="20_le1vp"]
 [ext_resource type="Material" uid="uid://bsafm3t4drpl" path="res://src/map/dungeon/textures/MinimapTexture.tres" id="21_8vpi3"]
 [ext_resource type="Script" uid="uid://yl7wyeo5m725" path="res://src/map/dungeon/code/remove_unused_doors.gd" id="21_m6pqv"]
@@ -629,19 +629,20 @@ data = PackedVector3Array(34.7912, -0.0011, 13.9165, 34.7912, 13.9165, 27.833, 3
 [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_h52xe"]
 data = PackedVector3Array(-1.0001, -1, 1, -1.0001, 1, -1, -1.0001, 1, 1, -1.0001, -1, 1, -1.0001, -1, -1, -1.0001, 1, -1, -1.0001, -1, -1, 1, 1, -1, -1.0001, 1, -1, -1.0001, -1, -1, 1, -1, -1, 1, 1, -1, 1, -1, -1, 1, 1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, 1, -1, 1, -1.0001, 1, 1, 1, 1, 1, 1, -1, 1, -1.0001, -1, 1, -1.0001, 1, 1, -1.0001, -1, -1, 1, -1, 1, 1, -1, -1, -1.0001, -1, -1, -1.0001, -1, 1, 1, -1, 1, 1, 1, -1, -1.0001, 1, 1, -1.0001, 1, -1, 1, 1, -1, 1, 1, 1, -1.0001, 1, 1, -10.917, -1, 1, -10.917, 1, -1, -10.917, 1, 1, -10.917, -1, 1, -10.917, -1, -1, -10.917, 1, -1, -10.917, -1, -1, -8.9171, 1, -1, -10.917, 1, -1, -10.917, -1, -1, -8.9171, -1, -1, -8.9171, 1, -1, -8.9171, -1, -1, -8.9171, 1, 1, -8.9171, 1, -1, -8.9171, -1, -1, -8.9171, -1, 1, -8.9171, 1, 1, -8.9171, -1, 1, -10.917, 1, 1, -8.9171, 1, 1, -8.9171, -1, 1, -10.917, -1, 1, -10.917, 1, 1, -10.917, -1, -1, -8.9171, -1, 1, -8.9171, -1, -1, -10.917, -1, -1, -10.917, -1, 1, -8.9171, -1, 1, -8.9171, 1, -1, -10.917, 1, 1, -10.917, 1, -1, -8.9171, 1, -1, -8.9171, 1, 1, -10.917, 1, 1, -10.917, -1, 8.4565, -10.917, 1, 6.4564, -10.917, 1, 8.4565, -10.917, -1, 8.4565, -10.917, -1, 6.4564, -10.917, 1, 6.4564, -10.917, -1, 6.4564, -8.9171, 1, 6.4564, -10.917, 1, 6.4564, -10.917, -1, 6.4564, -8.9171, -1, 6.4564, -8.9171, 1, 6.4564, -8.9171, -1, 6.4564, -8.9171, 1, 8.4565, -8.9171, 1, 6.4564, -8.9171, -1, 6.4564, -8.9171, -1, 8.4565, -8.9171, 1, 8.4565, -8.9171, -1, 8.4565, -10.917, 1, 8.4565, -8.9171, 1, 8.4565, -8.9171, -1, 8.4565, -10.917, -1, 8.4565, -10.917, 1, 8.4565, -10.917, -1, 6.4564, -8.9171, -1, 8.4565, -8.9171, -1, 6.4564, -10.917, -1, 6.4564, -10.917, -1, 8.4565, -8.9171, -1, 8.4565, -8.9171, 1, 6.4564, -10.917, 1, 8.4565, -10.917, 1, 6.4564, -8.9171, 1, 6.4564, -8.9171, 1, 8.4565, -10.917, 1, 8.4565, -1.0001, -1, 8.4565, -1.0001, 1, 6.4564, -1.0001, 1, 8.4565, -1.0001, -1, 8.4565, -1.0001, -1, 6.4564, -1.0001, 1, 6.4564, -1.0001, -1, 6.4564, 1, 1, 6.4564, -1.0001, 1, 6.4564, -1.0001, -1, 6.4564, 1, -1, 6.4564, 1, 1, 6.4564, 1, -1, 6.4564, 1, 1, 8.4565, 1, 1, 6.4564, 1, -1, 6.4564, 1, -1, 8.4565, 1, 1, 8.4565, 1, -1, 8.4565, -1.0001, 1, 8.4565, 1, 1, 8.4565, 1, -1, 8.4565, -1.0001, -1, 8.4565, -1.0001, 1, 8.4565, -1.0001, -1, 6.4564, 1, -1, 8.4565, 1, -1, 6.4564, -1.0001, -1, 6.4564, -1.0001, -1, 8.4565, 1, -1, 8.4565, 1, 1, 6.4564, -1.0001, 1, 8.4565, -1.0001, 1, 6.4564, 1, 1, 6.4564, 1, 1, 8.4565, -1.0001, 1, 8.4565)
 
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_b605t"]
+shading_mode = 0
+albedo_texture = ExtResource("16_e81mq")
+
+[sub_resource type="QuadMesh" id="QuadMesh_cnaww"]
+material = SubResource("StandardMaterial3D_b605t")
+size = Vector2(4, 4)
+
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_51rrf"]
+transparency = 1
 shading_mode = 0
 albedo_texture = ExtResource("20_le1vp")
 texture_filter = 0
 
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_alrge"]
-shading_mode = 0
-albedo_texture = ExtResource("19_06gih")
-
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_x3ul8"]
-shading_mode = 0
-albedo_texture = ExtResource("19_06gih")
-
 [sub_resource type="BoxShape3D" id="BoxShape3D_e81mq"]
 size = Vector3(20, 8, 16)
 
@@ -742,17 +743,14 @@ flip_faces = true
 size = Vector3(20, 10, 16)
 
 [node name="CSGBox2" type="CSGBox3D" parent="Doors"]
-transform = Transform3D(-4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0, 1, -3.9518, 0.00102097, 8.23087)
+transform = Transform3D(-4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0, 1, -3.9518, 0.00102097, 7.98137)
+transparency = 1.0
 use_collision = true
-size = Vector3(4, 4, 0.5)
+size = Vector3(4, 4, 0.001)
-material = SubResource("StandardMaterial3D_51rrf")
 
-[node name="DOOR?1" type="CSGBox3D" parent="Doors/CSGBox2"]
+[node name="DOOR?" type="MeshInstance3D" parent="Doors/CSGBox2"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.293891, 0, -0.104667)
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.00618792, -0.0105445, 0)
-material_override = SubResource("StandardMaterial3D_alrge")
+mesh = SubResource("QuadMesh_cnaww")
-operation = 2
-size = Vector3(4.98816, 4, 2)
-material = SubResource("StandardMaterial3D_x3ul8")
 
 [node name="CSGBox" type="CSGBox3D" parent="Doors"]
 transform = Transform3D(-4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0, 1, 4, 0.0988947, -8)
@@ -760,12 +758,9 @@ use_collision = true
 size = Vector3(4, 4, 0.5)
 material = SubResource("StandardMaterial3D_51rrf")
 
-[node name="DOOR?1" type="CSGBox3D" parent="Doors/CSGBox"]
+[node name="DOOR?" type="MeshInstance3D" parent="Doors/CSGBox"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.0686455)
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.00618792, -0.0105445, 0)
-material_override = SubResource("StandardMaterial3D_alrge")
+mesh = SubResource("QuadMesh_cnaww")
-operation = 2
-size = Vector3(4, 4, 2)
-material = SubResource("StandardMaterial3D_x3ul8")
 
 [node name="RemoveUnusedDoors" type="Node" parent="Doors"]
 script = ExtResource("21_m6pqv")

Zennysoft.Game.Ma/src/ui/pause_menu/PauseDebugMenu.cs

@@ -57,16 +57,16 @@ public partial class PauseDebugMenu : Control, IDebugMenu
   {
     var enemyToSpawn = _spawnableEnemies.ElementAt((int)index);
     var loadedEnemy = enemyToSpawn.Instantiate<Enemy>();
-    loadedEnemy.GlobalPosition = new Vector3(_player.CurrentPosition.X, _player.CurrentPosition.Y + 1, _player.CurrentPosition.Z) + (-_player.CurrentBasis.Z * 2);
     AddChild(loadedEnemy);
+    loadedEnemy.GlobalPosition = new Vector3(_player.CurrentPosition.X, _player.CurrentPosition.Y + 1, _player.CurrentPosition.Z) + (-_player.CurrentBasis.Z * 2);
   }
 
   private void SpawnItemDropDown_ItemSelected(long index)
   {
     var itemToSpawn = _spawnableItems.ElementAt((int)index);
     var duplicated = itemToSpawn.Duplicate((int)DuplicateFlags.UseInstantiation) as Node3D;
-    duplicated.GlobalPosition = new Vector3(_player.CurrentPosition.X, _player.CurrentPosition.Y + 1, _player.CurrentPosition.Z) + (-_player.CurrentBasis.Z * 2);
     AddChild(duplicated);
+    duplicated.GlobalPosition = new Vector3(_player.CurrentPosition.X, _player.CurrentPosition.Y + 1, _player.CurrentPosition.Z) + (-_player.CurrentBasis.Z * 2);
   }
 
   private void LoadNextFloorButton_Pressed()