Re-export Pico (Playable) and Pico (Dark) to texture atlases

AbnormalPoof · Hundrec · commit 17ed98ee4d7b · 2026-01-29T22:27:42.000-07:00
diff --git a/astc-compression-data.json b/astc-compression-data.json
@@ -41,6 +41,22 @@
       "asset": "assets/shared/images/characters/sserafim/chaewon/spritemap1.png",
       "blocksize": "4x4"
     },
+    {
+      "asset": "assets/shared/images/characters/pico-dark/spritemap1.png",
+      "blocksize": "4x4"
+    },
+    {
+      "asset": "assets/shared/images/characters/pico/basic-animations/spritemap1.png",
+      "blocksize": "6x6"
+    },
+    {
+      "asset": "assets/shared/images/characters/pico/explosion-death/spritemap1.png",
+      "blocksize": "8x8"
+    },
+    {
+      "asset": "assets/shared/images/characters/pico/playable-animations/spritemap1.png",
+      "blocksize": "6x6"
+    },
     {
       "asset": "assets/shared/images/holdCoverBlue.png",
       "blocksize": "4x4"
@@ -109,6 +125,10 @@
       "asset": "assets/week1/image/erect/lights.png",
       "blocksize": "6x6"
     },
+    {
+      "asset": "assets/shared/images/characters/pico/death/spritemap1.png",
+      "blocksize": "6x6"
+    },
     {
       "asset": "assets/week1/images/erect/crowd.png",
       "blocksize": "8x8"
diff --git a/source/funkin/data/animation/AnimationData.hx b/source/funkin/data/animation/AnimationData.hx
@@ -147,4 +147,20 @@ typedef UnnamedAnimationData =
   @:default("framelabel")
   @:optional
   var animType:String;
+
+  /**
+   * The render type of the animation.
+   * Only available for multi-sparrow and multi-animateatlas characters.
+   * Options: "sparrow", "animateatlas"
+   */
+  @:default("")
+  @:optional
+  var renderType:String;
+
+  /**
+   * Various settings for the sprite.
+   * Only available for texture atlases.
+   */
+  @:optional
+  var atlasSettings:funkin.data.stage.StageData.TextureAtlasData;
 }
diff --git a/source/funkin/play/GameOverSubState.hx b/source/funkin/play/GameOverSubState.hx
@@ -253,7 +253,8 @@ class GameOverSubState extends MusicBeatSubState
         }
         else
         {
-          boyfriend.playAnimation('firstDeath', true, false); // ignoreOther is set to FALSE since you WANT to be able to mash and confirm game over!
+          boyfriend.playAnimation('firstDeath' + animationSuffix, true,
+            false); // ignoreOther is set to FALSE since you WANT to be able to mash and confirm game over!
           // Play the "blue balled" sound. May play a variant if one has been assigned.
           playBlueBalledSFX();
         }
diff --git a/source/funkin/play/character/AnimateAtlasCharacter.hx b/source/funkin/play/character/AnimateAtlasCharacter.hx
@@ -27,16 +27,9 @@ class AnimateAtlasCharacter extends BaseCharacter
     cpp.vm.tracy.TracyProfiler.zoneScoped('AnimateAtlasCharacter.create(${this.characterId})');
     #end
 
-    try
-    {
-      log('Loading assets for Animate Atlas character "${characterId}"');
-      loadAtlas();
-      loadAnimations();
-    }
-    catch (e)
-    {
-      throw "Exception thrown while building sprite: " + e;
-    }
+    log('Loading assets for Animate Atlas character "${characterId}"');
+    loadAtlas();
+    loadAnimations();
 
     log('Successfully loaded texture atlas for ${characterId} with ${_data.animations.length} animations.');
     super.onCreate(event);
@@ -82,8 +75,8 @@ class AnimateAtlasCharacter extends BaseCharacter
       }
     }
 
