不要なコメントアウトを削除

[kcd/KCD.git] / KCD / GuardShelterCommand.swift

diff --git a/KCD/GuardShelterCommand.swift b/KCD/GuardShelterCommand.swift
index d11a613..e7faabb 100644 (file)
--- a/KCD/GuardShelterCommand.swift
+++ b/KCD/GuardShelterCommand.swift
@@ -12,6 +12,7 @@ import Cocoa
 enum GuardEscapeAPI: String {
     
     case goback = "/kcsapi/api_req_combined_battle/goback_port"
+    case gobakAlone = "/kcsapi/api_req_sortie/goback_port"
 }
 
 extension Notification.Name {
@@ -20,10 +21,10 @@ extension Notification.Name {
 }
 
 final class GuardShelterCommand: JSONCommand {
-    
+        
     override class func canExecuteAPI(_ api: String) -> Bool {
         
-        return GuardEscapeAPI(rawValue: api) != nil ? true : false
+        return GuardEscapeAPI(rawValue: api) != nil
     }
     
     override func execute() {
@@ -52,72 +53,63 @@ final class GuardShelterCommand: JSONCommand {
         }
     }
     
-    private func fleetMembers(fleetId: Int) -> [Int]? {
+    private func damagedShipId(damagedPos: Int) -> Int? {
         
-        guard let deck = ServerDataStore.default.deck(by: fleetId) else { return nil }
+        let firstDeckId = TemporaryDataStore.default.battle()?.deckId ?? 1
         
-        return [deck.ship_0, deck.ship_1, deck.ship_2,
-                deck.ship_3, deck.ship_4, deck.ship_5]
-    }
-    
-    private func damagedShipId(damagedPos: Int) -> Int? {
+        let store = ServerDataStore.default
         
-        func fleetAndPos(_ pos: Int) -> ([Int]?, Int) {
-            switch pos {
-            case 1...6: return (fleetMembers(fleetId: 1), pos - 1)
-                
-            case 7...12: return (fleetMembers(fleetId: 2), pos - 6 - 1)
-                
-            default: return (nil, -1)
+        switch firstDeckId {
+        case 1:
+            switch damagedPos {
+            case 1...6: return store.deck(by: 1)?.shipId(of: damagedPos - 1)
+            case 7...12: return store.deck(by: 2)?.shipId(of: damagedPos - 6 - 1)
+            default: return nil
             }
+        case 3:
+            return store.deck(by: 3)?.shipId(of: damagedPos - 1)
+        default:
+            return nil
         }
-        
-        let (fleet, pos) = fleetAndPos(damagedPos)
-        
-        return fleet?[pos]
     }
     
     private func registerReserve() {
         
         let escape = data["api_escape"]
         
-        guard let guardianPos = escape["api_tow_idx"][0].int else { return }
+        guard let escapeIdx = escape["api_escape_idx"][0].int else { return }
+        guard let damagedId = damagedShipId(damagedPos: escapeIdx) else {
+            
+            return  Logger.shared.log("damagedPos is wrong")
+        }
         
-        let fixedGuardianPos = guardianPos - 6 - 1
+        let store = TemporaryDataStore.oneTimeEditor()
         
-        guard case 0..<6 = fixedGuardianPos,
-            let guardianId = fleetMembers(fleetId: 2)?[fixedGuardianPos] else {
-                
-                print("guardianPos is wrong")
-                return
+        guard let damaged = store.createGuardEscaped() else {
+            
+            return Logger.shared.log("Can not create GuardEscaped for damaged")
         }
         
-        guard let escapeIdx = escape["api_escape_idx"][0].int,
-            let damagedId = damagedShipId(damagedPos: escapeIdx) else {
-                
-                print("damagedPos is wrong")
-                return
-        }
+        damaged.shipID = damagedId
+        damaged.ensured = false
         
-        let store = TemporaryDataStore.oneTimeEditor()
+        // store guardian if needs
+        guard let guardianPos = escape["api_tow_idx"][0].int else { return }
         
-        guard let guardian = store.createGuardEscaped() else {
+        let fixedGuardianPos = guardianPos - 6 - 1
+        
+        guard let guardianId = ServerDataStore.default.deck(by: 2)?.shipId(of: fixedGuardianPos) else {
             
-            print("Can not create GuardEscaped for guardinan")
-            return
+            return Logger.shared.log("guardianPos is wrong")
         }
         
-        guardian.shipID = guardianId
-        guardian.ensured = false
-        
-        guard let damaged = store.createGuardEscaped() else {
+        guard let guardian = store.createGuardEscaped() else {
             
-            print("Can not create GuardEscaped for damaged")
-            return
+            return Logger.shared.log("Can not create GuardEscaped for guardinan")
         }
         
-        damaged.shipID = damagedId
-        damaged.ensured = false
+        guardian.shipID = guardianId
+        guardian.ensured = false
     }
     
     private func removeInvalidEntry() {
@@ -125,7 +117,7 @@ final class GuardShelterCommand: JSONCommand {
         let store = TemporaryDataStore.oneTimeEditor()
         
         store.notEnsuredGuardEscaped().forEach(store.delete)
-        store.save()
+        store.save(errorHandler: store.presentOnMainThread)
         Thread.sleep(forTimeInterval: 0.1)
         notify()
     }
@@ -135,17 +127,17 @@ final class GuardShelterCommand: JSONCommand {
         let store = TemporaryDataStore.oneTimeEditor()
         
         store.guardEscaped().forEach(store.delete)
-        store.save()
+        store.save(errorHandler: store.presentOnMainThread)
         Thread.sleep(forTimeInterval: 0.1)
         notify()
     }
     
-    func ensureGuardShelter() {
+    private func ensureGuardShelter() {
         
         let store = TemporaryDataStore.oneTimeEditor()
         
         store.guardEscaped().forEach { $0.ensured = true }
-        store.save()
+        store.save(errorHandler: store.presentOnMainThread)
         Thread.sleep(forTimeInterval: 0.1)
         notify()
     }