X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=KCD%2FSeikuCalclator.swift;h=829856eecd0c1290420c804a7e1eaa1134bf6d8e;hb=HEAD;hp=3f714ce000634047ca7c11d886cf9235563124ce;hpb=90da55cdae29f289185c0cf6ff1468b1e6f1d5d0;p=kcd%2FKCD.git

diff --git a/KCD/SeikuCalclator.swift b/KCD/SeikuCalclator.swift
index 3f714ce0..829856ee 100644
--- a/KCD/SeikuCalclator.swift
+++ b/KCD/SeikuCalclator.swift
@@ -28,8 +28,8 @@ private let floatplaneFighterBonus: [Double] =  [0, 0, 2, 5, 9, 14, 14, 22]
 private let jetBomberBonus: [Double] =          [0, 0, 0, 0, 0,  0,  0,  0]
 // swiftlint:enable comma
 
-//                            sqrt 0, 1,     2.5,   4,     5.5,   7,     8.5,   10
-private let bonus: [Double] = [0, 1.000, 1.581, 2.000, 2.345, 2.645, 2.915, 3.162]
+//                             sqrt 0, 1,     2.5,   4,     5.5,   7,     8.5,   10
+private let skillBonus: [Double] = [0, 1.000, 1.581, 2.000, 2.345, 2.645, 2.915, 3.162]
 
 
 final class SeikuCalclator {
@@ -44,21 +44,26 @@ final class SeikuCalclator {
     var seiku: Int {
         
         let guardEscaped = TemporaryDataStore.default.ensuredGuardEscaped(byShipId: ship.id)
-        guard guardEscaped == nil else { return 0 }
+        guard guardEscaped == nil else {
+            
+            return 0
+        }
         
-        return (0...4).map(normalSeiku).map { Int($0) }.reduce(0, +)
+        return (0...4).map(slotSeiku).map { Int($0) }.reduce(0, +)
     }
     
     var totalSeiku: Int {
         
         let guardEscaped = TemporaryDataStore.default.ensuredGuardEscaped(byShipId: ship.id)
-        guard guardEscaped == nil else { return 0 }
+        guard guardEscaped == nil else {
+            
+            return 0
+        }
         
         return (0...4).map(seiku).reduce(0, +)
     }
     
-    
-    private func slotItem(_ index: Int) -> SlotItem? {
+    private func slotItem(at index: Int) -> SlotItem? {
         
         return ServerDataStore.default.slotItem(by: ship.slotItemId(index))
     }
@@ -66,61 +71,77 @@ final class SeikuCalclator {
     private func typeBonus(_ type: Int) -> [Double]? {
         
         switch type {
+            
         case let t where fighterTypes.contains(t): return fighterBonus
+            
         case let t where bomberTypes.contains(t): return bomberBonus
+            
         case let t where attackerTypes.contains(t): return attackerBonus
+            
         case let t where floatplaneBomberTypes.contains(t): return floatplaneBomberBonus
+            
         case let t where floatplaneFighterTypes.contains(t): return floatplaneFighterBonus
+            
         case let t where jetBomberTypes.contains(t): return jetBomberBonus
+            
         default: return nil
+            
         }
     }
     
-    private func normalSeiku(_ index: Int) -> Double {
+    private enum SlotState {
         
-        let itemCount = ship.slotItemCount(index)
+        case valid(SlotItem, Int, Int)
         
-        if itemCount == 0 { return 0 }
+        case invalid
+    }
+    
+    private func slotState(at index: Int) -> SlotState {
         
-        guard let item = slotItem(index)
-            else { return 0 }
+        let itemCount = ship.slotItemCount(index)
+        if itemCount == 0 {
+            
+            return .invalid
+        }
+        guard let item = slotItem(at: index) else {
+            
+            return .invalid
+        }
         
-        let type2 = item.master_slotItem.type_2
+        return .valid(item, itemCount, item.master_slotItem.type_2)
+    }
+    
+    private func slotSeiku(at index: Int) -> Double {
         
-        guard seikuEffectiveTypes.contains(type2)
-            else { return 0 }
+        guard case let .valid(item, itemCount, type2) = slotState(at: index),
+            seikuEffectiveTypes.contains(type2) else {
+                
+                return 0
+        }
         
         let taiku = Double(item.master_slotItem.tyku)
         let lv = Double(item.level)
         let rate = bomberTypes.contains(type2) ? 0.25 : 0.2
         
         return (taiku + lv * rate) * sqrt(Double(itemCount))
-        
     }
     
-    private func extraSeiku(_ index: Int) -> Double {
-        
-        let itemCount = ship.slotItemCount(index)
+    private func skilledSlotSeiku(at index: Int) -> Double {
         
-        if itemCount == 0 { return 0 }
-        
-        guard let item = slotItem(index)
-            else { return 0 }
-        
-        let type2 = item.master_slotItem.type_2
-        
-        guard let typeBonus = typeBonus(type2)
-            else { return 0 }
+        guard case let .valid(item, _, type2) = slotState(at: index),
+            let typeBonus = typeBonus(type2) else {
+                
+                return 0
+        }
         
         let airLevel = item.alv
         
-        return typeBonus[airLevel] + bonus[airLevel]
+        return typeBonus[airLevel] + skillBonus[airLevel]
     }
     
-    private func seiku(_ index: Int) -> Int {
+    private func seiku(at index: Int) -> Int {
         
-        return Int(normalSeiku(index) + extraSeiku(index))
+        return Int(slotSeiku(at: index) + skilledSlotSeiku(at: index))
     }
     
-    
 }