BaseAirCorpsをAirBaseにリネームする

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

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index 413ad29..b5c8369 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -41,7 +41,7 @@ namespace KancolleSniffer
         private readonly Logger _logger;\r
         private readonly ExMapInfo _exMapInfo = new ExMapInfo();\r
         private readonly MiscTextInfo _miscTextInfo;\r
-        private readonly BaseAirCorps _baseAirCorps;\r
+        private readonly AirBase _airBase;\r
         private readonly PresetDeck _presetDeck = new PresetDeck();\r
         private readonly CellInfo _cellInfo = new CellInfo();\r
         private readonly Status _status = new Status();\r
@@ -96,7 +96,7 @@ namespace KancolleSniffer
             _battleInfo = new BattleInfo(_shipInfo, _itemInfo);\r
             _logger = new Logger(_shipInfo, _itemInfo, _battleInfo);\r
             _questInfo = new QuestInfo(_itemInfo, _battleInfo);\r
-            _baseAirCorps = new BaseAirCorps(_itemInfo);\r
+            _airBase = new AirBase(_itemInfo);\r
             _miscTextInfo = new MiscTextInfo(_shipInfo, _itemInfo);\r
             _haveState = new List<IHaveState> {_achievement, _materialInfo, _conditionTimer, _exMapInfo, _questInfo};\r
             AdditionalData = new AdditionalData();\r
@@ -200,9 +200,9 @@ namespace KancolleSniffer
             if (data.api_parallel_quest_count()) // 昔のログにはないので\r
                 _questInfo.AcceptMax = (int)data.api_parallel_quest_count;\r
             if (data.api_event_object())\r
-                _baseAirCorps.InspectEventObject(data.api_event_object);\r
+                _airBase.InspectEventObject(data.api_event_object);\r
             if (data.api_plane_info())\r
-                _baseAirCorps.InspectPlaneInfo(data.api_plane_info);\r
+                _airBase.InspectPlaneInfo(data.api_plane_info);\r
             _battleInfo.CleanupResult();\r
             _battleInfo.BattleState = BattleState.None;\r
             _miscTextInfo.Port();\r
@@ -294,7 +294,7 @@ namespace KancolleSniffer
                 _exMapInfo.InspectMapInfo(data);\r
                 _miscTextInfo.InspectMapInfo(data);\r
                 if (data.api_air_base())\r
-                    _baseAirCorps.Inspect(data.api_air_base);\r
+                    _airBase.Inspect(data.api_air_base);\r
                 return Update.Item;\r
             }\r
             if (url.EndsWith("api_req_member/get_practice_enemyinfo"))\r
@@ -309,7 +309,7 @@ namespace KancolleSniffer
             }\r
             if (url.EndsWith("api_get_member/base_air_corps"))\r
             {\r
-                _baseAirCorps.Inspect(data);\r
+                _airBase.Inspect(data);\r
                 return Update.Ship;\r
             }\r
             return Update.None;\r
@@ -426,6 +426,7 @@ namespace KancolleSniffer
             return url.EndsWith("api_req_sortie/battle") ||\r
                    url.EndsWith("api_req_sortie/airbattle") ||\r
                    url.EndsWith("api_req_sortie/ld_airbattle") ||\r
+                   url.EndsWith("api_req_sortie/ld_shooting") ||\r
                    url.EndsWith("api_req_battle_midnight/battle") ||\r
                    url.EndsWith("api_req_battle_midnight/sp_midnight");\r
         }\r
@@ -510,23 +511,23 @@ namespace KancolleSniffer
             if (url.EndsWith("api_req_air_corps/supply"))\r
             {\r
                 _materialInfo.InspectAirCorpsSupply(data);\r
-                _baseAirCorps.InspectSupply(request, data);\r
+                _airBase.InspectSupply(request, data);\r
                 return Update.Item;\r
             }\r
             if (url.EndsWith("api_req_air_corps/set_plane"))\r
             {\r
                 _materialInfo.InspectAirCorpsSetPlane(data);\r
-                _baseAirCorps.InspectSetPlane(request, data);\r
+                _airBase.InspectSetPlane(request, data);\r
                 return Update.Item | Update.Ship;\r
             }\r
             if (url.EndsWith("api_req_air_corps/set_action"))\r
             {\r
-                _baseAirCorps.InspectSetAction(request);\r
+                _airBase.InspectSetAction(request);\r
                 return Update.Ship;\r
             }\r
             if (url.EndsWith("api_req_air_corps/expand_base"))\r
             {\r
-                _baseAirCorps.InspectExpandBase(request, data);\r
+                _airBase.InspectExpandBase(request, data);\r
                 return Update.Ship;\r
             }\r
             return Update.None;\r
@@ -638,7 +639,7 @@ namespace KancolleSniffer
 \r
         public ShipInfo.ShipStatusPair[] BattleResultStatusDiff => _shipInfo.BattleResultDiff;\r
 \r
-        public bool IsBattleResultStatusError => _shipInfo.IsBattleResultError;\r
+        public bool IsBattleResultError => _shipInfo.IsBattleResultError || _battleInfo.DisplayedResultRank.IsError;\r
 \r
         public ShipStatus[] BattleStartStatus => _shipInfo.BattleStartStatus;\r
 \r
@@ -656,7 +657,7 @@ namespace KancolleSniffer
             {\r
                 _itemInfo.ClearHolder();\r
                 _shipInfo.SetItemHolder();\r
-                _baseAirCorps.SetItemHolder();\r
+                _airBase.SetItemHolder();\r
                 return _itemInfo.ItemList;\r
             }\r
         }\r
@@ -671,7 +672,7 @@ namespace KancolleSniffer
 \r
         public string MiscText => _miscTextInfo.Text;\r
 \r
-        public BaseAirCorps.BaseInfo[] BaseAirCorps => _baseAirCorps.AllAirCorps;\r
+        public AirBase.BaseInfo[] AirBase => _airBase.AllAirCorps;\r
 \r
         public CellInfo CellInfo => _cellInfo;\r
 \r