fix: walk/turn/use-mob action sequencing and stepwise stop

Fixes GoToFp orphan-walk slide, UseMob slot tags with stepwise stop, and turn/walk action transitions.

Author: JucanAndreiDaniel

Assets/Gothic-Core/Scripts/Domain/Npc/Actions/AnimationActions/AbstractRotateAnimationAction.cs

@@ -2,7 +2,6 @@
 using Gothic.Core.Models.Vm;
 using Gothic.Core.Services;
 using Gothic.Core.Services.Npc;
-using Reflex.Attributes;
 using UnityEngine;
 
 namespace Gothic.Core.Domain.Npc.Actions.AnimationActions
@@ -53,9 +52,9 @@ public override void Start()
                 return;
             }
 
-            // https://discussions.unity.com/t/determining-whether-to-rotate-left-or-right/44021
-            var cross = Vector3.Cross(NpcGo.transform.forward, _finalRotation.eulerAngles);
-            _isRotateLeft = cross.y >= 0;
+            // Negative signed angle around the up axis means the target direction is to our left.
+            var targetForward = _finalRotation * Vector3.forward;
+            _isRotateLeft = Vector3.SignedAngle(NpcGo.transform.forward, targetForward, Vector3.up) < 0;
 
             if (PlayAnimation)
             {
@@ -92,7 +91,8 @@ private void HandleRotation(Transform npcTransform)
             // Check if rotation is done.
             if (Quaternion.Angle(npcTransform.rotation, _finalRotation) < 1f)
             {
-                PrefabProps.AnimationSystem.StopAnimation(_rotationAnimationName);
+                if (_rotationAnimationName != null)
+                    PrefabProps.AnimationSystem.StopAnimation(_rotationAnimationName);
 
                 IsFinishedFlag = true;
             }

Assets/Gothic-Core/Scripts/Domain/Npc/Actions/AnimationActions/AbstractWalkAnimationAction.cs

@@ -81,9 +81,7 @@ public override void Tick()
         private string GetWalkModeAnimationString()
         {
             var fightMode = (VmGothicEnums.WeaponState)Vob.FightMode;
-            var weaponState = fightMode == VmGothicEnums.WeaponState.NoWeapon
-                ? ""
-                : fightMode.ToString();
+            var weaponState = Services.Npc.AnimationService.GetWeaponAnimationPrefix(fightMode);
             var walkMode = (VmGothicEnums.WalkMode)Vob.AiHuman.WalkMode;
             switch (walkMode)
             {

Assets/Gothic-Core/Scripts/Domain/Npc/Actions/AnimationActions/AbstractWalkAnimationAction2.cs

@@ -2,7 +2,6 @@
 using Gothic.Core.Models.Container;
 using Gothic.Core.Models.Vm;
 using Gothic.Core.Services.Npc;
-using Reflex.Attributes;
 using UnityEngine;
 
 namespace Gothic.Core.Domain.Npc.Actions.AnimationActions
@@ -12,6 +11,11 @@ public abstract class AbstractWalkAnimationAction2 : AbstractAnimationAction
         protected Transform NpcTransform => NpcGo.transform;
         protected bool IsDestReached;
 
+        // Name of the animation StartWalk() actually played. StopWalk() must stop exactly this one:
+        // recalculating the name would stop the wrong animation when walk/fight mode changed mid-walk
+        // (e.g. via an immediately executed AI_SetWalkmode), leaving the walk loop sliding the NPC forever.
+        private string _startedWalkAnimationName;
+
         protected AbstractWalkAnimationAction2(AnimationAction action, NpcContainer npcContainer) : base(action, npcContainer)
         {
         }
@@ -34,6 +38,16 @@ public override void Start()
             if (IsDestinationReached())
             {
                 OnDestinationReached();
+
+                // Already at the final destination (e.g. a FP_ROAM FreePoint right next to the NPC):
+                // never start the walk loop - nobody would stop it again and its root motion
+                // would slide the NPC around (visible e.g. on roaming Molerats).
+                // IsDestReached covers subclasses which continue at the spot without finishing
+                // (e.g. UseMob playing its transition animation) - the walk loop would blend
+                // that animation out again. Only a multi-stop route (GoToWp) resets the flag
+                // and walks on.
+                if (IsFinishedFlag || IsDestReached)
+                    return;
             }
 
             StartWalk();
@@ -59,16 +73,18 @@ protected virtual void StartWalk()
         {
             PhysicsService.EnablePhysicsForNpc(PrefabProps);
 
-            var animName = AnimationService.GetAnimationName(VmGothicEnums.AnimationType.Move, NpcContainer);
-            PrefabProps.AnimationSystem.PlayAnimation(animName);
+            _startedWalkAnimationName = AnimationService.GetAnimationName(VmGothicEnums.AnimationType.Move, NpcContainer);
+            PrefabProps.AnimationSystem.PlayAnimation(_startedWalkAnimationName);
         }
 
         protected virtual void StopWalk()
         {
             PhysicsService.EnablePhysicsForNpc(PrefabProps);
 
-            var animName = AnimationService.GetAnimationName(VmGothicEnums.AnimationType.Move, NpcContainer);
-            PrefabProps.AnimationSystem.StopAnimation(animName);
+            if (_startedWalkAnimationName != null)
+            {
+                PrefabProps.AnimationSystem.StopAnimation(_startedWalkAnimationName);
+            }
         }
 
         private bool IsDestinationReached()

Assets/Gothic-Core/Scripts/Domain/Npc/Actions/AnimationActions/GoToFp.cs

@@ -10,8 +10,6 @@ public class GoToFp : AbstractWalkAnimationAction2
 
         private string _destination => Action.String0;
 
-        private FreePoint _freePoint;
-
         public GoToFp(AnimationAction action, NpcContainer npcContainer) : base(action, npcContainer)
         {
         }
@@ -27,9 +25,14 @@ public override void Start()
                 return;
             }
 
+            // Free the FP we still hold from a previous GoToFp. Otherwise every FP an NPC ever
+            // visited stays locked until the NPC is culled, and roaming runs out of free FPs.
+            if (Props.CurrentFreePoint != null && Props.CurrentFreePoint != _fp)
+                Props.CurrentFreePoint.IsLocked = false;
+
             _fp.IsLocked = true;
             Props.CurrentFreePoint = _fp;
-            
+
             base.Start();
         }
 

Assets/Gothic-Core/Scripts/Domain/Npc/Actions/AnimationActions/GoToWp.cs

@@ -39,17 +39,6 @@ public override void Start()
             base.Start();
         }
 
