洋上補給の補強増設用のショートネームをつけた

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

diff --git a/KCD/StoreCreateSlotItemHistoryCommand.swift b/KCD/StoreCreateSlotItemHistoryCommand.swift
index c69ce10..d0e58a2 100644 (file)
--- a/KCD/StoreCreateSlotItemHistoryCommand.swift
+++ b/KCD/StoreCreateSlotItemHistoryCommand.swift
@@ -9,30 +9,38 @@
 import Cocoa
 import SwiftyJSON
 
-class StoreCreateSlotItemHistoryCommand: JSONCommand {
+final class StoreCreateSlotItemHistoryCommand: JSONCommand {
+    
     override func execute() {
+        
         guard let fuel = parameter["api_item1"].int,
             let bull = parameter["api_item2"].int,
             let steel = parameter["api_item3"].int,
-            let bauxite = parameter["api_item4"].int
-            else { return print("Parameter is Wrong") }
+            let bauxite = parameter["api_item4"].int else {
+                
+                return Logger.shared.log("Parameter is Wrong")
+        }
         
         let success = data["api_create_flag"].int ?? 0
         let name = masterSlotItemName(sccess: success, data: data)
-        let numberOfUsedKaihatuSizai = success != 0 ? 1 : 0
+        let numberOfUsedKaihatuSizai = (success != 0 ? 1 : 0)
         
         let store = ServerDataStore.default
-        guard let flagShip = store.deck(by: 1)
-            .map({ $0.ship_0 })
-            .flatMap({ store.ship(by: $0) })
-            else { return print("Flagship is not found") }
         
-        guard let basic = store.basic()
-            else { return print("Basic is wrong") }
+        guard let flagShip = store.deck(by: 1)?[0] else {
+            
+            return Logger.shared.log("Flagship is not found")
+        }
+        
+        guard let basic = store.basic() else { return print("Basic is wrong") }
         
         let localStore = LocalDataStore.oneTimeEditor()
-        guard let newHistory = localStore.createKaihatuHistory()
-            else { return print("Can not create new KaihatuHistory entry") }
+        
+        guard let newHistory = localStore.createKaihatuHistory() else {
+            
+            return Logger.shared.log("Can not create new KaihatuHistory entry")
+        }
+        
         newHistory.name = name
         newHistory.fuel = fuel
         newHistory.bull = bull
@@ -46,13 +54,15 @@ class StoreCreateSlotItemHistoryCommand: JSONCommand {
     }
     
     private func masterSlotItemName(sccess: Int, data: JSON) -> String {
+        
         if sccess == 0 {
-            return NSLocalizedString("fail to develop", comment: "fail to develop")
+            
+            return LocalizedStrings.failDevelop.string
         }
-        guard let slotItemId = data["api_slot_item"]["api_slotitem_id"].int
-            else {
-                print("api_slotitem_id is wrong")
-                return ""
+        
+        guard let slotItemId = data["api_slot_item"]["api_slotitem_id"].int else {
+            
+            return Logger.shared.log("api_slotitem_id is wrong", value: "")
         }
         
         return ServerDataStore.default.masterSlotItem(by: slotItemId)?.name ?? ""