fix milky dj offsets

VsFreyaDevs · Dec 1, 2024 · 10897eb · 10897eb
1 parent c6d4656
commit 10897eb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/assets/preload/data/characters/milky-speaker.json b/assets/preload/data/characters/milky-speaker.json
@@ -7,6 +7,7 @@
     "id": "milky",
     "flipX": false
   },
+  "offsets": [16, 82],
   "scale": 0.88,
   "singTime": 8.0,
   "animations": [

diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
@@ -2446,9 +2446,18 @@ class PlayState extends MusicBeatSubState
     // TODO: Add an option for this maybe?
     var commaSeparated:Bool = true;
     if (Preferences.extraScoreText)
-      scoreText.text = '[ Score: ${FlxStringUtil.formatMoney(songScoreInt, false, commaSeparated)} • Misses: $songMisses/$totalPlayed • Accuracy: $accuracy • $ratingName]';
+    {
+      if (isBotPlayMode)
+        scoreText.text = '[ Score: ${FlxStringUtil.formatMoney(songScoreInt, false, commaSeparated)} • Misses: $songMisses/$totalPlayed • BOTPLAY (Scores will NOT be saved!) ]';
+      else
+        scoreText.text = '[ Score: ${FlxStringUtil.formatMoney(songScoreInt, false, commaSeparated)} • Misses: $songMisses/$totalPlayed • Accuracy: $accuracy • $ratingName]';
+    }
     else
-      scoreText.text = 'Score: ${FlxStringUtil.formatMoney(songScoreInt, false, commaSeparated)} ';
+    {
+      if (isBotPlayMode) scoreText.text = 'Score: ${FlxStringUtil.formatMoney(songScoreInt, false, commaSeparated)} | BOTPLAY (Scores will NOT be saved!)';
+      else
+        scoreText.text = 'Score: ${FlxStringUtil.formatMoney(songScoreInt, false, commaSeparated)}';
+    }
     // }
   }
 

diff --git a/source/funkin/ui/title/TitleState.hx b/source/funkin/ui/title/TitleState.hx
@@ -190,22 +190,16 @@ class TitleState extends MusicBeatState
   var maskShader = new LeftMaskShader();
 
   var bg:FunkinSprite;
-  var introBg:FunkinSprite;
 
   function startIntro():Void
   {
     if (!initialized || FlxG.sound.music == null) playMenuMusic();
 
     persistentUpdate = true;
 
-    introBg = new FunkinSprite(-1).makeSolidColor(FlxG.width + 2, FlxG.height, FlxColor.BLACK);
-    introBg.screenCenter();
-    introBg.visible = true;
-    add(introBg);
-
-    if (!gfThingy) bg = new FunkinSprite(-1).makeSolidColor(FlxG.width + 2, FlxG.height, 0xFFC55500);
-    else
-      bg = new FunkinSprite(-1).makeSolidColor(FlxG.width + 2, FlxG.height, FlxColor.BLACK);
+    // if (!gfThingy) bg = new FunkinSprite(-1).makeSolidColor(FlxG.width + 2, FlxG.height, 0xFFC55500);
+    // else
+    bg = new FunkinSprite(-1).makeSolidColor(FlxG.width + 2, FlxG.height, FlxColor.BLACK);
     bg.screenCenter();
     bg.visible = false;
     add(bg);
@@ -682,8 +676,7 @@ class TitleState extends MusicBeatState
     {
       remove(ngSpr);
 
-      if (introBg != null) introBg.visible = false;
-      if (bg != null) bg.visible = true;
+      if (bg != null) bg.color = 0xFFC55500;
 
       FlxG.camera.flash(FlxColor.WHITE, initialized ? 1 : 4);