-        /// <summary>
-        /// Skip animation setting if we're on the final destination right from the start.
-        /// </summary>
-        protected override void StartWalk()
-        {
-            if (!IsFinishedFlag)
-            {
-                base.StartWalk();
-            }
-        }
-
         protected override Vector3 GetWalkDestination()
         {
             return _route.Peek().Position;
@@ -73,6 +62,7 @@ protected override void OnDestinationReached()
                 return;
             }
 
+            StopWalk();
             AnimationEnd();
 
             IsFinishedFlag = true;

Assets/Gothic-Core/Scripts/Domain/Npc/Actions/AnimationActions/Output.cs

@@ -6,11 +6,11 @@
 using Gothic.Core.Services.Caches;
 using Gothic.Core.Services.Config;
 using Gothic.Core.Services.Npc;
-using Gothic.Core.Adapters.Npc;
 using Gothic.Core.Extensions;
-using Gothic.Core.Const;
+using Gothic.Core.Logging;
 using Reflex.Attributes;
 using UnityEngine;
+using Logger = Gothic.Core.Logging.Logger;
 using Random = UnityEngine.Random;
 
 namespace Gothic.Core.Domain.Npc.Actions.AnimationActions
@@ -50,6 +50,14 @@ public override void Start()
             }
 
             var audioClip = _audioService.CreateAudioClip(OutputName);
+
+            if (audioClip == null)
+            {
+                Logger.LogWarning($"AudioClip >{OutputName}< not found. Skipping speech output.", LogCat.Dialog);
+                IsFinishedFlag = true;
+                return;
+            }
+
             _audioPlaySeconds = audioClip.length;
 
             // Hero

Assets/Gothic-Core/Scripts/Domain/Npc/Actions/AnimationActions/PlayAni.cs

@@ -21,5 +21,21 @@ public override void Start()
             }
             ActionEndEventTime = PrefabProps.AnimationSystem.GetAnimationDuration(_animName);
         }
