Merge pull request #1135 from FunkinCrew/VioletSnowLeopard/squashed-capsule
[PUBLIC PR] Fix Two Issues With Song Text on Freeplay Capsules
This commit is contained in:
@@ -568,6 +568,7 @@ class FreeplayState extends MusicBeatSubState
|
||||
// Reminder, this is a callback function being set, rather than these being called here in create()
|
||||
letterSort.changeSelectionCallback = (str) -> {
|
||||
var curSong:Null<FreeplaySongData> = grpCapsules.members[curSelected]?.freeplayData;
|
||||
grpCapsules.members[curSelected].selected = false;
|
||||
|
||||
switch (str)
|
||||
{
|
||||
@@ -2077,6 +2078,7 @@ class FreeplayState extends MusicBeatSubState
|
||||
|
||||
var previousVariation:String = currentVariation;
|
||||
var daSong:Null<FreeplaySongData> = grpCapsules.members[curSelected].freeplayData;
|
||||
grpCapsules.members[curSelected].selected = false;
|
||||
|
||||
// Available variations for current character. We get this since bf is usually `default` variation, and `pico` is `pico`
|
||||
// but sometimes pico can be the default variation (weekend 1 songs), and bf can be `bf` variation (darnell)
|
||||
|
||||
@@ -506,8 +506,6 @@ class SongMenuItem extends FlxSpriteGroup
|
||||
spr.visible = value;
|
||||
}
|
||||
|
||||
textAppear();
|
||||
|
||||
updateSelected();
|
||||
}
|
||||
|
||||
@@ -678,7 +676,11 @@ class SongMenuItem extends FlxSpriteGroup
|
||||
*/
|
||||
public function confirm():Void
|
||||
{
|
||||
if (songText != null) songText.flickerText();
|
||||
if (songText != null)
|
||||
{
|
||||
textAppear();
|
||||
songText.flickerText();
|
||||
}
|
||||
if (pixelIcon != null && pixelIcon.visible)
|
||||
{
|
||||
pixelIcon.animation.play('confirm');
|
||||
|
||||
Reference in New Issue
Block a user