払暁戦に対応する

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / Sniffer.cs

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index 9bd38d2..8af70bf 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -321,6 +321,7 @@ namespace KancolleSniffer
             }\r
             if (url.EndsWith("api_req_sortie/battleresult") || url.EndsWith("api_req_combined_battle/battleresult"))\r
             {\r
+                _shipInfo.SaveBattleResult();\r
                 _battleInfo.InspectBattleResult(data);\r
                 _exMapInfo.InspectBattleResult(data);\r
                 _logger.InspectBattleResult(data);\r
@@ -336,6 +337,7 @@ namespace KancolleSniffer
                 _battleInfo.CauseCombinedBattleEscape();\r
                 return Update.Ship;\r
             }\r
+            _battleInfo.BattleState = BattleState.Unknown;\r
             return Update.None;\r
         }\r
 \r
@@ -358,6 +360,7 @@ namespace KancolleSniffer
                    url.EndsWith("api_req_combined_battle/sp_midnight") ||\r
                    url.EndsWith("api_req_combined_battle/ec_battle") ||\r
                    url.EndsWith("api_req_combined_battle/ec_midnight_battle") ||\r
+                   url.EndsWith("api_req_combined_battle/ec_night_to_day") ||\r
                    url.EndsWith("api_req_combined_battle/each_battle") ||\r
                    url.EndsWith("api_req_combined_battle/each_battle_water");\r
         }\r
@@ -432,6 +435,7 @@ namespace KancolleSniffer
                 _shipInfo.InspectMapStart(request); // 出撃中判定が必要なので_conditionTimerより前\r
                 _conditionTimer.InvalidateCond();\r
                 _exMapInfo.InspectMapStart(data);\r
+                _battleInfo.InspectMapStart(data);\r
                 _logger.InspectMapStart(data);\r
                 _miscTextInfo.ClearFlag = true;\r
                 return Update.Timer | Update.Ship;\r
@@ -440,6 +444,7 @@ namespace KancolleSniffer
             {\r
                 _battleInfo.InspectMapNext(request);\r
                 _exMapInfo.InspectMapNext(data);\r
+                _battleInfo.InspectMapNext(data);\r
                 _logger.InspectMapNext(data);\r
                 return Update.None;\r
             }\r
@@ -457,6 +462,7 @@ namespace KancolleSniffer
             if (url.EndsWith("api_req_quest/clearitemget"))\r
             {\r
                 _questInfo.InspectClearItemGet(request);\r
+                _logger.InspectClearItemGet(data);\r
                 return Update.QuestList;\r
             }\r
             if (url.EndsWith("api_req_air_corps/supply"))\r
@@ -504,6 +510,8 @@ namespace KancolleSniffer
 \r
         public int[] GetDeck(int fleet) => _shipInfo.GetDeck(fleet);\r
 \r
+        public List<ShipInfo.ShipStatusPair> WrongBattleResult => _shipInfo.WrongBattleResult;\r
+\r
         public int CombinedFleetType => _shipInfo.CombinedFleetType;\r
 \r
         public ChargeStatus[] ChargeStatuses => _shipInfo.ChargeStatuses;\r
@@ -520,6 +528,10 @@ namespace KancolleSniffer
 \r
         public string[] BadlyDamagedShips => _shipInfo.BadlyDamagedShips;\r
 \r
+        public double GetDaihatsuBonus(int fleet) => _shipInfo.GetDaihatsuBonus(fleet);\r
+\r
+        public double GetTransportPoint(int fleet) => _shipInfo.GetTransportPoint(fleet);\r
+\r
         public ItemStatus[] ItemList\r
         {\r
             get\r
@@ -543,6 +555,11 @@ namespace KancolleSniffer
 \r
         public BaseAirCoprs.BaseInfo[] BaseAirCorps => _baseAirCoprs.AllAirCorps;\r
 \r
+        public bool UseOldEnemyId\r
+        {\r
+            set => _shipInfo.UseOldEnemyId = value;\r
+        }\r
+\r
         public void SetLogWriter(Action<string, string, string> writer, Func<DateTime> nowFunc)\r
         {\r
             _logger.SetWriter(writer, nowFunc);\r
@@ -560,12 +577,12 @@ namespace KancolleSniffer
 \r
         public int MaterialLogInterval\r
         {\r
-            set { _logger.MaterialLogInterval = value; }\r
+            set => _logger.MaterialLogInterval = value;\r
         }\r
 \r
         public string LogOutputDir\r
         {\r
-            set { _logger.OutputDir = value; }\r
+            set => _logger.OutputDir = value;\r
         }\r
 \r
         public void FlashLog()\r