Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-24 00:27:59 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge cc3d8e10f2 into 0d8e4a5330

Browse source
This commit is contained in:
Abnormal 2024-11-18 14:25:42 +00:00 committed by GitHub
commit 517fc4b649
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/funkin/data/freeplay/album/AlbumData.hx
View file

@ -36,6 +36,13 @@ typedef AlbumData =
*/
public var albumTitleAsset:String;
/**
* Offsets for the album title.
*/
@:optional
@:default([0, 0])
public var albumTitleOffsets:Null<Array<Float>>;
/**
* An optional array of animations for the album title.
*/

8
source/funkin/ui/freeplay/Album.hx
View file

@ -76,6 +76,14 @@ class Album implements IRegistryEntry<AlbumData>
return _data.albumTitleAsset;
}
/**
* Get the offsets for the album title.
*/
public function getAlbumTitleOffsets():Null<Array<Float>>
{
return _data.albumTitleOffsets;
}
public function hasAlbumTitleAnimations()
{
return _data.albumTitleAnimations.length > 0;

12
source/funkin/ui/freeplay/AlbumRoll.hx
View file

@ -112,7 +112,7 @@ class AlbumRoll extends FlxSpriteGroup
var albumGraphic = Paths.image(albumData.getAlbumArtAssetKey());
newAlbumArt.replaceFrameGraphic(0, albumGraphic);
buildAlbumTitle(albumData.getAlbumTitleAssetKey());
buildAlbumTitle(albumData.getAlbumTitleAssetKey(), albumData.getAlbumTitleOffsets());
applyExitMovers();
@ -198,7 +198,7 @@ class AlbumRoll extends FlxSpriteGroup
albumTitle.visible = true;
}
public function buildAlbumTitle(assetKey:String):Void
public function buildAlbumTitle(assetKey:String, ?titleOffsets:Null<Array<Float>>):Void
{
if (albumTitle != null)
{
@ -206,6 +206,11 @@ class AlbumRoll extends FlxSpriteGroup
albumTitle = null;
}
if (titleOffsets == null)
{
titleOffsets = [0, 0];
}
albumTitle = FunkinSprite.createSparrow(925, 500, assetKey);
albumTitle.visible = albumTitle.frames != null && newAlbumArt.visible;
albumTitle.animation.addByPrefix('idle', 'idle0', 24, true);
@ -219,6 +224,9 @@ class AlbumRoll extends FlxSpriteGroup
albumTitle.zIndex = 1000;
albumTitle.x += titleOffsets[0];
albumTitle.y += titleOffsets[1];
if (_exitMovers != null) _exitMovers.set([albumTitle],
{
x: FlxG.width,