+
+        public override void Tick()
+        {
+            base.Tick();
+
+            if (IsFinishedFlag)
+                return;
+
+            // An external stop (e.g. AI_StopAni) triggered the track's blend-out before
+            // the natural duration elapsed — finish the action now rather than waiting
+            // for the timer.
+            if (PrefabProps.AnimationSystem.IsAnimationBlendingOut(_animName))
+            {
+                AnimationEnd();
+            }
+        }
     }
 }

Assets/Gothic-Core/Scripts/Domain/Npc/Actions/AnimationActions/StandUp.cs

@@ -1,4 +1,5 @@
 using Gothic.Core.Models.Container;
+using Gothic.Core.Models.Vm;
 
 namespace Gothic.Core.Domain.Npc.Actions.AnimationActions
 {
@@ -10,6 +11,18 @@ public StandUp(AnimationAction action, NpcContainer npcContainer) : base(action,
 
         public override void Start()
         {
+            // G1 documentation: while using a Mobsi, AI_StandUp pops the NPC to standing without back-transitions.
+            if (PrefabProps.CurrentInteractable != null)
+            {
+                PrefabProps.CurrentInteractable = null;
+                PrefabProps.CurrentInteractableSlot = null;
+                Props.CurrentInteractableStateId = -1;
+                Props.BodyState = VmGothicEnums.BodyState.BsStand;
+
+                PhysicsService.EnablePhysicsForNpc(PrefabProps);
+            }
+
+            // Playing the idle blends out a possibly running Mobsi loop animation on the same layer.
             PrefabProps.AnimationSystem.PlayIdleAnimation();
         }
 

Assets/Gothic-Core/Scripts/Domain/Npc/Actions/AnimationActions/UseMob.cs

@@ -13,7 +13,7 @@ namespace Gothic.Core.Domain.Npc.Actions.AnimationActions
     public class UseMob : AbstractWalkAnimationAction2
     {
         private const string _mobTransitionAnimationString = "T_{0}{1}{2}_2_{3}";
-        private const string _mobLoopAnimationString = "S_{0}_S{1}";
+        private const string _mobLoopAnimationString = "S_{0}{1}S{2}";
         private VobContainer _mobContainer;
         private GameObject _slotGo;
         private Vector3 _destination;
@@ -23,6 +23,9 @@ public class UseMob : AbstractWalkAnimationAction2
         private int _desiredState => Action.Int0;
         private bool IsStopUsingMob => _desiredState <= -1;
 
+        // -1 is the not-in-use state; scripts may send any negative value to stop.
+        private int TargetState => IsStopUsingMob ? -1 : _desiredState;
+
         private bool _isMobFoundButNotYetInitialized;
         private string _currentMobAnimation;
 
@@ -40,6 +43,11 @@ public override void Start()
                 _slotGo = PrefabProps.CurrentInteractableSlot;
                 _mobsiScheme = _mobContainer.Props.GetVisualScheme();
 
+                // We already stand at the slot. Without this, Tick() would treat the unset
+                // _destination (0,0,0) as walk target and never reach TickMobUsage().
+                _destination = _slotGo.transform.position;
+                IsDestReached = true;
+
                 StartMobUseAnimation();
                 return;
             }
@@ -49,7 +57,8 @@ public override void Start()
             _mobContainer = container;
             _mobsiScheme = _mobContainer?.Props.GetVisualScheme();
 
-            if (container!.Go == null)
+            // No free Mobsi of this scheme within reach (e.g. all occupied by other NPCs).
+            if (container == null || !container.Go)
             {
                 IsFinishedFlag = true;
                 return;
@@ -63,9 +72,6 @@ public override void Start()
 
         private void StartNow()
         {
-            // We call Start only if the Mobsi is already available.
-            base.Start();
-
             _isMobFoundButNotYetInitialized = false;
 
             var slot = GetNearestMobSlot();
@@ -83,6 +89,10 @@ private void StartNow()
             PrefabProps.CurrentInteractableSlot = _slotGo;
 
             SetBodyState();
+
+            // base.Start() checks the walk destination and may start the walk loop - it must only
+            // run once _destination is set, and not at all when no slot was found.
+            base.Start();
         }
 
         private void SetBodyState()
@@ -136,11 +146,13 @@ private void TickMobUsage()
         {
             if (PrefabProps.AnimationSystem.IsPlaying(_currentMobAnimation))
                 return;
-            
-            UpdateState();
+
+            // A finished transition moves the state one step toward the target (e.g. S1 -> S0 -> Stand when stopping).
+            if (Props.CurrentInteractableStateId != TargetState)
+                UpdateState();
 
             // If we arrived at the Mobsi, we will further execute the transitions step-by-step until demanded state is reached.
-            if (Props.CurrentInteractableStateId != _desiredState)
+            if (Props.CurrentInteractableStateId != TargetState)
             {
                 PlayTransitionAnimation();
                 return;
@@ -151,14 +163,16 @@ private void TickMobUsage()
             {
                 PrefabProps.CurrentInteractable = null;
                 PrefabProps.CurrentInteractableSlot = null;
+                Props.CurrentItem = -1;
                 Props.BodyState = VmGothicEnums.BodyState.BsStand;
 
                 PhysicsService.EnablePhysicsForNpc(PrefabProps);
             }
             // Loop Mobsi animation until the same UseMob with -1 is called.
             else
             {
-                var animName = string.Format(_mobLoopAnimationString, _mobsiScheme, _desiredState);
+                // Loop animations carry the slot position as well (e.g. s_Bed_Front_S1 vs. s_Cauldron_S1).
+                var animName = string.Format(_mobLoopAnimationString, _mobsiScheme, GetSlotPositionTag(_slotGo.name), TargetState);
                 PrefabProps.AnimationSystem.PlayAnimation(animName);
             }
 
@@ -205,7 +219,10 @@ private void StartMobUseAnimation()
 
             NpcGo.transform.SetPositionAndRotation(_slotGo.transform.position, _slotGo.transform.rotation);
 
-            PlayTransitionAnimation();
+            // Already in the demanded state (e.g. a repeated AI_UseMob with the same state):
+            // TickMobUsage() will replay the loop animation and finish without a transition.
+            if (Props.CurrentInteractableStateId != TargetState)
+                PlayTransitionAnimation();
         }
 
         private string GetSlotPositionTag(string name)
@@ -230,41 +247,19 @@ protected override Vector3 GetWalkDestination()
 
         private void UpdateState()
         {
-            // FIXME - We need to check. For Cauldron/Cook we have only t_s0_2_Stand, but not t_s1_2_s0 - But is it for all of them?
-            if (IsStopUsingMob)
-            {
-                Props.CurrentInteractableStateId = -1;
-                Props.CurrentItem = -1;
-            }
-            else
-            {
-                var newStateAddition = Props.CurrentInteractableStateId > _desiredState ? -1 : +1;
-                Props.CurrentInteractableStateId += newStateAddition;
-            }
+            var step = Props.CurrentInteractableStateId > TargetState ? -1 : +1;
+            Props.CurrentInteractableStateId += step;
         }
 
         private void PlayTransitionAnimation()
         {
-            string from;
-            string to;
+            var current = Props.CurrentInteractableStateId;
+            var next = current + (TargetState > current ? +1 : -1);
 
-            // FIXME - We need to check. For Cauldron/Cook we have only t_s0_2_Stand, but not t_s1_2_s0 - But is it for all of them?
-            if (IsStopUsingMob)
-            {
-                from = "S0";
-                to = "Stand";
-            }
-            else
-            {
-                from = Props.CurrentInteractableStateId.ToString();
-                to = $"S{Props.CurrentInteractableStateId + 1}";
-
-                from = from switch
-                {
-                    "-1" => "Stand",
-                    _ => $"S{from}"
-                };
-            }
+            // -1 is the not-in-use state and is named Stand inside the animations.
+            // Both directions exist as own animations (e.g. t_Cauldron_Stand_2_S0, t_Cauldron_S0_2_S1, t_Cauldron_S1_2_S0).
+            var from = current == -1 ? "Stand" : $"S{current}";
+            var to = next == -1 ? "Stand" : $"S{next}";
 
             var slotPositionName = GetSlotPositionTag(_slotGo.name);
             var animName = string.Format(_mobTransitionAnimationString, _mobsiScheme, slotPositionName, from, to);