animation fixes + modding WIP

src/entity/actor.cpp

@@ -240,7 +240,7 @@ namespace game::entity
       auto& index = animationMap.at(queuedPlay.animation);
       if (queuedPlay.isPlayAfterAnimation)
         nextQueuedPlay = queuedPlay;
-      else if (index != animationIndex && currentQueuedPlay.isInterruptible)
+      else if ((state == STOPPED || index != animationIndex) && currentQueuedPlay.isInterruptible)
       {
         play(queuedPlay.animation, queuedPlay.mode, queuedPlay.time, queuedPlay.speedMultiplier);
         currentQueuedPlay = queuedPlay;

src/entity/character.cpp

@@ -189,7 +189,7 @@ namespace game::entity
         isStageUp = false;
       }
 
-      if (nextQueuedPlay.empty()) queue_idle_animation();
+      if (nextQueuedPlay.empty() && !isTalking) queue_idle_animation();
     }
 
     Actor::tick();