animation fixes + modding WIP

src/state/main.cpp

@@ -199,6 +199,7 @@ namespace game::state
           isEndEnd = true;
           isEnd = false;
           isPostgame = true;
+          menu.isCheats = true;
           world.character_focus(character, worldCanvas, focus_get());
         }
       }

src/state/main/character_manager.cpp

@@ -41,7 +41,7 @@ namespace game::state::main
     if (isJustStoppedInteracting)
     {
       cursor.queue_play({cursor.defaultAnimation});
-      if (cursor.mode == RUB) character.queue_idle_animation();
+      if (cursor.mode == RUB && character.queuedPlay.empty()) character.queue_idle_animation();
       isJustStoppedInteracting = false;
     }
 

src/state/main/item_manager.cpp

@@ -54,7 +54,7 @@ namespace game::state::main
     if (isJustItemHeldStopped || isJustItemThrown)
     {
       cursor.queue_default_animation();
-      if (!isJustItemThrown) character.queue_idle_animation();
+      if (!isJustItemThrown && character.queuedPlay.empty()) character.queue_idle_animation();
       isJustItemHeldStopped = false;
       isJustItemThrown = false;
     }

src/state/main/text.cpp

@@ -28,7 +28,7 @@ namespace game::state::main
     return it;
   }
 
-  void Text::set(resource::xml::Dialogue::Entry* dialogueEntry, entity::Character& character)
+  void Text::set(resource::xml::Dialogue::Entry* dialogueEntry, entity::Character& character, bool isInterruptible)
   {
     if (!dialogueEntry) return;
     this->entry = dialogueEntry;
@@ -38,7 +38,8 @@ namespace game::state::main
     time = 0.0f;
     isEnabled = true;
     character.isTalking = true;
-    if (!dialogueEntry->animation.empty()) character.queue_play({dialogueEntry->animation});
+    if (!dialogueEntry->animation.empty())
+      character.queue_play({.animation = dialogueEntry->animation, .isInterruptible = isInterruptible});
     if (dialogueEntry->text.empty()) isEnabled = false;
   }
 

src/state/main/text.hpp

@@ -21,7 +21,7 @@ namespace game::state::main
     bool isEnabled{true};
     float time{};
 
-    void set(resource::xml::Dialogue::Entry*, entity::Character&);
+    void set(resource::xml::Dialogue::Entry*, entity::Character&, bool isInterruptible = true);
     void tick(entity::Character&);
     void update(entity::Character&);
     bool is_interruptible() const;