Merge pull request ArchipelagoMW#2 from Taoshix/main

Various miscellaneous changes

Author: lilymnky-F

worlds/osu/Client.py

@@ -87,8 +87,7 @@ def _cmd_show_songs(self):
         """Display all songs in logic."""
         indexes = self.get_available_ids()
         self.output(f"You Have {self.count_item(726999999)} Performance Points, you need {self.ctx.preformance_points_needed} to unlock your goal.")
-        if not indexes:
-            self.output("You do not have any Songs in Logic")
+        self.output(f"You currently have {len(indexes)} songs in Logic")
         for i in indexes:
             song = list(self.ctx.pairs.keys())[i]
             beatmapset = self.ctx.pairs[song]
@@ -97,6 +96,7 @@ def _cmd_show_songs(self):
     def _cmd_show_all_songs(self):
         """Displays all songs included in current generation."""
         played_songs = self.get_played_songs()
+        self.output(f"You have played {len(played_songs)}/{len(self.ctx.pairs)-1} songs")
         for song in self.ctx.pairs:
             beatmapset = self.ctx.pairs[song]
             self.output(f"{song}: {beatmapset['title']} (ID: {beatmapset['id']}) {'(passed)' if song in played_songs else ''}")
@@ -148,6 +148,13 @@ def _cmd_get_last_scores(self, mode=''):
 
     def _cmd_download(self, number=''):
         """Downloads the given song number in '/show_songs', or 'victory' for the goal song."""
+        if number.lower() == 'next':
+            if len(self.get_available_ids()) > 0:
+                number = self.get_available_ids()[0]+1
+            else:
+                self.output("You have no songs to download")
+                return
+        
         try:
             song_number = int(number)-1
         except ValueError:
@@ -198,6 +205,9 @@ def get_played_ids(self):
     def get_played_songs(self):
         # Gets the Song value of each Song the player has played
         played_ids = self.get_played_ids()
+        if(-1 in played_ids):
+            played_ids.remove(-1) # Remove victory song from played songs as it was somehow showing up
+        
         played_songs = []
         for played in played_ids:
             played_songs.append(list(self.ctx.pairs.keys())[played])