From eef0052eda6fff44b5a5d0c750e14da0b0f08792 Mon Sep 17 00:00:00 2001 From: masakih Date: Sun, 27 Aug 2017 17:34:52 +0900 Subject: [PATCH] =?utf8?q?=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF?= =?utf8?q?=E3=83=AA=E3=83=B3=E3=82=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit FleetViewControllerでしか使用しないプロパティを移動 --- KCD/FleetViewController.swift | 12 ++++++++++-- KCD/Ship.swift | 10 ---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/KCD/FleetViewController.swift b/KCD/FleetViewController.swift index 7296477a..f1f286e2 100644 --- 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 4d63571d..0f5f1faa 100644 --- 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 - } - } -- 2.11.0