From 68d87a08372facd15678268fa2b4cc518dc6c9cb Mon Sep 17 00:00:00 2001
From: CheemsAndFriends <granchinvictor@gmail.com>
Date: Wed, 11 Sep 2024 19:24:21 +0200
Subject: [PATCH] Add one more conditional in atlas + add ignoreExclusions in
 Bopper/BaseCharacter

---
 .../graphics/adobeanimate/FlxAtlasSprite.hx   |  2 +-
 source/funkin/play/character/BaseCharacter.hx |  2 ++
 source/funkin/play/stage/Bopper.hx            | 23 ++++++++++++++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx b/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx
index 30ee20068..037b87faa 100644
--- a/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx
+++ b/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx
@@ -95,7 +95,7 @@ class FlxAtlasSprite extends FlxAnimate
    */
   public function hasAnimation(id:String):Bool
   {
-    return getLabelIndex(id) != -1 || anim.symbolDictionary.exists(id);
+    return getLabelIndex(id) != -1 || anim.symbolDictionary.exists(id) || anim.getByName(id);
   }
 
   /**
diff --git a/source/funkin/play/character/BaseCharacter.hx b/source/funkin/play/character/BaseCharacter.hx
index bce7f0d98..365c8d112 100644
--- a/source/funkin/play/character/BaseCharacter.hx
+++ b/source/funkin/play/character/BaseCharacter.hx
@@ -151,6 +151,8 @@ class BaseCharacter extends Bopper
     super(CharacterDataParser.DEFAULT_DANCEEVERY);
     this.characterId = id;
 
+    ignoreExclusionPref = ["sing"];
+
     _data = CharacterDataParser.fetchCharacterData(this.characterId);
     if (_data == null)
     {
diff --git a/source/funkin/play/stage/Bopper.hx b/source/funkin/play/stage/Bopper.hx
index 96a217d31..721a60517 100644
--- a/source/funkin/play/stage/Bopper.hx
+++ b/source/funkin/play/stage/Bopper.hx
@@ -260,6 +260,8 @@ class Bopper extends StageProp implements IPlayStateScriptedClass
 
   public var canPlayOtherAnims:Bool = true;
 
+  public var ignoreExclusionPref:Array<String> = [];
+
   /**
    * @param name The name of the animation to play.
    * @param restart Whether to restart the animation if it is already playing.
@@ -268,7 +270,26 @@ class Bopper extends StageProp implements IPlayStateScriptedClass
    */
   public function playAnimation(name:String, restart:Bool = false, ignoreOther:Bool = false, reversed:Bool = false):Void
   {
-    if (!canPlayOtherAnims && !ignoreOther) return;
+    if ((!canPlayOtherAnims))
+    {
+      var id = name;
+      if (getCurrentAnimation() == id && restart) {}
+      else if (ignoreExclusionPref != null && ignoreExclusionPref.length > 0)
+      {
+        var detected:Bool = false;
+        for (entry in ignoreExclusionPref)
+        {
+          if (StringTools.startsWith(id, entry))
+          {
+            detected = true;
+            break;
+          }
+        }
+        if (!detected) return;
+      }
+      else
+        return;
+    }
 
     var correctName = correctAnimationName(name);
     if (correctName == null) return;