diff --git a/.vs/mudsort/v17/.suo b/.vs/mudsort/v17/.suo index 9cea835..4952038 100644 Binary files a/.vs/mudsort/v17/.suo and b/.vs/mudsort/v17/.suo differ diff --git a/PluginCore.cs b/PluginCore.cs index 2d28706..38ef790 100644 --- 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,7 +211,7 @@ 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(); } @@ -220,7 +219,7 @@ private void Current_RenderFrame_Sort(object sender, EventArgs e) { 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 index e285398..692a695 100644 --- 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 index 9e95e3c..5dd3eb4 100644 Binary files a/bin/Release/mudsort.dll and b/bin/Release/mudsort.dll differ diff --git a/bin/Release/mudsort.pdb b/bin/Release/mudsort.pdb index 2d108e0..c2b3b4f 100644 Binary files a/bin/Release/mudsort.pdb and b/bin/Release/mudsort.pdb differ diff --git a/bin/Release/stdole.dll b/bin/Release/stdole.dll new file mode 100644 index 0000000..b469bb6 Binary files /dev/null and b/bin/Release/stdole.dll differ diff --git a/obj/Release/DesignTimeResolveAssemblyReferences.cache b/obj/Release/DesignTimeResolveAssemblyReferences.cache index 16d19ca..bba2156 100644 Binary files a/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/obj/Release/mudsort.csproj.AssemblyReference.cache b/obj/Release/mudsort.csproj.AssemblyReference.cache index 4640eed..cb922f7 100644 Binary files a/obj/Release/mudsort.csproj.AssemblyReference.cache and b/obj/Release/mudsort.csproj.AssemblyReference.cache differ diff --git a/obj/Release/mudsort.csproj.CopyComplete b/obj/Release/mudsort.csproj.CopyComplete new file mode 100644 index 0000000..e69de29 diff --git a/obj/Release/mudsort.csproj.FileListAbsolute.txt b/obj/Release/mudsort.csproj.FileListAbsolute.txt index b2a6085..db03ded 100644 --- 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 index 9e95e3c..5dd3eb4 100644 Binary files a/obj/Release/mudsort.dll and b/obj/Release/mudsort.dll differ diff --git a/obj/Release/mudsort.pdb b/obj/Release/mudsort.pdb index 2d108e0..c2b3b4f 100644 Binary files a/obj/Release/mudsort.pdb and b/obj/Release/mudsort.pdb differ diff --git a/readme.md b/readme.md index 3723342..9831dbc 100644 --- a/readme.md +++ b/readme.md @@ -90,7 +90,7 @@ It will really save you a lot of time! ## Commands -- `/ms help` -- lists commands +- `/ms help` or just `/ms` -- lists commands - `/ms start` -- start sorting - `/ms set source (pack <1-8>|player|)` -- set source container to: pack 1-8, player, given containerID, or selection (no argument) - `/ms set dest (pack <1-8>|player|)` -- set destination container to: pack 1-8, player, given containerID, or selection (no argument)