NuN GF

Adds a none/null option for the character selector dropdown
Also fixes a few null references that happen when one or both characters are null in the playstate

Author: Lasercar

source/funkin/play/GameOverSubState.hx

@@ -144,7 +144,7 @@ class GameOverSubState extends MusicBeatSubState
     // Pluck Boyfriend from the PlayState and place him (in the same position) in the GameOverSubState.
     // We can then play the character's `firstDeath` animation.
     if (PlayState.instance.isMinimalMode) {}
-    else
+    else if (boyfriend != null)
     {
       boyfriend = PlayState.instance.currentStage.getBoyfriend(true);
       boyfriend.canPlayOtherAnims = true;

source/funkin/play/PlayState.hx

@@ -1127,8 +1127,8 @@ class PlayState extends MusicBeatSubState
 
     if (!isMinimalMode)
     {
-      iconP1.updatePosition();
-      iconP2.updatePosition();
+      if (iconP1 != null) iconP1.updatePosition();
+      if (iconP1 != null) iconP2.updatePosition();
     }
 
     // Transition to the game over substate.

source/funkin/play/stage/Stage.hx

@@ -801,6 +801,7 @@ class Stage extends FlxSpriteGroup implements IPlayStateScriptedClass implements
 
   public override function remove(Sprite:FlxSprite, Splice:Bool = false):FlxSprite
   {
+    if (Sprite == null) return Sprite;
     var sprite:FlxSprite = cast Sprite;
     sprite.x -= x;
     sprite.y -= y;

source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx

@@ -12,6 +12,7 @@ import haxe.ui.containers.ScrollView;
 import haxe.ui.core.Screen;
 import flixel.tweens.FlxTween;
 import flixel.tweens.FlxEase;
+import haxe.ui.components.Button;
 
 // @:nullSafety // TODO: Fix null safety when used with HaxeUI build macros.
 @:access(funkin.ui.debug.charting.ChartEditorState)
@@ -21,14 +22,23 @@ class ChartEditorCharacterIconSelectorMenu extends ChartEditorBaseMenu
   public var charSelectScroll:ScrollView;
   public var charIconName:Label;
 
+  var currentCharButton:Button;
+
   public function new(chartEditorState2:ChartEditorState, charType:CharacterType, lockPosition:Bool = false)
   {
     super(chartEditorState2);
 
     initialize(charType, lockPosition);
     this.alpha = 0;
     this.y -= 10;
-    FlxTween.tween(this, {alpha: 1, y: this.y + 10}, 0.2, {ease: FlxEase.quartOut});
+    FlxTween.tween(this, {alpha: 1, y: this.y + 10}, 0.2,
+      {
+        ease: FlxEase.quartOut,
+        onComplete: function(_) {
+          // Just focus the button FFS. Idk why, but the scrollbar doesn't update until after the tween finishes with this????
+          currentCharButton.focus = true;
+        }
+      });
   }
 
   function initialize(charType:CharacterType, lockPosition:Bool)
@@ -70,13 +80,15 @@ class ChartEditorCharacterIconSelectorMenu extends ChartEditorBaseMenu
     var charIds:Array<String> = CharacterDataParser.listCharacterIds();
     charIds.sort(SortUtil.alphabetically);
 
+    charIds.insert(0, ""); // Add none/null/NuN character option
+
     var defaultText:String = '(choose a character)';
 
     for (charIndex => charId in charIds)
     {
       var charData:CharacterData = CharacterDataParser.fetchCharacterData(charId);
 
-      var charButton = new haxe.ui.components.Button();
+      var charButton = new Button();
       charButton.width = 70;
       charButton.height = 70;
       charButton.padding = 8;
@@ -85,15 +97,17 @@ class ChartEditorCharacterIconSelectorMenu extends ChartEditorBaseMenu
       if (charId == currentCharId)
       {
         // Scroll to the character if it is already selected.
-        charSelectScroll.hscrollPos = Math.floor(charIndex / 5) * 80;
-        charButton.selected = true;
+        charSelectScroll.vscrollPos = Math.floor(charIndex / 5) * 80;
+        charButton.focus = true;
+
+        defaultText = (currentCharId != "") ? '${charData.name} [${charId}]' : 'None';
 
-        defaultText = '${charData.name} [${charId}]';
+        currentCharButton = charButton;
       }
 
       var LIMIT = 6;
       charButton.icon = haxe.ui.util.Variant.fromImageData(CharacterDataParser.getCharPixelIconAsset(charId));
-      charButton.text = charData.name.length > LIMIT ? '${charData.name.substr(0, LIMIT)}.' : '${charData.name}';
+      charButton.text = (charId != "") ? (charData.name.length > LIMIT ? '${charData.name.substr(0, LIMIT)}.' : '${charData.name}') : 'None';
 
       charButton.onClick = _ -> {
         switch (charType)
@@ -104,12 +118,13 @@ class ChartEditorCharacterIconSelectorMenu extends ChartEditorBaseMenu
           default: throw 'Invalid charType: ' + charType;
         };
 
+        defaultText = (charId != "") ? '${charData.name} [${charId}]' : 'None';
         chartEditorState.healthIconsDirty = true;
         chartEditorState.refreshToolbox(ChartEditorState.CHART_EDITOR_TOOLBOX_METADATA_LAYOUT);
       };
 
       charButton.onMouseOver = _ -> {
-        charIconName.text = '${charData.name} [${charId}]';
+        charIconName.text = (charId != "") ? '${charData.name} [${charId}]' : 'None';
       };
       charButton.onMouseOut = _ -> {
         charIconName.text = defaultText;