[AAA] Exclude previous charas from roll

IllusionMods · Jul 22, 2024 · 8e040a7 · 8e040a7
1 parent 991f261
commit 8e040a7
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/src/AnimeAssAssistant.Core/Assistant.cs b/src/AnimeAssAssistant.Core/Assistant.cs
@@ -1,4 +1,4 @@
-using ChaCustom;
+using ChaCustom;
 using KKAPI.Utilities;
 using System;
 using System.Collections.Generic;
@@ -49,9 +49,20 @@ private void LoadRandomChara()
                 return;
             }
 
-            var path = files[UnityEngine.Random.Range(0, files.Length - 1)];
-            loadedCharacters.Add(path);
-            LoadChara(path);
+            files = files.Except(loadedCharacters).ToArray();
+            Log.Debug($"Found {files.Length} new PNG files in {AAA.SearchFolder.Value}");
+
+            if(files.Length > 0)
+            {
+                var path = files[UnityEngine.Random.Range(0, files.Length - 1)];
+                loadedCharacters.Add(path);
+                LoadChara(path);
+            }
+            else
+            {
+                LoadChara(loadedCharacters[0]);
+            }
+
         }
 
         private void RecycleCurrentChara()