OSDN Git Service
(root)
/
kcd
/
KCD.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5279de4
)
不要になったコメントを削除&enumを変更
author
masakih
<masakih@users.sourceforge.jp>
Sun, 3 Dec 2017 11:51:40 +0000
(20:51 +0900)
committer
masakih
<masakih@users.sourceforge.jp>
Sun, 3 Dec 2017 11:51:40 +0000
(20:51 +0900)
KCD/DamageCalculator.swift
patch
|
blob
|
history
diff --git
a/KCD/DamageCalculator.swift
b/KCD/DamageCalculator.swift
index
0849681
..
fc41b88
100644
(file)
--- a/
KCD/DamageCalculator.swift
+++ b/
KCD/DamageCalculator.swift
@@
-11,9
+11,8
@@
import SwiftyJSON
enum BattleFleet {
enum BattleFleet {
- case first
- case second
- case each
+ case normal
+ case secondOnly
}
final class DamageCalculator {
}
final class DamageCalculator {
@@
-99,11
+98,6
@@
extension DamageCalculator {
calculateFDam(baseKeyPath: "api_data.api_kouku.api_stage3")
calculateFDam(baseKeyPath: "api_data.api_kouku2.api_stage3")
calculateFDam(baseKeyPath: "api_data.api_kouku.api_stage3")
calculateFDam(baseKeyPath: "api_data.api_kouku2.api_stage3")
- // 艦隊 戦闘艦隊
- // 連合vs通常(水上) 第2
- // 連合vs通常(機動) 第2
- // 連合vs連合(水上) 第2 全体 use kouku nor kouku2
- // 連合vs連合(機動) 第1 全体 use kouku nor kouku2
let bf: () -> BattleFleet = {
switch self.battleType {
let bf: () -> BattleFleet = {
switch self.battleType {
@@
-111,9
+105,9
@@
extension DamageCalculator {
.combinedAir,
.eachCombinedWater,
.eachCombinedAir:
.combinedAir,
.eachCombinedWater,
.eachCombinedAir:
- return .second
+ return .second
Only
- default: return .
first
+ default: return .
normal
}
}
calculateFDam(baseKeyPath: "api_data.api_kouku.api_stage3_combined", bf)
}
}
calculateFDam(baseKeyPath: "api_data.api_kouku.api_stage3_combined", bf)
@@
-123,90
+117,27
@@
extension DamageCalculator {
private func calcOpeningAttack() {
private func calcOpeningAttack() {
- // 艦隊 戦闘艦隊
- // 連合vs通常(水上) 第2
- // 連合vs通常(機動) 第2
- // 連合vs連合(水上) 第2 全体
- // 連合vs連合(機動) 第2 全体
calculateFDam(baseKeyPath: "api_data.api_opening_atack")
calculateFDam(baseKeyPath: "api_data.api_opening_atack")
-// {
-//
-// switch battleType {
-// case .combinedWater, .combinedAir: return .second
-//
-// case .eachCombinedWater, .eachCombinedAir: return .each
-//
-// default: return .first
-// }
-// }
}
private func calcOpeningTaisen() {
calculateHogeki(baseKeyPath: "api_data.api_opening_taisen")
}
private func calcOpeningTaisen() {
calculateHogeki(baseKeyPath: "api_data.api_opening_taisen")
-// {
-//
-// isCombinedBattle ? .second : .first
-// }
}
private func calcHougeki1() {
}
private func calcHougeki1() {
- // 艦隊 戦闘艦隊
- // 連合vs通常(水上) 第1
- // 連合vs通常(機動) 第2
- // 連合vs連合(水上) 第1
- // 連合vs連合(機動) 第1
calculateHogeki(baseKeyPath: "api_data.api_hougeki1")
calculateHogeki(baseKeyPath: "api_data.api_hougeki1")
-// {
-//
-// switch battleType {
-// case .combinedAir: return .second
-//
-// default: return .first
-// }
-// }
}
private func calcHougeki2() {
}
private func calcHougeki2() {
- // 艦隊 戦闘艦隊
- // 連合vs通常(水上) 第1
- // 連合vs通常(機動) 第1
- // 連合vs連合(水上) 第1 全体
- // 連合vs連合(機動) 第2
calculateHogeki(baseKeyPath: "api_data.api_hougeki2")
calculateHogeki(baseKeyPath: "api_data.api_hougeki2")
-// {
-//
-// switch battleType {
-// case .eachCombinedWater: return .each
-//
-// case .eachCombinedAir: return .each
-//
-// default: return .first
-// }
-// }
}
private func calcHougeki3() {
}
private func calcHougeki3() {
- // 艦隊 戦闘艦隊
- // 連合vs通常(水上) 第2
- // 連合vs通常(機動) 第1
- // 連合vs連合(水上) 第2
- // 連合vs連合(機動) 第1 全体
calculateHogeki(baseKeyPath: "api_data.api_hougeki3")
calculateHogeki(baseKeyPath: "api_data.api_hougeki3")
-// {
-//
-// switch battleType {
-// case .combinedWater: return .second
-//
-//// case .eachCombinedWater: return .second // 1~12
-// case .eachCombinedAir: return .each
-//
-// default: return .first
-// }
-// }
}
private func calcNightHogeki1() {
}
private func calcNightHogeki1() {
@@
-221,36
+152,12
@@
extension DamageCalculator {
private func calcRaigeki() {
private func calcRaigeki() {
- // 艦隊 戦闘艦隊
- // 連合vs通常(水上) 第2
- // 連合vs通常(機動) 第2
- // 連合vs連合(水上) 第2 全体
- // 連合vs連合(機動) 第2 全体
calculateFDam(baseKeyPath: "api_data.api_raigeki")
calculateFDam(baseKeyPath: "api_data.api_raigeki")
-// {
-//
-// switch battleType {
-// case .combinedWater, .combinedAir: return .second
-//
-// case .eachCombinedWater, .eachCombinedAir: return .each
-//
-// default: return .first
-// }
-// }
}
private func calculateMidnightBattle() {
}
private func calculateMidnightBattle() {
- // 艦隊 戦闘艦隊
- // 連合vs通常(水上) 第2
- // 連合vs通常(機動) 第2
- // 連合vs連合(水上) 第2
- // 連合vs連合(機動) 第2
calculateHogeki(baseKeyPath: "api_data.api_hougeki")
calculateHogeki(baseKeyPath: "api_data.api_hougeki")
-// {
-//
-// isCombinedBattle ? .second : .first
-// }
}
}
}
}
@@
-380,7
+287,7
@@
extension DamageCalculator {
private func position(_ pos: Int, in fleet: BattleFleet) -> Int? {
private func position(_ pos: Int, in fleet: BattleFleet) -> Int? {
- let damagePos = (fleet == .second ? pos + 6 : pos)
+ let damagePos = (fleet == .second
Only
? pos + 6 : pos)
guard case 0..<damages.count = damagePos else { return nil }
guard case 0..<damages.count = damagePos else { return nil }
@@
-420,7
+327,7
@@
extension DamageCalculator {
return zip(zip(targetPosLists, damageLists), eFlags).filter { $0.1 == 1 }.map { $0.0 }
}
return zip(zip(targetPosLists, damageLists), eFlags).filter { $0.1 == 1 }.map { $0.0 }
}
- private func calculateHogeki(baseKeyPath: String, battleFleet: BattleFleet = .
first
) {
+ private func calculateHogeki(baseKeyPath: String, battleFleet: BattleFleet = .
normal
) {
let baseValue = json[baseKeyPath.components(separatedBy: ".")]
let baseValue = json[baseKeyPath.components(separatedBy: ".")]
@@
-453,10
+360,7
@@
extension DamageCalculator {
calcHP(damage: damages[damagePos], receive: damage)
calcHP(damage: damages[damagePos], receive: damage)
- Debug.excute(level: .debug) {
-
- print("Hougeki \(targetPos) -> \(damage)")
- }
+ Debug.print("Hougeki \(targetPos) -> \(damage)", level: .debug)
}
}
}
}
@@
-465,7
+369,7
@@
extension DamageCalculator {
calculateFDam(baseKeyPath: baseKeyPath, battleFleet: bf())
}
calculateFDam(baseKeyPath: baseKeyPath, battleFleet: bf())
}
- private func calculateFDam(baseKeyPath: String, battleFleet: BattleFleet = .
first
) {
+ private func calculateFDam(baseKeyPath: String, battleFleet: BattleFleet = .
normal
) {
let baseValue = json[baseKeyPath.components(separatedBy: ".")]
let baseValue = json[baseKeyPath.components(separatedBy: ".")]
@@
-493,10
+397,7
@@
extension DamageCalculator {
calcHP(damage: damages[damagePos], receive: damage)
calcHP(damage: damages[damagePos], receive: damage)
- Debug.excute(level: .debug) {
-
- print("FDam \(idx) -> \(damage)")
- }
+ Debug.print("FDam \(idx) -> \(damage)", level: .debug)
}
}
}
}
}
}