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

Merge pull request #409 from FunkinCrew/bugfix/cut-pico-dadbattle

Browse source 
Fix bug where Pico dadbattle was playing over normal dadbattle
This commit is contained in:
Cameron Taylor 2024-03-25 13:43:05 -04:00 committed by GitHub
commit 01ff4acc1a
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 52674391511577300cdb8c08df293ea72099aa82 Subproject commit 3b6008899aefa1fe952c1cc5ebf9506464a86d3c

11
source/funkin/play/song/Song.hx
View file

@ -374,12 +374,17 @@ class Song implements IPlayStateScriptedClass implements IRegistryEntry<SongMeta
public function getFirstValidVariation(?diffId:String, ?possibleVariations:Array<String>):Null<String> public function getFirstValidVariation(?diffId:String, ?possibleVariations:Array<String>):Null<String>
{ {
if (variations == null) possibleVariations = variations; if (possibleVariations == null)
{
possibleVariations = variations;
possibleVariations.sort(SortUtil.defaultsThenAlphabetically.bind(Constants.DEFAULT_VARIATION_LIST));
}
if (diffId == null) diffId = listDifficulties(null, possibleVariations)[0]; if (diffId == null) diffId = listDifficulties(null, possibleVariations)[0];
for (variation in variations) for (variationId in possibleVariations)
{ {
if (difficulties.exists('$diffId-$variation')) return variation; var variationSuffix = (variationId != Constants.DEFAULT_VARIATION) ? '-$variationId' : '';
if (difficulties.exists('$diffId$variationSuffix')) return variationId;
} }
return null; return null;

5
source/funkin/util/Constants.hx
View file

@ -157,6 +157,11 @@ class Constants
*/ */
public static final DEFAULT_VARIATION:String = 'default'; public static final DEFAULT_VARIATION:String = 'default';
/**
* Standard variations used by the game.
*/
public static final DEFAULT_VARIATION_LIST:Array<String> = ['default', 'erect', 'pico'];
/** /**
* The default intensity for camera zooms. * The default intensity for camera zooms.
*/ */