review deprecated logic

SolastaMods · Jan 29, 2024 · cab37db · cab37db
1 parent 6706d21
commit cab37db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/SolastaUnfinishedBusiness/Models/SubclassesContext.cs b/SolastaUnfinishedBusiness/Models/SubclassesContext.cs
@@ -25,7 +25,7 @@ private static Dictionary<CharacterSubclassDefinition, FeatureDefinitionSubclass
         get;
     } = [];
 
-    private static List<string> DeprecatedSubsList { get; } =
+    private static IEnumerable<string> DeprecatedSubsList { get; } =
     [
         "CollegeOfHarlequin",
         "MartialMarshal",
@@ -40,13 +40,13 @@ internal static void Load()
         RegisterClassesContext();
 
         var finalDeprecatedList =
-            DeprecatedSubsList.RemoveAll(x => Main.Settings.DeprecatedSubsReenableList.Contains(x));
+            DeprecatedSubsList.Where(x => !Main.Settings.DeprecatedSubsReenableList.Contains(x));
 
         foreach (var abstractSubClassInstance in typeof(AbstractSubclass)
                      .Assembly.GetTypes()
                      .Where(t => t.IsSubclassOf(typeof(AbstractSubclass)) && !t.IsAbstract)
                      .Select(t => (AbstractSubclass)Activator.CreateInstance(t))
-                     .Where(t => !DeprecatedSubsList.Contains(t.Subclass.Name)))
+                     .Where(t => !finalDeprecatedList.Contains(t.Subclass.Name)))
         {
             LoadSubclass(abstractSubClassInstance);
         }

diff --git a/SolastaUnfinishedBusiness/Settings.cs b/SolastaUnfinishedBusiness/Settings.cs
@@ -59,7 +59,7 @@ public class Settings : UnityModManager.ModSettings
     public bool DisableStreamlinedMultiLevelUp { get; set; } = true;
 
     // change this at your own risk as these subclasses will be fully removed from mod in the near future
-    public List<string> DeprecatedSubsReenableList { get; set; }
+    public List<string> DeprecatedSubsReenableList { get; set; } = [];
 
     public HashSet<String> MonstersThatShouldHaveDarkvision { get; set; } =
     [