• R/O
  • HTTP
  • SSH
  • HTTPS

KCD: Commit

main code repository.


Commit MetaInfo

Revision676cbe185a5daebd896c97f2af37eddbff0a9271 (tree)
Time2017-05-14 23:50:07
Authormasakih <masakih@user...>
Commitermasakih

Log Message

処理を簡素化した

Change Summary

Incremental Difference

--- a/KCD/CalculateDamageCommand.swift
+++ b/KCD/CalculateDamageCommand.swift
@@ -167,11 +167,7 @@ extension CalculateDamageCommand {
167167 return targetArraysArray
168168 }
169169 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 } }
175171 }
176172 private func enemyFlags(_ list: JSON) -> [Int]? {
177173 return list.array?.flatMap { $0.int }.filter { $0 != -1 }
@@ -193,9 +189,9 @@ extension CalculateDamageCommand {
193189 else { return nil }
194190 return damagePos
195191 }
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
199195 if newHP <= 0 {
200196 let shipId = damage.shipID
201197 if let ship = ServerDataStore.default.ship(by: shipId) {
@@ -230,7 +226,7 @@ extension CalculateDamageCommand {
230226
231227 guard let damagePos = position(targetPos, in: battleFleet)
232228 else { return print("damage pos is larger than damage count") }
233- calcHP(damage: damages[damagePos], receicve: damage)
229+ calcHP(damage: damages[damagePos], receive: damage)
234230
235231 Debug.excute(level: .debug) {
236232 let shipOffset = (battleFleet == .second) ? 6 : 0
@@ -254,7 +250,7 @@ extension CalculateDamageCommand {
254250
255251 guard let damagePos = position(idx, in: battleFleet)
256252 else { return }
257- calcHP(damage: damages[damagePos], receicve: damage)
253+ calcHP(damage: damages[damagePos], receive: damage)
258254
259255 Debug.excute(level: .debug) {
260256 let shipOffset = (battleFleet == .second) ? 6 : 0
Show on old repository browser