override var selectedShipType: ShipTabType {
didSet {
+
shipController.filterPredicate = customPredicate()
shipController.rearrangeObjects()
}
.appended { (sd[.hideMaxLucky], .false(#keyPath(Ship.isMaxLucky))) }
.compactMap { (b, s) in b ? s : nil }
- if predicates.isEmpty { return nil }
+ if predicates.isEmpty {
+
+ return nil
+ }
return .and(predicates)
}
switch (shipTypePredicte(for: selectedShipType), omitPredicate) {
case let (s?, o?): return .and([o, s])
+
case let (s?, nil): return s
+
case let (nil, o?): return o
+
default: return nil
+
}
}