連合艦隊による空襲戦の進撃前大破チェックに対応

diff --git a/KCD/HMAirBattleCommand.m b/KCD/HMAirBattleCommand.m
index 5b06285..d66ed34 100644 (file)
--- a/KCD/HMAirBattleCommand.m
+++ b/KCD/HMAirBattleCommand.m
@@ -24,6 +24,7 @@
 {
        if([api isEqualToString:@"/kcsapi/api_req_sortie/airbattle"]) return YES;
        if([api isEqualToString:@"/kcsapi/api_req_sortie/ld_airbattle"]) return YES;
+       if([api isEqualToString:@"/kcsapi/api_req_combined_battle/ld_airbattle"]) return YES;
        
        return NO;
 }

diff --git a/KCD/HMCalculateDamageCommand.m b/KCD/HMCalculateDamageCommand.m
index 1667503..d87ad5c 100644 (file)
--- a/KCD/HMCalculateDamageCommand.m
+++ b/KCD/HMCalculateDamageCommand.m
@@ -470,15 +470,16 @@ NSInteger damageControlIfPossible(NSInteger nowhp, HMKCShipObject *ship)
                [self calculateBattle];
                return;
        }
+       if([self.api isEqualToString:@"/kcsapi/api_req_sortie/ld_airbattle"]) {
+               [self calculateBattle];
+               return;
+       }
+       
        if([self.api isEqualToString:@"/kcsapi/api_req_battle_midnight/battle"]
           || [self.api isEqualToString:@"/kcsapi/api_req_battle_midnight/sp_midnight"]) {
                [self calculateMidnightBattle];
                return;
        }
-       if([self.api isEqualToString:@"/kcsapi/api_req_sortie/ld_airbattle"]) {
-               [self calculateBattle];
-               return;
-       }
        
        /*
         /kcsapi/api_req_combined_battle/battle_water
@@ -497,6 +498,11 @@ NSInteger damageControlIfPossible(NSInteger nowhp, HMKCShipObject *ship)
                [self calculateBattle];
                return;
        }
+       if([self.api isEqualToString:@"/kcsapi/api_req_combined_battle/ld_airbattle"]) {
+               self.battleType = typeCombinedWater;
+               [self calculateBattle];
+               return;
+       }
        
        if([self.api isEqualToString:@"/kcsapi/api_req_combined_battle/midnight_battle"]
           || [self.api isEqualToString:@"/kcsapi/api_req_combined_battle/sp_midnight"]) {