From 46f7d88a615cd9b3d12e3b99589862a0ff0cbadb Mon Sep 17 00:00:00 2001 From: masakih Date: Fri, 1 Dec 2017 23:28:58 +0900 Subject: [PATCH] =?utf8?q?=E3=83=80=E3=83=A1=E3=82=B3=E3=83=B3=E3=81=8C?= =?utf8?q?=E4=BD=BF=E3=82=8F=E3=82=8C=E3=81=9F=E6=99=82=E8=80=90=E4=B9=85?= =?utf8?q?=E5=80=A4=E3=81=8C=E3=81=8A=E3=81=8B=E3=81=97=E3=81=8F=E3=81=AA?= =?utf8?q?=E3=82=8B=E5=8F=AF=E8=83=BD=E6=80=A7=E3=82=92=E6=8E=92=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KCD/DamageCalculator.swift | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/KCD/DamageCalculator.swift b/KCD/DamageCalculator.swift index 7d876ce7..08496815 100644 --- a/KCD/DamageCalculator.swift +++ b/KCD/DamageCalculator.swift @@ -435,13 +435,14 @@ extension DamageCalculator { Debug.print("Start Hougeki \(baseKeyPath)", level: .debug) - let enemyOmitedDamages = omitEnemyDamage(targetPosLists: targetPosLists, - damageLists: damageLists, - eFlags: enemyFlags(baseValue["api_at_eflag"])) - - enemyOmitedDamages.forEach { (targetPosList, damageList) in - - zip(targetPosList, damageList).forEach { (targetPos, damage) in + omitEnemyDamage(targetPosLists: targetPosLists, damageLists: damageLists, eFlags: enemyFlags(baseValue["api_at_eflag"])) + .map { (targetPosList, damageList) -> (Int, Int) in + + guard let pos = targetPosList.first else { return (0, 0) } + + return (pos, damageList.reduce(0, +)) + } + .forEach { (targetPos, damage) in guard validTargetPos(targetPos, in: battleFleet) else { return Logger.shared.log("invalid position \(targetPos)") } @@ -456,7 +457,6 @@ extension DamageCalculator { print("Hougeki \(targetPos) -> \(damage)") } - } } } -- 2.11.0