Variation fallback & chartdata only difficulties in difficulty toolbox

Update develop branch

.github/ISSUE_TEMPLATE/bug.yml

@@ -20,13 +20,13 @@ body:
       label: Platform
       description: Which platform are you playing on?
       options:
+        - Android
+        - iOS/iPadOS
         - Newgrounds (Web/HTML5)
         - Itch.io (Web/HTML5)
-        - Itch.io (Downloadable Build) - Windows
-        - Itch.io (Downloadable Build) - MacOS
-        - Itch.io (Downloadable Build) - Linux
-        - Google Playstore - Android
-        - App Store - iOS
+        - Windows (Downloadable Build)
+        - MacOS (Downloadable Build)
+        - Linux (Downloadable Build)
         - Compiled from GitHub Source Code
     validations:
       required: true
@@ -43,11 +43,23 @@ body:
         - Safari
         - Other (Specify in Description field)
 
+  - type: input
+    attributes:
+      label: Mobile Device Model
+      description: (Mobile users only) What mobile device are you playing on?
+      placeholder: ex. iPhone 16, Galaxy S25, iPad 11th Gen
+
+  - type: input
+    attributes:
+      label: Mobile OS Version
+      description: (Mobile users only) What version is your Operating System?
+      placeholder: ex. iOS 18.5, Android 15, iPadOS 18.5
+
   - type: input
     attributes:
       label: Version
       description: Which version are you playing on? The game version is in the bottom left corner of the main menu.
-      placeholder: ex. 0.6.4
+      placeholder: ex. 0.7.2
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/charting.yml

@@ -21,32 +21,22 @@ body:
       label: Platform
       description: Which platform are you playing on?
       options:
+        - Android
+        - iOS/iPadOS
         - Newgrounds (Web/HTML5)
         - Itch.io (Web/HTML5)
-        - Itch.io (Downloadable Build) - Windows
-        - Itch.io (Downloadable Build) - MacOS
-        - Itch.io (Downloadable Build) - Linux
+        - Windows (Downloadable Build)
+        - MacOS (Downloadable Build)
+        - Linux (Downloadable Build)
         - Compiled from GitHub Source Code
     validations:
       required: true
 
-  - type: dropdown
-    attributes:
-      label: Browser
-      description: (Web/HTML5 users only) Which browser are you playing on?
-      options:
-        - Google Chrome
-        - Microsoft Edge
-        - Firefox
-        - Opera
-        - Safari
-        - Other (Specify in Description field)
-
   - type: input
     attributes:
       label: Version
       description: Which version are you playing on? The game version is in the bottom left corner of the main menu.
-      placeholder: ex. 0.6.4
+      placeholder: ex. 0.7.2
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/compiling.yml

@@ -22,6 +22,8 @@ body:
       label: Platform
       description: Which platform are you compiling for?
       options:
+       - Android
+       - iOS/iPadOS
        - Web/HTML5
        - Desktop (Windows)
        - Desktop (Mac)
@@ -34,7 +36,7 @@ body:
     attributes:
       label: Version
       description: Which version are you compiling? The game version is in the bottom left corner of the main menu or in the project.hxp file.
-      placeholder: ex. 0.6.4
+      placeholder: ex. 0.7.2
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/crash.yml

@@ -21,11 +21,13 @@ body:
       label: Platform
       description: Which platform are you playing on?
       options:
+        - Android
+        - iOS/iPadOS
         - Newgrounds (Web/HTML5)
         - Itch.io (Web/HTML5)
-        - Itch.io (Downloadable Build) - Windows
-        - Itch.io (Downloadable Build) - MacOS
-        - Itch.io (Downloadable Build) - Linux
+        - Windows (Downloadable Build)
+        - MacOS (Downloadable Build)
+        - Linux (Downloadable Build)
         - Compiled from GitHub Source Code
     validations:
       required: true
@@ -42,11 +44,23 @@ body:
         - Safari
         - Other (Specify in Description field)
 
+  - type: input
+    attributes:
+      label: Mobile Device Model
+      description: (Mobile users only) What mobile device are you playing on?
+      placeholder: ex. iPhone 16, Galaxy S25, iPad 11th Gen
+
+  - type: input
+    attributes:
+      label: Mobile OS Version
+      description: (Mobile users only) What version is your Operating System?
+      placeholder: ex. iOS 18.5, Android 15, iPadOS 18.5
+
   - type: input
     attributes:
       label: Version
       description: Which version are you playing on? The game version is in the bottom left corner of the main menu.
-      placeholder: ex. 0.6.4
+      placeholder: ex. 0.7.2
     validations:
       required: true
 
@@ -77,7 +91,7 @@ body:
   - type: textarea
     attributes:
       label: Crash logs
