More Chariot fixes

Zennysoft.Game.Ma/project.godot

@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="Ma"
-run/main_scene="uid://d1gjaijijd5ot"
+run/main_scene="uid://c7wjbgbrdivol"
 run/print_header=false
 config/features=PackedStringArray("4.4", "C#", "GL Compatibility")
 run/delta_smoothing=false

Zennysoft.Game.Ma/src/enemy/Enemy.cs

@@ -102,7 +102,7 @@ public partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLogic>
     {
       if (_enemyLogic.Value is EnemyLogic.State.Patrolling or EnemyLogic.State.FollowPlayer)
         _enemyModelView.PlayWalkAnimation();
-      else
+      else if (_enemyModelView is not ICanActivate)
         _enemyModelView.PlayIdleAnimation();
     }
   }

Zennysoft.Game.Ma/src/enemy/enemy_types/06. chariot/ChariotModelView.cs

@@ -50,26 +50,6 @@ public partial class ChariotModelView : EnemyModelView2D, ICanActivate
       PlayActivationAnimation();
       return;
     }
-
-    switch (_currentDirection)
-    {
-      case DirectionType.FORWARD:
-        AnimationTree.Get(PARAMETERS_PLAYBACK).As<AnimationNodeStateMachinePlayback>().Travel(ACTIVATED_IDLE_FRONT);
-        ScrollAnimationTree.Get(PARAMETERS_PLAYBACK).As<AnimationNodeStateMachinePlayback>().Travel(FRONT);
-        break;
-      case DirectionType.LEFT:
-        AnimationTree.Get(PARAMETERS_PLAYBACK).As<AnimationNodeStateMachinePlayback>().Travel(ACTIVATED_IDLE_LEFT);
-        ScrollAnimationTree.Get(PARAMETERS_PLAYBACK).As<AnimationNodeStateMachinePlayback>().Travel(LEFT);
-        break;
-      case DirectionType.RIGHT:
-        AnimationTree.Get(PARAMETERS_PLAYBACK).As<AnimationNodeStateMachinePlayback>().Travel(ACTIVATED_IDLE_RIGHT);
-        ScrollAnimationTree.Get(PARAMETERS_PLAYBACK).As<AnimationNodeStateMachinePlayback>().Travel(RIGHT);
-        break;
-      case DirectionType.BACKWARD:
-        AnimationTree.Get(PARAMETERS_PLAYBACK).As<AnimationNodeStateMachinePlayback>().Travel(ACTIVATED_IDLE_BACK);
-        ScrollAnimationTree.Get(PARAMETERS_PLAYBACK).As<AnimationNodeStateMachinePlayback>().Travel(BACK);
-        break;
-    }
   }
 
   public void Activate()
@@ -80,6 +60,36 @@ public partial class ChariotModelView : EnemyModelView2D, ICanActivate
     PlayActivationAnimation();
   }
 
+  public override void PlayIdleAnimation()
+  {
+    if (_activated)
+    {
+      switch (_currentDirection)
+      {
+        case DirectionType.FORWARD:
+          AnimationTree.Get(PARAMETERS_PLAYBACK).As<AnimationNodeStateMachinePlayback>().Travel(ACTIVATED_IDLE_FRONT);
+          ScrollAnimationTree.Get(PARAMETERS_PLAYBACK).As<AnimationNodeStateMachinePlayback>().Travel(FRONT);
+          break;
+        case DirectionType.LEFT:
+          AnimationTree.Get(PARAMETERS_PLAYBACK).As<AnimationNodeStateMachinePlayback>().Travel(ACTIVATED_IDLE_LEFT);
+          ScrollAnimationTree.Get(PARAMETERS_PLAYBACK).As<AnimationNodeStateMachinePlayback>().Travel(LEFT);
+          break;
+        case DirectionType.RIGHT:
+          AnimationTree.Get(PARAMETERS_PLAYBACK).As<AnimationNodeStateMachinePlayback>().Travel(ACTIVATED_IDLE_RIGHT);
+          ScrollAnimationTree.Get(PARAMETERS_PLAYBACK).As<AnimationNodeStateMachinePlayback>().Travel(RIGHT);
+          break;
+        case DirectionType.BACKWARD:
+          AnimationTree.Get(PARAMETERS_PLAYBACK).As<AnimationNodeStateMachinePlayback>().Travel(ACTIVATED_IDLE_BACK);
+          ScrollAnimationTree.Get(PARAMETERS_PLAYBACK).As<AnimationNodeStateMachinePlayback>().Travel(BACK);
+          break;
+      }
+    }
+    else
+    {
+      base.PlayIdleAnimation();
+    }
+  }
+
   private void PlayActivationAnimation()
   {
     switch (_currentDirection)