diff --git a/source/funkin/PauseSubState.hx b/source/funkin/PauseSubState.hx index ffba8f0c2..f5a236678 100644 --- a/source/funkin/PauseSubState.hx +++ b/source/funkin/PauseSubState.hx @@ -35,7 +35,7 @@ class PauseSubState extends MusicBeatSubstate var bg:FlxSprite; var metaDataGrp:FlxTypedGroup; - public function new(x:Float, y:Float) + public function new() { super(); @@ -225,8 +225,7 @@ class PauseSubState extends MusicBeatSubstate FlxTween.tween(bg, {alpha: 1}, 0.4, { ease: FlxEase.quartInOut, - onComplete: function(_) - { + onComplete: function(_) { FlxTransitionableState.skipNextTransIn = true; FlxTransitionableState.skipNextTransOut = true; diff --git a/source/funkin/ui/StickerSubState.hx b/source/funkin/ui/StickerSubState.hx index bbc5e234c..3411f2c57 100644 --- a/source/funkin/ui/StickerSubState.hx +++ b/source/funkin/ui/StickerSubState.hx @@ -1,5 +1,6 @@ package funkin.ui; +import flixel.FlxSprite; import haxe.Json; class StickerSubState extends MusicBeatSubstate @@ -9,6 +10,18 @@ class StickerSubState extends MusicBeatSubstate super(); 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 artist:String; - public var stickers:Stickers; - public var stickerPacks:StickerPacks; + public var stickers:Map>; + public var stickerPacks:Map>; 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 + { + return this.stickerPacks[packName]; } } -class Stickers +// somethin damn cute just for the json to cast to! +typedef StickerShit = { - var name:String; - var stickers:Array; -} - -class StickerPacks -{ - var name:String; - // which stickers are in a pack, refers to the class Stickers! - var stickerPacks:Array; + name:String, + artist:String, + stickers:Map>, + stickerPacks:Map> }