|
|
@@ -1171,14 +1171,16 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
HashSet<string> modMenus = null;
|
|
|
if (!modItemsOnly)
|
|
|
{
|
|
|
- modMenus = new HashSet<string>(GameUty.ModOnlysMenuFiles
|
|
|
- .Select(file => Path.GetFileName(file).ToLowerInvariant()));
|
|
|
+ modMenus = new HashSet<string>(GameUty.ModOnlysMenuFiles);
|
|
|
}
|
|
|
|
|
|
string[] menuFiles = modItemsOnly ? GameUty.ModOnlysMenuFiles : GameUty.MenuFiles;
|
|
|
foreach (string menuFile in menuFiles)
|
|
|
{
|
|
|
- string fileName = Path.GetFileName(menuFile);
|
|
|
+ if (menuFile.EndsWith("_del.menu"))
|
|
|
+ {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
byte[] buf;
|
|
|
using (AFileBase aFileBase = GameUty.FileOpen(menuFile))
|
|
|
{
|
|
|
@@ -1191,8 +1193,8 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
|
|
|
ItemData item = new ItemData()
|
|
|
{
|
|
|
- menu = fileName,
|
|
|
- isMod = modItemsOnly ? true : modMenus.Contains(fileName)
|
|
|
+ menu = menuFile,
|
|
|
+ isMod = modItemsOnly || modMenus.Contains(menuFile)
|
|
|
};
|
|
|
BinaryReader binaryReader = new BinaryReader(new MemoryStream(buf), Encoding.UTF8);
|
|
|
if (binaryReader.ReadString() != "CM3D2_MENU")
|
|
|
@@ -1333,7 +1335,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
|
|
|
foreach (ItemData itemData in itemDataList)
|
|
|
{
|
|
|
- if (itemData.category == slotArray[slotIndex] && itemData.priority > 0)
|
|
|
+ if (itemData.category == slotArray[slotIndex])
|
|
|
{
|
|
|
sortList.Add(new SortItem()
|
|
|
{
|
