装備一覧に補強増設で装備した時も装備済みに含まれるようにした

diff --git a/KCD/HMSlotItemWindowController.m b/KCD/HMSlotItemWindowController.m
index 030babf..b3e8125 100644 (file)
--- a/KCD/HMSlotItemWindowController.m
+++ b/KCD/HMSlotItemWindowController.m
@@ -59,10 +59,10 @@
                case -1:
                        break;
                case 0:
-                       return [NSPredicate predicateWithFormat:@"equippedShip.lv = NULL"];
+                       return [NSPredicate predicateWithFormat:@"equippedShip.lv = NULL && extraEquippedShip.lv = NULL"];
                        break;
                case 1:
-                       return [NSPredicate predicateWithFormat:@"equippedShip.lv != NULL"];
+                       return [NSPredicate predicateWithFormat:@"equippedShip.lv != NULL || extraEquippedShip.lv != NULL"];
                        break;
                default:
                        break;