-    var animNames = this.anim.getNameList();
-    log('Successfully loaded ${animNames.length} animations for ${characterId}');
+    var animationNames:Array<String> = this.animation.getNameList();
+    log('[ATLASCHAR] Successfully loaded ${animationNames.length} animations for ${characterId}');
   }
 
   /**
diff --git a/source/funkin/play/character/MultiAnimateAtlasCharacter.hx b/source/funkin/play/character/MultiAnimateAtlasCharacter.hx
@@ -3,6 +3,7 @@ package funkin.play.character;
 import funkin.graphics.FunkinSprite;
 import funkin.util.assets.FlxAnimationUtil;
 import animate.FlxAnimateFrames;
+import flixel.graphics.frames.FlxAtlasFrames;
 import funkin.modding.events.ScriptEvent;
 import funkin.data.animation.AnimationData;
 import funkin.data.character.CharacterData.CharacterRenderType;
@@ -29,16 +30,9 @@ class MultiAnimateAtlasCharacter extends BaseCharacter
     cpp.vm.tracy.TracyProfiler.zoneScoped('MultiAnimateAtlasCharacter.create(${this.characterId})');
     #end
 
-    try
-    {
-      log('Loading assets for Multi-Animate Atlas character "${characterId}"');
-      loadAtlases();
-      loadAnimations();
-    }
-    catch (e)
-    {
-      throw "Exception thrown while building sprite: " + e;
-    }
+    log('Loading assets for Multi-Animate Atlas character "${characterId}"');
+    loadAtlases();
+    loadAnimations();
 
     log('Successfully loaded texture atlases for ${characterId} with ${_data.animations.length} animations.');
     super.onCreate(event);
@@ -48,31 +42,58 @@ class MultiAnimateAtlasCharacter extends BaseCharacter
   {
     log('Loading sprite atlases for ${characterId}.');
 
-    var assetList:Array<String> = [];
-    for (anim in _data.animations)
-    {
-      if (anim.assetPath != null && !assetList.contains(anim.assetPath))
-      {
-        assetList.push(anim.assetPath);
-      }
-    }
+    var textureList:Array<FlxAtlasFrames> = [];
+    var addedAssetPaths:Array<String> = [];
 
     var baseAssetLibrary:String = Paths.getLibrary(_data.assetPath);
     var baseAssetPath:String = Paths.stripLibrary(_data.assetPath);
 
     loadTextureAtlas(baseAssetPath, baseAssetLibrary, getAtlasSettings());
 
-    for (asset in assetList)
-    {
-      var subAssetLibrary:String = Paths.getLibrary(asset);
-      var subAssetPath:String = Paths.stripLibrary(asset);
+    var mainTexture:FlxAtlasFrames = this.library;
+    textureList.push(mainTexture);
 
-      var subTexture:FlxAnimateFrames = Paths.getAnimateAtlas(subAssetPath, subAssetLibrary, cast _data.atlasSettings);
+    for (animation in _data.animations)
+    {
+      if (animation.assetPath == null) continue;
+      if (addedAssetPaths.contains(animation.assetPath)) continue;
 
-      log('Concatenating texture atlas: ${asset}');
-      subTexture.parent.destroyOnNoUse = false;
+      switch (animation.renderType)
+      {
+        case "sparrow":
+          var subTexture:FlxAtlasFrames = Paths.getSparrowAtlas(animation.assetPath);
+          // If we don't do this, the unused textures will be removed as soon as they're loaded.
+
+          if (subTexture == null)
+          {
+            log('Multi-Animate atlas could not load subtexture: ${animation.assetPath}');
+            FlxG.log.error('Multi-Animate atlas could not load subtexture: ${animation.assetPath}');
+            return;
+          }
+          else
+          {
+            log('Concatenating sparrow atlas: ${animation.assetPath}');
+            subTexture.parent.destroyOnNoUse = false;
+            // This breaks mix-and-match for some reason.
+            // TODO: Re-enable this line once a proper fix is found.
+            // - Abnormal
+            // FunkinMemory.cacheTexture(Paths.image(animation.assetPath));
+          }
+
+          textureList.push(subTexture);
+        default:
+          var subAssetLibrary:String = Paths.getLibrary(animation.assetPath);
+          var subAssetPath:String = Paths.stripLibrary(animation.assetPath);
+
+          var subTexture:FlxAnimateFrames = Paths.getAnimateAtlas(subAssetPath, subAssetLibrary, cast animation.atlasSettings ?? _data.atlasSettings);
+
+          log('Concatenating texture atlas: ${animation.assetPath}');
+          subTexture.parent.destroyOnNoUse = false;
+
+          textureList.push(subTexture);
+      }
 
-      this.library.addAtlas(subTexture);
+      addedAssetPaths.push(animation.assetPath);
     }
 
     if (_data.isPixel)
@@ -86,17 +107,24 @@ class MultiAnimateAtlasCharacter extends BaseCharacter
       this.antialiasing = true;
     }
 
+    this.frames = FlxAnimateFrames.combineAtlas(textureList);
     this.setScale(_data.scale);
   }
 
   function loadAnimations():Void
   {
-    log('Loading ${_data.animations.length} animations for ${characterId}');
-
-    FlxAnimationUtil.addTextureAtlasAnimations(this, _data.animations);
+    log('[MULTIATLASCHAR] Loading ${_data.animations.length} animations for ${characterId}');
 
     for (anim in _data.animations)
     {
+      switch (anim.renderType)
+      {
+        case "sparrow":
+          FlxAnimationUtil.addAtlasAnimation(this, anim);
+        default:
+          FlxAnimationUtil.addTextureAtlasAnimation(this, anim);
+      }
+
       if (anim.offsets == null)
       {
         setAnimationOffsets(anim.name, 0, 0);
@@ -107,8 +135,8 @@ class MultiAnimateAtlasCharacter extends BaseCharacter
       }
     }
 
-    var animNames = this.anim.getNameList();
-    log('Successfully loaded ${animNames.length} animations for ${characterId}');
+    var animationNames:Array<String> = this.animation.getNameList();
+    log('[MULTIATLASCHAR] Successfully loaded ${animationNames.length} animations for ${characterId}');
   }
 
   /**
diff --git a/source/funkin/play/character/MultiSparrowCharacter.hx b/source/funkin/play/character/MultiSparrowCharacter.hx

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,8 @@ class GameOverSubState extends MusicBeatSubState`
`253`	`253`	`}`
`254`	`254`	`else`
`255`	`255`	`{`
`256`		`- boyfriend.playAnimation('firstDeath', true, false); // ignoreOther is set to FALSE since you WANT to be able to mash and confirm game over!`
	`256`	`+ boyfriend.playAnimation('firstDeath' + animationSuffix, true,`
	`257`	`+ false); // ignoreOther is set to FALSE since you WANT to be able to mash and confirm game over!`
`257`	`258`	`// Play the "blue balled" sound. May play a variant if one has been assigned.`
`258`	`259`	`playBlueBalledSFX();`
`259`	`260`	`}`