Timerをクロージャ方式にした

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

diff --git a/KCD/BattleCommand.swift b/KCD/BattleCommand.swift
index 44bfbc6..dd5324c 100644 (file)
--- a/KCD/BattleCommand.swift
+++ b/KCD/BattleCommand.swift
@@ -8,52 +8,26 @@
 
 import Cocoa
 
-enum BattleAPI: String {
-    
-    case battle = "/kcsapi/api_req_sortie/battle"
-    
-    case combinedBattle = "/kcsapi/api_req_combined_battle/battle"
-    case combinedAirBattle = "/kcsapi/api_req_combined_battle/airbattle"
-    case combinedBattleWater = "/kcsapi/api_req_combined_battle/battle_water"
-    case combinedEcBattle = "/kcsapi/api_req_combined_battle/ec_battle"
-    case combinedEachBattle = "/kcsapi/api_req_combined_battle/each_battle"
-    case combinedEachBattleWater = "/kcsapi/api_req_combined_battle/each_battle_water"
-    
-    case airBattle = "/kcsapi/api_req_sortie/airbattle"
-    case ldAirBattle = "/kcsapi/api_req_sortie/ld_airbattle"
-    case combinedLdAirBattle = "/kcsapi/api_req_combined_battle/ld_airbattle"
-    
-    case midnightBattle = "/kcsapi/api_req_battle_midnight/battle"
-    case midnightSpMidnight = "/kcsapi/api_req_battle_midnight/sp_midnight"
-    case combinedEcMidnightBattle = "/kcsapi/api_req_combined_battle/ec_midnight_battle"
-    case combinedMidnightBattle = "/kcsapi/api_req_combined_battle/midnight_battle"
-    case combinedSpMidnight = "/kcsapi/api_req_combined_battle/sp_midnight"
-    
-    case battleResult = "/kcsapi/api_req_sortie/battleresult"
-    case combinedBattleResult = "/kcsapi/api_req_combined_battle/battleresult"
-}
-
 final class BattleCommand: JSONCommand {
     
-    override class func canExecuteAPI(_ api: String) -> Bool {
+    override class func canExecuteAPI(_ api: API) -> Bool {
         
-        return BattleAPI(rawValue: api) != nil
+        return api.type == .battle || api.type == .battleResult
     }
     
     override func execute() {
         
         CalculateDamageCommand(apiResponse: apiResponse).execute()
         
-        guard let battleApi = BattleAPI(rawValue: apiResponse.api)
-            else { return }
-        
-        switch battleApi {
+        switch apiResponse.api.endpoint {
+            
         case .battleResult, .combinedBattleResult:
             DropShipHistoryCommand(apiResponse: apiResponse).execute()
             DummyShipCommand(apiResponse: apiResponse).execute()
             GuardShelterCommand(apiResponse: apiResponse).execute()
             
-        default: break
+        default:
+            ()
         }
     }
 }