Merge branch 'hotfix/0.1.7.1'

HeavenlyWind.Base/ProductInfo.cs

@@ -5,7 +5,7 @@ public class ProductInfo
         public const string AppName = "いんてりじぇんと連装砲くん";
         public const string ProductName = "Intelligent Naval Gun-kun";
 
-        public const string AssemblyVersionString = "0.1.7.1";
+        public const string AssemblyVersionString = "0.1.7.2";
 
         public const string ReleaseCodeName = "Moonbria";
 

HeavenlyWind.Game/HeavenlyWind.Game.csproj

@@ -99,7 +99,6 @@
     <Compile Include="Models\Battle\Phases\TorpedoSalvoPhase.cs" />
     <Compile Include="Models\Battle\Stages\AerialAttackStage.cs" />
     <Compile Include="Models\Battle\Stages\AerialCombatStage.cs" />
-    <Compile Include="Models\Battle\Stages\CombinedFleetAerialAttackStage.cs" />
     <Compile Include="Models\Battle\Stages\CombinedFleetCTFDayNormalStage.cs" />
     <Compile Include="Models\Battle\Stages\CombinedFleetDay.cs" />
     <Compile Include="Models\Battle\Stages\CombinedFleetNight.cs" />
@@ -155,6 +154,7 @@
     <Compile Include="Models\PracticeInfo.cs" />
     <Compile Include="Models\PracticeOpponentInfo.cs" />
     <Compile Include="Models\Quest.cs" />
+    <Compile Include="Models\Raw\Battle\IAerialCombat.cs" />
     <Compile Include="Models\Raw\Battle\IRawCombinedFleet.cs" />
     <Compile Include="Models\Raw\Battle\IRawFormationAndEngagementForm.cs" />
     <Compile Include="Models\Raw\Battle\RawAerialAttack.cs" />

HeavenlyWind.Game/Models/Battle/BattleInfo.cs

@@ -96,14 +96,15 @@ void ProcessFirstStage(ApiData rpData)
                     First = new AerialCombatStage(this, rpData);
                     break;
 
-                case "api_req_sortie/ld_airbattle": First = new AerialAttackStage(this, rpData); break;
+                case "api_req_sortie/ld_airbattle":
+                case "api_req_combined_battle/ld_airbattle":
+                    First = new AerialAttackStage(this, rpData);
+                    break;
 
                 case "api_req_combined_battle/battle": First = new CombinedFleetCTFDayNormalStage(this, rpData); break;
                 case "api_req_combined_battle/battle_water": First = new CombinedFleetSTFDayNormalStage(this, rpData); break;
 
                 case "api_req_combined_battle/sp_midnight": First = new CombinedFleetNightOnlyStage(this, rpData); break;
-
-                case "api_req_combined_battle/ld_airbattle": First = new CombinedFleetAerialAttackStage(this, rpData); break;
             }
 
             First.Process(rpData);

HeavenlyWind.Game/Models/Battle/Stages/AerialAttackStage.cs

@@ -15,7 +15,7 @@ class AerialAttackStage : BattleStage
 
         internal protected AerialAttackStage(BattleInfo rpOwner, ApiData rpData) : base(rpOwner)
         {
-            var rRawData = rpData.Data as RawAerialAttack;
+            var rRawData = rpData.Data as IAerialCombat;
 
             AerialAttack = new AerialCombatPhase(this, rRawData.AerialCombat, PhaseRound.First);
         }

HeavenlyWind.Game/Models/Battle/Stages/AerialCombatStage.cs

@@ -20,7 +20,7 @@ class AerialCombatStage : BattleStage
 
         internal protected AerialCombatStage(BattleInfo rpOwner, ApiData rpData) : base(rpOwner)
         {
-            var rRawData = rpData.Data as RawAerialCombat;
+            var rRawData = rpData.Data as IAerialCombatSecondRound;
 
             AerialCombatFirstRound = new AerialCombatPhase(this, rRawData.AerialCombat, PhaseRound.First);
             AerialCombatSecondRound = new AerialCombatPhase(this, rRawData.AerialCombatSecondRound, PhaseRound.Second);

HeavenlyWind.Game/Models/Raw/Battle/IAerialCombat.cs

@@ -0,0 +1,11 @@
+namespace Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle
+{
+    public interface IAerialCombat
+    {
+        RawAerialCombatPhase AerialCombat { get; }
+    }
+    public interface IAerialCombatSecondRound : IAerialCombat
+    {
+        RawAerialCombatPhase AerialCombatSecondRound { get; }
+    }
+}

HeavenlyWind.Game/Models/Raw/Battle/RawAerialAttack.cs

@@ -1,6 +1,6 @@
 namespace Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle
 {
-    public class RawAerialAttack : RawDay
+    public class RawAerialAttack : RawDay, IAerialCombat
     {
     }
 }

HeavenlyWind.Game/Models/Raw/Battle/RawAerialCombat.cs

@@ -2,7 +2,7 @@
 
 namespace Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle
 {
-    public class RawAerialCombat : RawDay
+    public class RawAerialCombat : RawDay, IAerialCombatSecondRound
     {
         [JsonProperty("api_kouku2")]
         public RawAerialCombatPhase AerialCombatSecondRound { get; set; }

HeavenlyWind.Game/Models/Raw/Battle/RawCombinedFleetAerialAttack.cs

@@ -1,6 +1,6 @@
 namespace Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle
 {
-    public class RawCombinedFleetAerialAttack : RawCombinedFleetDay
+    public class RawCombinedFleetAerialAttack : RawCombinedFleetDay, IAerialCombat
     {
     }
 }

HeavenlyWind.Game/Models/Raw/Battle/RawCombinedFleetAerialCombat.cs

@@ -2,7 +2,7 @@
 
 namespace Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle
 {
-    public class RawCombinedFleetAerialCombat : RawCombinedFleetDay
+    public class RawCombinedFleetAerialCombat : RawCombinedFleetDay, IAerialCombatSecondRound
     {
         [JsonProperty("api_kouku2")]
         public RawAerialCombatPhase AerialCombatSecondRound { get; set; }