Fix up bad numbering.

Author: DeamonHunter

ArchipelagoMuseDash/Archipelago/ItemHandler.cs

@@ -19,6 +19,7 @@ public class ItemHandler {
         public MusicInfo GoalSong { get; private set; }
         public int NumberOfMusicSheetsToWin { get; private set; }
         public int CurrentNumberOfMusicSheets { get; private set; }
+        private int _prospectiveSheetCount;
 
         public HashSet<string> SongsInLogic = new HashSet<string>();
         public HashSet<string> UnlockedSongUids = new HashSet<string>();
@@ -147,11 +148,9 @@ IMuseDashItem GetItemFromNetworkItem(NetworkItem item, bool otherPlayersItem) {
             }
 
             if (name == MusicSheetItemName) {
-                CurrentNumberOfMusicSheets++;
-
-                if (NumberOfMusicSheetsToWin == CurrentNumberOfMusicSheets)
+                if (CurrentNumberOfMusicSheets + 1 >= NumberOfMusicSheetsToWin)
                     return new SongItem(GoalSong);
-                return new MusicSheetItem(NumberOfMusicSheetsToWin - CurrentNumberOfMusicSheets) { Item = item };
+                return new MusicSheetItem() { Item = item };
             }
 
             if (ArchipelagoStatic.AlbumDatabase.TryGetMusicInfo(name, out var singularInfo))
@@ -166,6 +165,10 @@ IMuseDashItem GetItemFromNetworkItem(NetworkItem item, bool otherPlayersItem) {
             return null;
         }
 
+        public void AddMusicSheet() {
+            CurrentNumberOfMusicSheets++;
+        }
+
         public MusicInfo GetRandomUnfinishedSong() {
             //Not very efficient, but its a button clicked once.
             var unfinishedSongs = UnlockedSongUids.Where(x => !CompletedSongUids.Contains(x)).ToList();

ArchipelagoMuseDash/Archipelago/Items/MusicSheetItem.cs

@@ -10,19 +10,17 @@ public class MusicSheetItem : IMuseDashItem {
 
         public string TitleText => "Got a Music Sheet!!";
 
-        public string SongText => _amountOfTokensLeft > 0 ? $"Only {_amountOfTokensLeft} left" : "Can't hurt to have spares!";
+        public string SongText => TokensLeft() > 0 ? $"Only {TokensLeft()} left" : "Can't hurt to have spares!";
 
-        public string AuthorText => _amountOfTokensLeft > 0 ? "To unlock the final song!" : "";
+        public string AuthorText => TokensLeft() > 0 ? "To unlock the final song!" : "";
 
         public string PreUnlockBannerText => "A new song?";
-        public string PostUnlockBannerText => $"Music Sheet No. {ArchipelagoStatic.SessionHandler.ItemHandler.NumberOfMusicSheetsToWin - _amountOfTokensLeft}";
+        public string PostUnlockBannerText => $"Music Sheet No. {ArchipelagoStatic.SessionHandler.ItemHandler.NumberOfMusicSheetsToWin - (TokensLeft() + 1)}";
 
-        readonly int _amountOfTokensLeft;
+        float TokensLeft() => (ArchipelagoStatic.SessionHandler.ItemHandler.NumberOfMusicSheetsToWin - ArchipelagoStatic.SessionHandler.ItemHandler.CurrentNumberOfMusicSheets) - 1;
 
-        public MusicSheetItem(int amountLeft) {
-            _amountOfTokensLeft = amountLeft;
+        public void UnlockItem(ItemHandler handler, bool immediate) {
+            ArchipelagoStatic.SessionHandler.ItemHandler.AddMusicSheet();
         }
-
-        public void UnlockItem(ItemHandler handler, bool immediate) { }
     }
 }