連合艦隊大破チェック第3弾

開幕雷撃被ダメを修正
夜戦マスに対応

diff --git a/KCD/HMCalculateDamageCommand.m b/KCD/HMCalculateDamageCommand.m
index 62386c3..dabfa67 100644 (file)
--- a/KCD/HMCalculateDamageCommand.m
+++ b/KCD/HMCalculateDamageCommand.m
@@ -190,9 +190,10 @@
        }
        
        // opening attack
-#warning CHECK THIS
+       self.calcSecondFleet = self.isCombinedBattle;
        [self calculateFDam:damages
                        fdamKeyPath:@"api_data.api_opening_atack.api_fdam"];
+       self.calcSecondFleet = NO;
        
        // hougeki1
        self.calcSecondFleet = self.isCombinedBattle;
@@ -341,7 +342,9 @@
                [self calculateBattle];
                return;
        }
-       if([self.api isEqualToString:@"/kcsapi/api_req_combined_battle/midnight_battle"]) {
+       
+       if([self.api isEqualToString:@"/kcsapi/api_req_combined_battle/midnight_battle"]
+          || [self.api isEqualToString:@"/kcsapi/api_req_combined_battle/sp_midnight"]) {
                [self calculateMidnightBattle];
                return;
        }

diff --git a/KCD/HMCombinedBattleCommand.m b/KCD/HMCombinedBattleCommand.m
index a47614b..e1f2af3 100644 (file)
--- a/KCD/HMCombinedBattleCommand.m
+++ b/KCD/HMCombinedBattleCommand.m
@@ -24,6 +24,7 @@
        if([api isEqualToString:@"/kcsapi/api_req_combined_battle/battle"]) return YES;
        if([api isEqualToString:@"/kcsapi/api_req_combined_battle/airbattle"]) return YES;
        if([api isEqualToString:@"/kcsapi/api_req_combined_battle/midnight_battle"]) return YES;
+       if([api isEqualToString:@"/kcsapi/api_req_combined_battle/sp_midnight"]) return YES;
        if([api isEqualToString:@"/kcsapi/api_req_combined_battle/battleresult"]) return YES;
        
        return NO;