1.6.3.0

mudzereli · Aug 26, 2024 · 1885146 · 1885146
1 parent 12d9d12
commit 1885146
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 10 deletions.
diff --git a/.vs/mudsort/v17/.suo b/.vs/mudsort/v17/.suo
diff --git a/PluginCore.cs b/PluginCore.cs
@@ -197,13 +197,12 @@ private void Current_RenderFrame_Sort(object sender, EventArgs e)
             }
             else if (CURRENT_STATE == State.BUILDING_LIST)
             {
-                String[] sortKeys = MainView.edtSortString.Text.Split(',');
                 System.Collections.ArrayList sortValueList = new System.Collections.ArrayList();
-                for (int i = sortKeys.Length - 1; i >= 0; i--)
+                for (int i = sortFlags.Count - 1; i >= 0; i--)
                 {
+                    SortFlag sf = (SortFlag)sortFlags[i];
                     foreach (WorldObject worldObject in sortList)
                     {
-                        SortFlag sf = SortFlag.decode(sortKeys[i]);
                         String sortMetric = sf.valueOf(worldObject);
                         if (!sortValueList.Contains(sortMetric))
                         {
@@ -212,15 +211,15 @@ private void Current_RenderFrame_Sort(object sender, EventArgs e)
                     }
                     sortValueList.Sort(new AlphanumComparator());
                     System.Collections.ArrayList newSortList = new System.Collections.ArrayList();
-                    if (!(sortKeys[i].Length == 3 && sortKeys[i].Substring(2, 1).Equals("-")))
+                    if (sf.descending)
                     {
                         sortValueList.Reverse();
                     }
                     foreach (Object sortValue in sortValueList)
                     {
                         foreach (WorldObject worldObject in sortList)
                         {
-                            String sortMetric = SortFlag.decode(sortKeys[i]).valueOf(worldObject);
+                            String sortMetric = sf.valueOf(worldObject);
                             if (sortMetric.Equals(sortValue))
                             {
                                 newSortList.Add(worldObject);
@@ -403,7 +402,7 @@ public void rebuildLstSortSettings()
             }
 
         }
-        MainView.edtSortString.Text = sortFlagListToString();
+        //MainView.edtSortString.Text = sortFlagListToString();
     }
 
     public void setDestContainer()
@@ -476,7 +475,7 @@ public bool ProcessMSCommand(string msCommand)
     {
         msCommand = msCommand.ToLower().Trim();
 
-        if (msCommand.StartsWith("/ms help"))
+        if (msCommand.StartsWith("/ms help") || msCommand.Equals("/ms"))
         {
             Util.WriteToChat("listing help / commands...");
             Util.WriteToChat("/ms start - start sorting");

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.2.0")]
-[assembly: AssemblyFileVersion("1.6.2.0")]
+[assembly: AssemblyVersion("1.6.3.0")]
+[assembly: AssemblyFileVersion("1.6.3.0")]
diff --git a/bin/Release/mudsort.dll b/bin/Release/mudsort.dll
diff --git a/bin/Release/mudsort.pdb b/bin/Release/mudsort.pdb
diff --git a/bin/Release/stdole.dll b/bin/Release/stdole.dll
diff --git a/obj/Release/DesignTimeResolveAssemblyReferences.cache b/obj/Release/DesignTimeResolveAssemblyReferences.cache
diff --git a/obj/Release/mudsort.csproj.AssemblyReference.cache b/obj/Release/mudsort.csproj.AssemblyReference.cache
diff --git a/obj/Release/mudsort.csproj.CopyComplete b/obj/Release/mudsort.csproj.CopyComplete
diff --git a/obj/Release/mudsort.csproj.FileListAbsolute.txt b/obj/Release/mudsort.csproj.FileListAbsolute.txt
@@ -27,3 +27,4 @@ C:\Turbine\Asheron's Call\mudsort\obj\Release\mudsort.csproj.CopyComplete
 C:\Turbine\Asheron's Call\mudsort\obj\Release\mudsort.dll
 C:\Turbine\Asheron's Call\mudsort\obj\Release\mudsort.pdb
 C:\Turbine\Asheron's Call\mudsort\obj\Release\mudsort.csproj.AssemblyReference.cache
+C:\Turbine\Asheron's Call\mudsort\bin\Release\stdole.dll
diff --git a/obj/Release/mudsort.dll b/obj/Release/mudsort.dll
diff --git a/obj/Release/mudsort.pdb b/obj/Release/mudsort.pdb
diff --git a/readme.md b/readme.md
@@ -90,7 +90,7 @@ It will really save you a lot of time!
 </dl>
 
 ## Commands
-- `/ms help` -- lists commands
+- `/ms help` or just `/ms` -- lists commands
 - `/ms start` -- start sorting
 - `/ms set source (pack <1-8>|player|<containerID>)` -- set source container to: pack 1-8, player, given containerID, or selection (no argument)
 - `/ms set dest (pack <1-8>|player|<containerID>)` -- set destination container to: pack 1-8, player, given containerID, or selection (no argument)