Fleetを7隻に対応

diff --git a/KCD/Deck.swift b/KCD/Deck.swift
index 2801a1d..f2047fe 100644 (file)
--- a/KCD/Deck.swift
+++ b/KCD/Deck.swift
@@ -85,4 +85,9 @@ extension Deck {
         
         return range.flatMap { self[$0] }
     }
+    
+    subscript(_ range: CountableRange<Int>) -> [Ship] {
+        
+        return range.flatMap { self[$0] }
+    }
 }

diff --git a/KCD/Fleet.swift b/KCD/Fleet.swift
index 4532234..b39089f 100644 (file)
--- a/KCD/Fleet.swift
+++ b/KCD/Fleet.swift
@@ -17,7 +17,8 @@ final class Fleet: NSObject {
     
     private let deckObserveKeys = [
         "selection.ship_0", "selection.ship_1", "selection.ship_2",
-        "selection.ship_3", "selection.ship_4", "selection.ship_5"
+        "selection.ship_3", "selection.ship_4", "selection.ship_5",
+        "selection.ship_6"
     ]
     
     init?(number: Int) {
@@ -83,7 +84,7 @@ final class Fleet: NSObject {
         
         if context == &pDeckContext {
             
-            ships = (0..<6).flatMap { self[$0] }
+            ships = (0..<Deck.maxShipCount).flatMap { self[$0] }
             
             return
         }