cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-22 18:09:33 +00:00
Code Issues Releases Wiki Activity

sticker swag out

Browse source
This commit is contained in:
Cameron Taylor 2023-04-04 22:38:45 -04:00
parent 2de744cdcf
commit 41e6a270f0
2 changed files with 34 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/funkin/PauseSubState.hx
View file

@ -35,7 +35,7 @@ class PauseSubState extends MusicBeatSubstate
var bg:FlxSprite; var bg:FlxSprite;
var metaDataGrp:FlxTypedGroup<FlxSprite>; var metaDataGrp:FlxTypedGroup<FlxSprite>;
public function new(x:Float, y:Float) public function new()
{ {
super(); super();
@ -225,8 +225,7 @@ class PauseSubState extends MusicBeatSubstate
FlxTween.tween(bg, {alpha: 1}, 0.4, FlxTween.tween(bg, {alpha: 1}, 0.4,
{ {
ease: FlxEase.quartInOut, ease: FlxEase.quartInOut,
onComplete: function(_) onComplete: function(_) {
{
FlxTransitionableState.skipNextTransIn = true; FlxTransitionableState.skipNextTransIn = true;
FlxTransitionableState.skipNextTransOut = true; FlxTransitionableState.skipNextTransOut = true;

45
source/funkin/ui/StickerSubState.hx
View file

@ -1,5 +1,6 @@
package funkin.ui; package funkin.ui;
import flixel.FlxSprite;
import haxe.Json; import haxe.Json;
class StickerSubState extends MusicBeatSubstate class StickerSubState extends MusicBeatSubstate
@ -9,6 +10,18 @@ class StickerSubState extends MusicBeatSubstate
super(); super();
var stickerInfo:StickerInfo = new StickerInfo('sticker-set-1'); var stickerInfo:StickerInfo = new StickerInfo('sticker-set-1');
for (stickerSets in stickerInfo.getPack("all"))
{
trace(stickerSets);
}
}
}
class StickerSprite extends FlxSprite
{
public function new(x:Float, y:Float, stickerSet:String, stickerName:String):Void
{
super(x, y, Paths.file('assets/images/transitionSwag/' + stickerSet + '/' + stickerName + '.png'));
} }
} }
@ -16,24 +29,30 @@ class StickerInfo
{ {
public var name:String; public var name:String;
public var artist:String; public var artist:String;
public var stickers:Stickers; public var stickers:Map<String, Array<String>>;
public var stickerPacks:StickerPacks; public var stickerPacks:Map<String, Array<String>>;
public function new(stickerSet:String):Void public function new(stickerSet:String):Void
{ {
var jsonInfo:Dynamic = Json.parse(Paths.file('assets/images/transitionSwag/' + stickerSet + '/stickers.json')); var jsonInfo:StickerShit = cast Json.parse(Paths.file('assets/images/transitionSwag/' + stickerSet + '/stickers.json'));
this.name = jsonInfo.name;
this.artist = jsonInfo.artist;
this.stickers = jsonInfo.stickers;
this.stickerPacks = jsonInfo.stickerPacks;
}
public function getPack(packName:String):Array<String>
{
return this.stickerPacks[packName];
} }
} }
class Stickers // somethin damn cute just for the json to cast to!
typedef StickerShit =
{ {
var name:String; name:String,
var stickers:Array<String>; artist:String,
} stickers:Map<String, Array<String>>,
stickerPacks:Map<String, Array<String>>
class StickerPacks
{
var name:String;
// which stickers are in a pack, refers to the class Stickers!
var stickerPacks:Array<Stickers>;
} }