main code repository.
Revision | 676cbe185a5daebd896c97f2af37eddbff0a9271 (tree) |
---|---|
Time | 2017-05-14 23:50:07 |
Author | masakih <masakih@user...> |
Commiter | masakih |
処理を簡素化した
@@ -167,11 +167,7 @@ extension CalculateDamageCommand { | ||
167 | 167 | return targetArraysArray |
168 | 168 | } |
169 | 169 | private func hogekiDamages(_ list: JSON) -> [[Int]]? { |
170 | - guard let hougeki1Damages = list | |
171 | - .array? | |
172 | - .flatMap({ $0.array?.flatMap { $0.int } }) | |
173 | - else { return nil } | |
174 | - return hougeki1Damages | |
170 | + return list.array?.flatMap { $0.array?.flatMap { $0.int } } | |
175 | 171 | } |
176 | 172 | private func enemyFlags(_ list: JSON) -> [Int]? { |
177 | 173 | return list.array?.flatMap { $0.int }.filter { $0 != -1 } |
@@ -193,9 +189,9 @@ extension CalculateDamageCommand { | ||
193 | 189 | else { return nil } |
194 | 190 | return damagePos |
195 | 191 | } |
196 | - private func calcHP(damage: Damage, receicve: Int) { | |
197 | - let hp = damage.hp | |
198 | - var newHP = (hp as Int) - receicve | |
192 | + private func calcHP(damage: Damage, receive: Int) { | |
193 | + let hp = damage.hp as Int | |
194 | + var newHP = hp - receive | |
199 | 195 | if newHP <= 0 { |
200 | 196 | let shipId = damage.shipID |
201 | 197 | if let ship = ServerDataStore.default.ship(by: shipId) { |
@@ -230,7 +226,7 @@ extension CalculateDamageCommand { | ||
230 | 226 | |
231 | 227 | guard let damagePos = position(targetPos, in: battleFleet) |
232 | 228 | else { return print("damage pos is larger than damage count") } |
233 | - calcHP(damage: damages[damagePos], receicve: damage) | |
229 | + calcHP(damage: damages[damagePos], receive: damage) | |
234 | 230 | |
235 | 231 | Debug.excute(level: .debug) { |
236 | 232 | let shipOffset = (battleFleet == .second) ? 6 : 0 |
@@ -254,7 +250,7 @@ extension CalculateDamageCommand { | ||
254 | 250 | |
255 | 251 | guard let damagePos = position(idx, in: battleFleet) |
256 | 252 | else { return } |
257 | - calcHP(damage: damages[damagePos], receicve: damage) | |
253 | + calcHP(damage: damages[damagePos], receive: damage) | |
258 | 254 | |
259 | 255 | Debug.excute(level: .debug) { |
260 | 256 | let shipOffset = (battleFleet == .second) ? 6 : 0 |