リファクタリング

FleetViewControllerでしか使用しないプロパティを移動

diff --git a/KCD/FleetViewController.swift b/KCD/FleetViewController.swift
index 7296477..f1f286e 100644 (file)
--- a/KCD/FleetViewController.swift
+++ b/KCD/FleetViewController.swift
@@ -176,10 +176,18 @@ final class FleetViewController: NSViewController {
     
     var totalSakuteki: Double { return sakutekiCalculator.calculate(ships) }
     var totalSeiku: Int { return ships.reduce(0) { $0 + $1.seiku } }
-    var totalCalclatedSeiku: Int { return ships.reduce(0) { $0 + $1.totalSeiku } }
+    var totalCalclatedSeiku: Int { return ships.reduce(0) { $0 + totalSeiku(of: $1) } }
     var totalLevel: Int { return ships.reduce(0) { $0 + $1.lv } }
-    var totalDrums: Int { return ships.reduce(0) { $0 + $1.totalDrums } }
+    var totalDrums: Int { return ships.reduce(0) { $0 + totalDrums(of: $1) } }
     
+    func totalSeiku(of ship: Ship) -> Int {
+        
+        return SeikuCalclator(ship: ship).totalSeiku
+    }
+    func totalDrums(of ship: Ship) -> Int {
+        
+        return (0...4).flatMap(ship.slotItem).filter { $0.slotitem_id == 75 }.count
+    }
     
     fileprivate var ships: [Ship] = [] {
         

diff --git a/KCD/Ship.swift b/KCD/Ship.swift
index 4d63571..0f5f1fa 100644 (file)
--- a/KCD/Ship.swift
+++ b/KCD/Ship.swift
@@ -359,14 +359,4 @@ extension Ship {
         return SeikuCalclator(ship: self).seiku
     }
     
-    var totalSeiku: Int {
-        
-        return SeikuCalclator(ship: self).totalSeiku
-    }
-    
-    var totalDrums: Int {
-        
-        return (0...4).flatMap(slotItem).filter { $0.slotitem_id == 75 }.count
-    }
-    
 }