Adjust song unlocking so that it works better when you get multiple m…

…usic sheets in a row.
DeamonHunter · Mar 16, 2023 · 6179c98 · 6179c98
1 parent 90fde16
commit 6179c98
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/ArchipelagoMuseDash/Archipelago/ItemHandler.cs b/ArchipelagoMuseDash/Archipelago/ItemHandler.cs
@@ -147,11 +147,8 @@ IMuseDashItem GetItemFromNetworkItem(NetworkItem item, bool otherPlayersItem) {
                 return new ExternalItem(name, playerName) { Item = item };
             }
 
-            if (name == MusicSheetItemName) {
-                if (CurrentNumberOfMusicSheets + 1 >= NumberOfMusicSheetsToWin)
-                    return new SongItem(GoalSong);
+            if (name == MusicSheetItemName)
                 return new MusicSheetItem() { Item = item };
-            }
 
             if (ArchipelagoStatic.AlbumDatabase.TryGetMusicInfo(name, out var singularInfo))
                 return new SongItem(singularInfo) { Item = item };
@@ -167,6 +164,15 @@ IMuseDashItem GetItemFromNetworkItem(NetworkItem item, bool otherPlayersItem) {
 
         public void AddMusicSheet() {
             CurrentNumberOfMusicSheets++;
+
+            if (CurrentNumberOfMusicSheets < NumberOfMusicSheetsToWin || UnlockedSongUids.Contains(GoalSong.uid))
+                return;
+
+            ArchipelagoStatic.ArchLogger.LogDebug("ItemHandler", "Force unlocking the goal song as we reached the goal.");
+
+            UnlockSong(GoalSong);
+            MusicTagManager.instance.RefreshDBDisplayMusics();
+            ArchipelagoStatic.SongSelectPanel?.RefreshMusicFSV();
         }
 
         public MusicInfo GetRandomUnfinishedSong() {

diff --git a/ArchipelagoMuseDash/Archipelago/ItemUnlockHandler.cs b/ArchipelagoMuseDash/Archipelago/ItemUnlockHandler.cs
@@ -93,6 +93,14 @@ void ShowItem(IMuseDashItem item) {
             if (_unlockingItem != null)
                 throw new Exception("Tried to unlock an item while one was already unlocking.");
 
+            if (item is MusicSheetItem) {
+                var handler = ArchipelagoStatic.SessionHandler.ItemHandler;
+
+                if (handler.CurrentNumberOfMusicSheets + 1 == handler.NumberOfMusicSheetsToWin)
+                    item = new SongItem(handler.GoalSong);
+            }
+
+
             _unlockingItem = item;
             _hasUnlockedItem = false;
 

diff --git a/ArchipelagoMuseDash/ArchipelagoMuseDashMod.cs b/ArchipelagoMuseDash/ArchipelagoMuseDashMod.cs
@@ -6,7 +6,7 @@
 using MelonLoader;
 using UnityEngine;
 
-[assembly: MelonInfo(typeof(ArchipelagoMuseDashMod), "Archipelago Muse Dash", "0.7.0", "DeamonHunter")]
+[assembly: MelonInfo(typeof(ArchipelagoMuseDashMod), "Archipelago Muse Dash", "0.7.2", "DeamonHunter")]
 [assembly: MelonGame("PeroPeroGames", "MuseDash")]
 
 namespace ArchipelagoMuseDash {