frakits i will boil you

Author: betpowo

source/funkin/backend/FunkinSprite.hx

@@ -120,7 +120,7 @@ class FunkinSprite extends FlxAnimate implements IBeatReceiver implements IOffse
 
 			if (casted != null) {
 				spr.skew.set(casted.skew.x, casted.skew.y);
-				spr.animOffsets = casted.animOffsets.copy();
+				for (i => p in casted.animOffsets) spr.addOffset(i, p.x, p.y);
 				spr.zoomFactor = casted.zoomFactor;
 				spr.angleFactor = casted.angleFactor;
 			}

source/funkin/backend/assets/MultiFramesCollection.hx

@@ -38,7 +38,6 @@ class Paths
 				for (extension in extArray) {
 					var extPath:String = sanitizedPath + '.$extension';
 					if (OpenFlAssets.exists(extPath)) {
-						trace(extPath, OpenFlAssets.exists(extPath));
 						returnedPath = extPath;
 						break;
 					}
@@ -125,12 +124,12 @@ class Paths
 		return OpenFlAssets.exists(diff) ? diff : getPath('songs/$song/song/Inst$suffix', null, ext != null ? ext : Flags.SOUND_EXT);
 	}
 
-	static public function image(key:String, ?library:String, checkForAtlas:Bool = false, ?ext:OneOfTwo<String, Array<String>>) {
+	static public function image(key:String, ?library:String, checkForAtlas:Bool = true, ?ext:OneOfTwo<String, Array<String>>) {
 		if (checkForAtlas) {
-			var atlasPath = getPath('images/$key/spritemap', library, ext != null ? ext : Flags.IMAGE_EXT);
+			var atlasPath = getPath('images/$key/spritemap1', library, ext != null ? ext : Flags.IMAGE_EXT);
 			var multiplePath = getPath('images/$key/1', library, ext != null ? ext : Flags.IMAGE_EXT);
 			if (atlasPath != null && OpenFlAssets.exists(atlasPath)) return atlasPath.substr(0, atlasPath.length - 14);
-			if (multiplePath != null && OpenFlAssets.exists(multiplePath)) return multiplePath.substr(0, multiplePath.length - 6);
+			if (multiplePath != null && OpenFlAssets.exists(multiplePath)) return multiplePath;
 		}
 		return getPath('images/$key', library, ext != null ? ext : Flags.IMAGE_EXT);
 	}
@@ -245,9 +244,10 @@ class Paths
 	public static function framesExists(key:String, checkAtlas:Bool = false, checkMulti:Bool = true, assetsPath:Bool = false, ?library:String) {
 		var path = assetsPath ? key : Paths.image(key, library, true);
 		var noExt = Path.withoutExtension(path);
+		var ext = Path.extension(path);
 		if(checkAtlas && Assets.exists('$noExt/Animation.json'))
 			return true;
-		if(checkMulti && Assets.exists('$noExt/1.png'))
+		if(checkMulti && Assets.exists('$noExt/1.$ext'))
 			return true;
 		if(Assets.exists('$noExt.xml'))
 			return true;
@@ -266,17 +266,18 @@ class Paths
 	 * @param ext (Additional) Extension of the images.
 	 * @return FlxFramesCollection Frames
 	 */
-	public static function getMultiFrames(sheets:Array<String>, ?unique:Bool = true, ?key:String = null, ?ext:OneOfTwo<String, Array<String>> = null, ?animateSettings:FlxAnimateSettings):FlxFramesCollection {
-		// TODO: cache properly
-		if (sheets.length == 1) return loadFrames(sheets[0], unique, key, false, false, animateSettings);
+	public static function getMultiFrames(sheets:Array<String>, ?unique:Bool = true, ?key:String = null, ?skipMulti:Bool = false, ?ext:OneOfTwo<String, Array<String>> = null, ?animateSettings:FlxAnimateSettings):FlxFramesCollection {
+		if (sheets.length == 1) return loadFrames('${sheets[0]}.$ext', unique, key, false, false, animateSettings);
 		if (key == null) key = 'combo/' + sheets.join(',');
 		var graphic = FlxG.bitmap.add("flixel/images/logo/default.png", unique, key);
 		var sprFrames:FlxAtlasFrames = new FlxAtlasFrames(graphic);
 		try {
 			for (x => path in sheets) {
-				var noExt = haxe.io.Path.withoutExtension(Paths.image(path, null, true, ext));
+				final coolPath = Paths.image(path, null, true, ext);
+				final noExt = haxe.io.Path.withoutExtension(coolPath);
+				final ext = haxe.io.Path.extension(coolPath);
 				@:privateAccess
-				var newFrames = cast Paths.loadFrames(noExt, true, key + '_$path', false, false, animateSettings);
+				var newFrames = cast Paths.loadFrames('$noExt.$ext', true, key + '_$path', false, skipMulti, animateSettings);
 				if (newFrames == null) {
 					Logs.warn('There is no Bitmap asset for "$noExt". Skipping...');
 					continue;
@@ -302,24 +303,24 @@ class Paths
 	static function loadFrames(path:String, Unique:Bool = false, Key:String = null, SkipAtlasCheck:Bool = false, SkipMultiCheck:Bool = false, ?animateSettings:FlxAnimateSettings):FlxFramesCollection {
 		var noExt = Path.withoutExtension(path);
 		var ext = Path.extension(path);
-
+		// there NEEDS to be a better way dude
+		if (!SkipMultiCheck && noExt.endsWith('/1'))
+			noExt = noExt.substr(0, noExt.length - 2);
 		if (!SkipMultiCheck && Assets.exists('$noExt/1.${ext}')) {
-			// MULTIPLE SPRITESHEETS!!
-
-			var graphic = FlxG.bitmap.add("flixel/images/logo/default.png", false, '$noExt/mult');
-			var frames = MultiFramesCollection.findFrame(graphic);
-			if (frames != null)
-				return frames;
-
-			var cur = 1;
-			var finalFrames = new MultiFramesCollection(graphic);
-			while(Assets.exists('$noExt/$cur.${ext}')) {
-				var spr = loadFrames('$noExt/$cur.${ext}', false, null, false, true);
-				finalFrames.addFrames(spr);
+			var cur:Int = 1;
+			final finalFrames = [];
+			while (Assets.exists('$noExt/$cur.${ext}')) {
+				finalFrames.push('${noExt.substr(
+					// there should be a Paths.unimage tbh
+					'assets/images/'.length
+				)}/$cur');
 				cur++;
 			}
-			return finalFrames;
+			return getMultiFrames(finalFrames, true,
+				'$noExt/mult', true, ext, animateSettings);
 		} else if (!SkipAtlasCheck && Assets.exists('$noExt/Animation.json')) {
+			// ???
+			if (noExt.endsWith('/')) noExt = noExt.substr(0, noExt.length - 1);
 			return Paths.getAnimateAtlasAlt(noExt, animateSettings);
 		} else if (Assets.exists('$noExt.xml')) {
 			return Paths.getSparrowAtlasAlt(noExt, ext);

source/funkin/backend/assets/Paths.hx

@@ -62,11 +62,10 @@ class Flags {
 	public static var REPO_URL:String = 'https://github.com/$REPO_OWNER/$REPO_NAME';
 
 	/**
-	 * Preferred sound extension for the game's audio files.
-	 * Currently is set to `mp3` for web targets, and `ogg` for other targets.
+	 * Preferred file extensions for the game's audio files.
 	 */
 	public static var SOUND_EXT:Array<String> = ["ogg", "mp3", "flac", "wav"];
-	public static var VIDEO_EXT:Array<String> = ["mp4", "webm"]; // is there any more?
+	public static var VIDEO_EXT:Array<String> = ["mp4", "webm", "mkv", "mov"]; // is there any more? // yes frakits
 	public static var IMAGE_EXT:Array<String> = ["png", "jpg", "jpeg"];
 
 	public static var DEFAULT_DISCORD_LOGO_KEY:String = "icon";

source/funkin/backend/system/Flags.hx

@@ -2,6 +2,7 @@ package funkin.editors.ui;
 
 import haxe.io.Bytes;
 import lime.ui.FileDialog;
+import flixel.util.typeLimit.OneOfTwo;
 #if lime_funkin
 import lime.ui.FileDialogFilter;
 #end
@@ -21,9 +22,13 @@ class UIFileExplorer extends UISliceSprite {
 
 	public var fileType:Array<String> = ["txt"];
 
-	public function new(x:Float, y:Float, ?w:Int, ?h:Int, fileType:Array<String>, ?onFile:(String, Bytes)->Void) {
+	public function new(x:Float, y:Float, ?w:Int, ?h:Int, fileType:OneOfTwo<String, Array<String>>, ?onFile:(String, Bytes)->Void) {
 		super(x, y, (w != null ? w : 320), (h != null ? h : 58), 'editors/ui/inputbox');
-		if (fileType != null) this.fileType = fileType;
+		if (fileType != null) {
+			// backward compat with custom editors
+			if (fileType is String) fileType = cast(fileType, String).split(';');
+			this.fileType = fileType;
+		}
 
 		if (onFile != null) this.onFile = onFile;