diff --git a/src/enemy/CollisionDetector.tscn b/src/enemy/CollisionDetector.tscn index a56a7980..82a1887d 100644 --- a/src/enemy/CollisionDetector.tscn +++ b/src/enemy/CollisionDetector.tscn @@ -9,5 +9,5 @@ collision_layer = 16 collision_mask = 16 [node name="CollisionShape3D" type="CollisionShape3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.50124, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.633259, 0) shape = SubResource("BoxShape3D_7056c") diff --git a/src/enemy/enemy_types/floating_enemy/FloatingEnemy.tscn b/src/enemy/enemy_types/floating_enemy/FloatingEnemy.tscn index 952ad663..12d38002 100644 --- a/src/enemy/enemy_types/floating_enemy/FloatingEnemy.tscn +++ b/src/enemy/enemy_types/floating_enemy/FloatingEnemy.tscn @@ -105,10 +105,9 @@ radius = 0.2 height = 1.0 [node name="EnemyGuy" type="CharacterBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0) collision_layer = 10 collision_mask = 9 -motion_mode = 1 +axis_lock_linear_y = true script = ExtResource("1_jw471") EnemyStatInfo = ExtResource("2_ewaf6") diff --git a/src/enemy/state/states/EnemyLogic.State.FollowPlayer.cs b/src/enemy/state/states/EnemyLogic.State.FollowPlayer.cs index f323c087..11448cb0 100644 --- a/src/enemy/state/states/EnemyLogic.State.FollowPlayer.cs +++ b/src/enemy/state/states/EnemyLogic.State.FollowPlayer.cs @@ -23,10 +23,11 @@ namespace GameJamDungeon } enemy.NavAgent.TargetPosition = gameRepo.PlayerGlobalPosition.Value; var nextPosition = enemy.NavAgent.GetNextPathPosition(); - enemy.LookAt(enemy.NavAgent.GetNextPathPosition()); + var lookAtPos = enemy.NavAgent.GetNextPathPosition(); + enemy.LookAt(new Vector3(lookAtPos.X, enemy.GlobalPosition.Y, lookAtPos.Z), Vector3.Up); var direction = enemy.NavAgent.GetNextPathPosition() - enemy.GlobalPosition; - enemy.Velocity = direction * 2.0f * (float)delta; + enemy.Velocity = enemy.Velocity.MoveToward(direction.Normalized() * 0.01f, (float)delta); Output(new Output.MovementComputed(enemy.Velocity)); diff --git a/src/map/dungeon/rooms/Room1.tscn b/src/map/dungeon/rooms/Room1.tscn index d27b9a0a..ac0ac5e4 100644 --- a/src/map/dungeon/rooms/Room1.tscn +++ b/src/map/dungeon/rooms/Room1.tscn @@ -60,7 +60,7 @@ gizmo_extents = 1.0 unique_name_in_owner = true [node name="EnemySpawn1" type="Marker3D" parent="EnemySpawnPoints"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.053, -3.59858, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.053, -3, 0) [node name="ItemDatabase" parent="." instance=ExtResource("4_2mnb7")] unique_name_in_owner = true diff --git a/src/map/dungeon/rooms/Room2.tscn b/src/map/dungeon/rooms/Room2.tscn index 6c4a2e6f..604fe540 100644 --- a/src/map/dungeon/rooms/Room2.tscn +++ b/src/map/dungeon/rooms/Room2.tscn @@ -71,7 +71,7 @@ gizmo_extents = 1.0 unique_name_in_owner = true [node name="EnemySpawn1" type="Marker3D" parent="EnemySpawnPoints"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.833, -3.72961, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.833, -3, 0) [node name="Minimap Texture" type="MeshInstance3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -4.50433, 0)