OSDN Git Service

連合艦隊vs連合艦隊の時の夜戦の大破チェックを修正
authormasakih <masakih@users.sourceforge.jp>
Sun, 19 Feb 2017 06:52:14 +0000 (15:52 +0900)
committermasakih <masakih@users.sourceforge.jp>
Sun, 19 Feb 2017 06:52:14 +0000 (15:52 +0900)
KCD/HMCalculateDamageCommand.m

index 00e013e..5b4a1ff 100644 (file)
@@ -639,8 +639,12 @@ NSInteger damageControlIfPossible(NSInteger nowhp, HMKCShipObject *ship)
     }
        
        if([self.api isEqualToString:@"/kcsapi/api_req_combined_battle/midnight_battle"]
-          || [self.api isEqualToString:@"/kcsapi/api_req_combined_battle/sp_midnight"]
-       || [self.api isEqualToString:@"/kcsapi/api_req_combined_battle/ec_midnight_battle"]) {
+       || [self.api isEqualToString:@"/kcsapi/api_req_combined_battle/sp_midnight"]) {
+        [self calculateMidnightBattle];
+        return;
+    }
+    if([self.api isEqualToString:@"/kcsapi/api_req_combined_battle/ec_midnight_battle"]) {
+        self.battleType = typeCombinedWater;
                [self calculateMidnightBattle];
                return;
        }