-      description: These can be found in the logs folder where Funkin.exe is.
+      description: These can be found in the logs folder where Funkin.exe is, or in your mobile device's file explorer.
       placeholder: Upload your logs here...
     validations:
       required: true

CHANGELOG.md

@@ -412,7 +412,7 @@ Select. ([3d3e2bd](https://github.com/FunkinCrew/Funkin/commit/3d3e2bd3786b85814
 * @JackXson-Real made their first contribution in [#4346](https://github.com/FunkinCrew/Funkin/pull/4346)
 * @VioletSnowLeopard made their first contribution in [#4382](https://github.com/FunkinCrew/Funkin/pull/4382)
 * @superpowers04 made their first contribution in [#4729](https://github.com/FunkinCrew/Funkin/pull/4729)
-* @ShadzXD made their first contribution in [#62](https://github.com/FunkinCrew/Funkin/pull/4729)
+* @ShadzXD made their first contribution in [funkin.assets#62](https://github.com/FunkinCrew/funkin.assets/pull/62)
 
 
 

docs/CONTRIBUTING.md

@@ -60,7 +60,7 @@ This section provides guidelines to follow when [opening an issue](https://githu
 
 ## Requirements
 Make sure you're playing:
-- the latest version of the game (currently v0.6.4)
+- the latest version of the game (currently v0.7.2)
 - without any mods
 - on [Newgrounds](https://www.newgrounds.com/portal/view/770371) or downloaded from [itch.io](https://ninja-muffin24.itch.io/funkin)
 

hmm.json

@@ -46,7 +46,7 @@
       "type": "git",
       "dir": null,
       "ref": "08fc955ca87f192a971719a675f1d3b21709725d",
-      "url": "https://github.com/FunkinCrew/flixel-mobile"
+      "url": "https://github.com/FunkinCrew/flixel"
     },
     {
       "name": "flixel-addons",
@@ -171,7 +171,7 @@
       "type": "git",
       "dir": null,
       "ref": "c750ebf6b48c4bc018abe9855fbae5ffdbc4771a",
-      "url": "https://github.com/FunkinCrew/lime-mobile"
+      "url": "https://github.com/FunkinCrew/lime"
     },
     {
       "name": "mconsole",
@@ -213,13 +213,13 @@
       "type": "git",
       "dir": null,
       "ref": "a0df7c3afe360c9af59a76e45007dbf4e53b5131",
-      "url": "https://github.com/FunkinCrew/openfl-mobile"
+      "url": "https://github.com/FunkinCrew/openfl"
     },
     {
       "name": "polymod",
       "type": "git",
       "dir": null,
-      "ref": "3e030c81de99ca84acde681431f806d8103bcf6e",
+      "ref": "866f19edbcd872b3358f9a41f2f6a24c71c191d1",
       "url": "https://github.com/larsiusprime/polymod"
     },
     {

source/funkin/FunkinMemory.hx

@@ -350,7 +350,7 @@ class FunkinMemory
       if (sound != null)
       {
         Assets.cache.removeSound(key);
-        previousCachedTextures.remove(key);
+        previousCachedSounds.remove(key);
       }
     }
     Assets.cache.clear("songs");

source/funkin/data/song/importer/FNFLegacyImporter.hx

@@ -37,7 +37,7 @@ class FNFLegacyImporter
   {
     trace('Migrating song metadata from FNF Legacy.');
 
-    var songMetadata:SongMetadata = new SongMetadata('Import', Constants.DEFAULT_ARTIST, 'default');
+    var songMetadata:SongMetadata = new SongMetadata('Import', Constants.DEFAULT_ARTIST, Constants.DEFAULT_CHARTER, Constants.DEFAULT_VARIATION);
 
     // Set generatedBy string for debugging.
     songMetadata.generatedBy = 'Chart Editor Import (FNF Legacy)';

source/funkin/data/song/migrator/SongDataMigrator.hx

@@ -24,7 +24,7 @@ class SongDataMigrator
 
   public static function migrate_SongMetadata_v2_1_0(input:SongData_v2_1_0.SongMetadata_v2_1_0):SongMetadata
   {
-    var result:SongMetadata = new SongMetadata(input.songName, input.artist, input.variation);
+    var result:SongMetadata = new SongMetadata(input.songName, input.artist, Constants.DEFAULT_CHARTER, input.variation);
     result.version = SongRegistry.SONG_METADATA_VERSION;
     result.timeFormat = input.timeFormat;
     result.divisions = input.divisions;
@@ -66,7 +66,7 @@ class SongDataMigrator
 
   public static function migrate_SongMetadata_v2_0_0(input:SongData_v2_0_0.SongMetadata_v2_0_0):SongMetadata
   {
-    var result:SongMetadata = new SongMetadata(input.songName, input.artist, input.variation);
+    var result:SongMetadata = new SongMetadata(input.songName, input.artist, Constants.DEFAULT_CHARTER, input.variation);
     result.version = SongRegistry.SONG_METADATA_VERSION;
     result.timeFormat = input.timeFormat;
     result.divisions = input.divisions;

source/funkin/play/PlayState.hx

@@ -1447,6 +1447,8 @@ class PlayState extends MusicBeatSubState
         }
       }
 
+      if (!vwooshTimer.finished) vwooshTimer.active = false;
+
       // Pause camera tweening, and keep track of which tweens we pause.
       if (cameraFollowTween != null && cameraFollowTween.active)
       {

source/funkin/ui/debug/charting/ChartEditorState.hx

@@ -1306,7 +1306,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
     var result:Null<SongMetadata> = songMetadata.get(selectedVariation);
     if (result == null)
     {
-      result = new SongMetadata('Default Song Name', Constants.DEFAULT_ARTIST, selectedVariation);
+      result = new SongMetadata('Default Song Name', Constants.DEFAULT_ARTIST, Constants.DEFAULT_CHARTER, selectedVariation);
       songMetadata.set(selectedVariation, result);
     }
     return result;

source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx

@@ -580,7 +580,7 @@ class ChartEditorDialogHandler
       dialog.hideDialog(DialogButton.CANCEL);
     }
 
-    var newSongMetadata:SongMetadata = new SongMetadata('', '', Constants.DEFAULT_VARIATION);
+    var newSongMetadata:SongMetadata = new SongMetadata('', '', '', Constants.DEFAULT_VARIATION);
 
     newSongMetadata.variation = targetVariation;
     newSongMetadata.playData.difficulties = (erect) ? ['erect', 'nightmare'] : ['easy', 'normal', 'hard'];
@@ -1219,7 +1219,8 @@ class ChartEditorDialogHandler
       var dialogVariationName:Null<TextField> = dialog.findComponent('dialogVariationName', TextField);
       if (dialogVariationName == null) throw 'Could not locate dialogVariationName TextField in Add Variation dialog';
 
-      var pendingVariation:SongMetadata = new SongMetadata(dialogSongName.text, dialogSongArtist.text, dialogVariationName.text.toLowerCase());
+      var pendingVariation:SongMetadata = new SongMetadata(dialogSongName.text, dialogSongArtist.text, dialogSongCharter.text,
+        dialogVariationName.text.toLowerCase());
 
       pendingVariation.playData.stage = dialogStage.value.id;
       pendingVariation.playData.noteStyle = dialogNoteStyle.value.id;

source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx

@@ -131,10 +131,16 @@ class ChartEditorImportExportHandler
     state.songMetadata = newSongMetadata;
     state.songChartData = newSongChartData;
 
-    if (!state.songMetadata.exists(state.selectedVariation))
+    var variationMetadata:Null<SongMetadata> = state.songMetadata.get(state.selectedVariation);
+    if (variationMetadata == null)
     {
-      state.selectedVariation = Constants.DEFAULT_VARIATION;
+      // Use the default variation, or the first available variation if that doesn't exist for some reason.
+      if (state.availableDifficulties.indexOf(Constants.DEFAULT_VARIATION) < 0) state.selectedVariation = state.availableVariations[0];
+      else state.selectedVariation = Constants.DEFAULT_VARIATION;
+
+      variationMetadata = state.songMetadata.get(state.selectedVariation);
     }
+
     // Use the first available difficulty as a fallback if the currently selected one cannot be found.
     if (state.availableDifficulties.indexOf(state.selectedDifficulty) < 0) state.selectedDifficulty = state.availableDifficulties[0];
 

source/funkin/ui/debug/charting/toolboxes/ChartEditorDifficultyToolbox.hx

@@ -6,7 +6,6 @@ import funkin.data.song.SongRegistry;
 import haxe.ui.components.Button;
 import haxe.ui.containers.dialogs.Dialogs;
 import haxe.ui.containers.dialogs.Dialog.DialogButton;
-import funkin.data.song.SongData.SongMetadata;
 import haxe.ui.components.DropDown;
 import haxe.ui.components.HorizontalSlider;
 import funkin.util.VersionUtil;
@@ -215,6 +214,16 @@ class ChartEditorDifficultyToolbox extends ChartEditorBaseToolbox
 
       var difficultyList:Array<String> = variationMetadata.playData.difficulties;
 
+      var variationChartdata:Null<SongChartData> = chartEditorState.songChartData.get(curVariation);
+      if(variationChartdata != null)
+      {
+        var keys:Array<String> = [for (x in variationChartdata.notes.keys()) x];
+        for (key in keys)
+          {
+            difficultyList.pushUnique(key);
+          }
+      }
+
       for (difficulty in difficultyList)
       {
         var _treeDifficulty:TreeViewNode = treeVariation.addNode(