mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-12-25 14:46:43 +00:00
Merge branch 'ninjamuffin99/funk-270' into rewrite/master
This commit is contained in:
commit
a643765db4
|
@ -66,7 +66,7 @@ class AlbumRoll extends FlxSpriteGroup
|
||||||
add(newAlbumArt);
|
add(newAlbumArt);
|
||||||
|
|
||||||
difficultyStars = new DifficultyStars(140, 39);
|
difficultyStars = new DifficultyStars(140, 39);
|
||||||
difficultyStars.stars.visible = false;
|
difficultyStars.visible = false;
|
||||||
add(difficultyStars);
|
add(difficultyStars);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -149,7 +149,7 @@ class AlbumRoll extends FlxSpriteGroup
|
||||||
newAlbumArt.visible = true;
|
newAlbumArt.visible = true;
|
||||||
newAlbumArt.playAnimation(animNames.get('$albumId-active'), false, false, false);
|
newAlbumArt.playAnimation(animNames.get('$albumId-active'), false, false, false);
|
||||||
|
|
||||||
difficultyStars.stars.visible = false;
|
difficultyStars.visible = false;
|
||||||
new FlxTimer().start(0.75, function(_) {
|
new FlxTimer().start(0.75, function(_) {
|
||||||
// showTitle();
|
// showTitle();
|
||||||
showStars();
|
showStars();
|
||||||
|
@ -172,6 +172,7 @@ class AlbumRoll extends FlxSpriteGroup
|
||||||
*/
|
*/
|
||||||
public function showStars():Void
|
public function showStars():Void
|
||||||
{
|
{
|
||||||
difficultyStars.stars.visible = true; // true;
|
difficultyStars.visible = true; // true;
|
||||||
|
difficultyStars.flameCheck();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,7 +19,7 @@ class DifficultyStars extends FlxSpriteGroup
|
||||||
|
|
||||||
public var stars:FlxAtlasSprite;
|
public var stars:FlxAtlasSprite;
|
||||||
|
|
||||||
var flames:FreeplayFlames;
|
public var flames:FreeplayFlames;
|
||||||
|
|
||||||
var hsvShader:HSVShader;
|
var hsvShader:HSVShader;
|
||||||
|
|
||||||
|
@ -80,11 +80,16 @@ class DifficultyStars extends FlxSpriteGroup
|
||||||
curDifficulty = difficulty - 1;
|
curDifficulty = difficulty - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
flameCheck();
|
||||||
|
|
||||||
|
return difficulty;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function flameCheck():Void
|
||||||
|
{
|
||||||
if (difficulty > 10) flames.flameCount = difficulty - 10;
|
if (difficulty > 10) flames.flameCount = difficulty - 10;
|
||||||
else
|
else
|
||||||
flames.flameCount = 0;
|
flames.flameCount = 0;
|
||||||
|
|
||||||
return difficulty;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function set_curDifficulty(value:Int):Int
|
function set_curDifficulty(value:Int):Int
|
||||||
|
|
Loading…
Reference in a new issue