Add Settings To Control Which Boxes To Sort

foohyfooh · Nov 25, 2022 · fa95d0a · fa95d0a
1 parent 00e9583
commit fa95d0a
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 18 deletions.
diff --git a/SortingPlugin/PluginMain.cs b/SortingPlugin/PluginMain.cs
@@ -144,10 +144,7 @@ public static void LoadMenuStrip() {
 
         if(gen != 1) {
           ToolStripMenuItem nationalDexSortButton = new ToolStripMenuItem("National Pokédex");
-          nationalDexSortButton.Click += (s, e) => {
-            saveFileEditor.SAV.SortBoxes();
-            saveFileEditor.ReloadSlots();
-          };
+          nationalDexSortButton.Click += (s, e) => SortByFunctions();
           sortItems.Add(nationalDexSortButton);
 
           if(gen >= 7 && !isBDSP) {
@@ -163,9 +160,15 @@ public static void LoadMenuStrip() {
       sortItems.Add(settingsButton);
     }
 
-    private static void SortByFunctions(Func<PKM, IComparable>[] sortFunctions) {
-      IEnumerable<PKM> sortMethod(IEnumerable<PKM> pkms, int start) => pkms.OrderByCustom(sortFunctions);
-      saveFileEditor.SAV.SortBoxes(0, -1, sortMethod);
+    private static void SortByFunctions(Func<PKM, IComparable>[] sortFunctions = null) {
+      int beginIndex = PluginSettings.Default.SortBeginBox - 1;
+      int endIndex = PluginSettings.Default.SortEndBox < 0 ? -1 : PluginSettings.Default.SortEndBox - 1;
+      if (sortFunctions != null) {
+        IEnumerable<PKM> sortMethod(IEnumerable<PKM> pkms, int start) => pkms.OrderByCustom(sortFunctions);
+        saveFileEditor.SAV.SortBoxes(beginIndex, endIndex, sortMethod);
+      } else {
+        saveFileEditor.SAV.SortBoxes(beginIndex, endIndex);
+      }
       saveFileEditor.ReloadSlots();
     }
 

diff --git a/SortingPlugin/PluginSettings.Designer.cs b/SortingPlugin/PluginSettings.Designer.cs
diff --git a/SortingPlugin/PluginSettings.settings b/SortingPlugin/PluginSettings.settings
@@ -1,9 +1,15 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="SortingPlugin.Properties" GeneratedClassName="PluginSettings">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="SortingPlugin" GeneratedClassName="PluginSettings">
   <Profiles />
   <Settings>
-    <Setting Name="ShowIndividualPokedéxes" Type="System.Boolean" Scope="User">
+    <Setting Name="ShowIndividualPokedéxes" Description="Show the individual area Pokedéxes for those that have it." Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="SortBeginBox" Description="The box to begin sorting from." Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">1</Value>
+    </Setting>
+    <Setting Name="SortEndBox" Description="The box to ending sorting in.  -1 can be used to specify the last box." Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">-1</Value>
+    </Setting>
   </Settings>
-</SettingsFile>
+</SettingsFile>
diff --git a/SortingPlugin/app.config b/SortingPlugin/app.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
       <section name="SortingPlugin.Properties.PluginSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
       <section name="SortingPlugin.PluginSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     </sectionGroup>
@@ -27,6 +27,12 @@
       <setting name="ShowIndividualPokedéxes" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="SortBeginBox" serializeAs="String">
+        <value>1</value>
+      </setting>
+      <setting name="SortEndBox" serializeAs="String">
+        <value>-1</value>
+      </setting>
     </SortingPlugin.PluginSettings>
   </userSettings>
 </configuration>