X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=KancolleSniffer%2FSniffer.cs;h=b5c8369c1f87e3bdef858bf6186c26786eb46131;hb=2ecb04bd2767d85f94ab1c39d683c19dd8e2f175;hp=015b438a0fea59ce4f6a677418f5bc367fb6663e;hpb=d44ca80510e9cbc6a68846faac5e1647aa0fba0d;p=kancollesniffer%2FKancolleSniffer.git

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index 015b438..b5c8369 100644
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -13,19 +13,26 @@
 // limitations under the License.
 
 using System;
+using KancolleSniffer.Util;
 using System.Collections.Generic;
 using System.Linq;
+using KancolleSniffer.Log;
+using KancolleSniffer.Model;
 
 namespace KancolleSniffer
 {
     public class Sniffer
     {
         private bool _start;
-        private readonly ItemInfo _itemInfo = new ItemInfo();
+        private readonly ItemMaster _itemMaster = new ItemMaster();
+        private readonly ItemInventory _itemInventory = new ItemInventory();
+        private readonly ItemInfo _itemInfo;
+        private readonly ShipMaster _shipMaster = new ShipMaster();
+        private readonly ShipInventory _shipInventory = new ShipInventory();
+        private readonly ShipInfo _shipInfo;
         private readonly MaterialInfo _materialInfo = new MaterialInfo();
-        private readonly QuestInfo _questInfo = new QuestInfo();
+        private readonly QuestInfo _questInfo;
         private readonly MissionInfo _missionInfo = new MissionInfo();
-        private readonly ShipInfo _shipInfo;
         private readonly ConditionTimer _conditionTimer;
         private readonly DockInfo _dockInfo;
         private readonly AkashiTimer _akashiTimer;
@@ -33,11 +40,33 @@ namespace KancolleSniffer
         private readonly BattleInfo _battleInfo;
         private readonly Logger _logger;
         private readonly ExMapInfo _exMapInfo = new ExMapInfo();
-        private readonly MiscTextInfo _miscTextInfo = new MiscTextInfo();
-        private readonly BaseAirCoprs _baseAirCoprs;
+        private readonly MiscTextInfo _miscTextInfo;
+        private readonly AirBase _airBase;
+        private readonly PresetDeck _presetDeck = new PresetDeck();
+        private readonly CellInfo _cellInfo = new CellInfo();
         private readonly Status _status = new Status();
         private bool _saveState;
         private readonly List<IHaveState> _haveState;
+        private AdditionalData _additionalData;
+
+        public interface IRepeatingTimerController
+        {
+            void Stop(string key);
+            void Stop(string key, int fleet);
+            void Suspend(string exception = null);
+            void Resume();
+        }
+
+        public IRepeatingTimerController RepeatingTimerController { get; set; }
+
+        public Dictionary<string, string> MapDictionary { get; } = new Dictionary<string, string>
+        {
+            {"南西作戦海域方面 バリ島沖", "42-1"},
+            {"西方作戦海域方面 マラッカ海峡北方", "42-2"},
+            {"西方作戦海域方面 セイロン島南西沖", "42-3"},
+            {"欧州作戦海域方面 地中海マルタ島沖", "42-4"},
+            {"欧州作戦海域方面 北海/北大西洋海域", "42-5"}
+        };
 
         [Flags]
         public enum Update
@@ -52,22 +81,39 @@ namespace KancolleSniffer
             Mission = 1 << 6,
             QuestList = 1 << 7,
             Battle = 1 << 8,
-            All = (1 << 9) - 1
+            Cell = 1 << 9,
+            All = (1 << 10) - 1
         }
 
-        public Sniffer()
+        public Sniffer(bool start = false)
         {
-            _shipInfo = new ShipInfo(_itemInfo);
+            _start = start;
+            _itemInfo = new ItemInfo(_itemMaster, _itemInventory);
+            _shipInfo = new ShipInfo(_shipMaster, _shipInventory, _itemInventory);
             _conditionTimer = new ConditionTimer(_shipInfo);
-            _dockInfo = new DockInfo(_shipInfo, _materialInfo);
-            _akashiTimer = new AkashiTimer(_shipInfo, _dockInfo);
+            _dockInfo = new DockInfo(_shipInventory, _materialInfo);
+            _akashiTimer = new AkashiTimer(_shipInfo, _dockInfo, _presetDeck);
             _battleInfo = new BattleInfo(_shipInfo, _itemInfo);
             _logger = new Logger(_shipInfo, _itemInfo, _battleInfo);
-            _baseAirCoprs = new BaseAirCoprs(_itemInfo);
-            _haveState = new List<IHaveState> {_achievement, _materialInfo, _conditionTimer, _exMapInfo};
+            _questInfo = new QuestInfo(_itemInfo, _battleInfo);
+            _airBase = new AirBase(_itemInfo);
+            _miscTextInfo = new MiscTextInfo(_shipInfo, _itemInfo);
+            _haveState = new List<IHaveState> {_achievement, _materialInfo, _conditionTimer, _exMapInfo, _questInfo};
+            AdditionalData = new AdditionalData();
         }
 
-        private void SaveState()
+        public AdditionalData AdditionalData
+        {
+            get => _additionalData;
+            set
+            {
+                _additionalData = value;
+                _itemMaster.AdditionalData = value;
+                _shipMaster.AdditionalData = value;
+            }
+        }
+
+        public void SaveState()
         {
             if (!_saveState)
                 return;
@@ -94,53 +140,77 @@ namespace KancolleSniffer
                 return Update.None;
             var data = json.api_data() ? json.api_data : new object();
 
-            if (url.EndsWith("api_start2"))
+            if (url.Contains("api_start2"))
             {
                 return ApiStart(data);
             }
             if (!_start)
                 return Update.None;
+
             if (url.EndsWith("api_port/port"))
-                return ApiPort(data);
+                return ApiPort(url, data);
             if (url.Contains("member"))
                 return ApiMember(url, json);
             if (url.Contains("kousyou"))
                 return ApiKousyou(url, request, data);
-            if (url.Contains("battle"))
+            if (url.Contains("battle") || url.Contains("sortie"))
                 return ApiBattle(url, request, data);
+            if (url.Contains("hensei"))
+                return ApiHensei(url, request, data);
+            if (url.Contains("kaisou"))
+                return ApiKaisou(url, request, data);
+            if (url.Contains("air_corps"))
+                return ApiAirCorps(url, request, data);
             return ApiOthers(url, request, data);
         }
 
         private Update ApiStart(dynamic data)
         {
             _shipInfo.InspectMaster(data);
+            _shipInfo.ClearBattleResult();
             _missionInfo.InspectMaster(data.api_mst_mission);
             _itemInfo.InspectMaster(data);
             _exMapInfo.ResetIfNeeded();
+            _miscTextInfo.InspectMaster(data);
+            SetMapDictionary(data.api_mst_mapinfo);
             _start = true;
             return Update.Start;
         }
 
-        private Update ApiPort(dynamic data)
+        private void SetMapDictionary(dynamic json)
+        {
+            foreach (var map in json)
+                MapDictionary[map.api_name] = $"{map.api_maparea_id}-{map.api_no}";
+        }
+
+        private Update ApiPort(string url, dynamic data)
         {
             _itemInfo.InspectBasic(data.api_basic);
-            _materialInfo.InspectMaterial(data.api_material, true);
+            _materialInfo.InspectMaterialPort(data.api_material);
             _logger.InspectBasic(data.api_basic);
             _logger.InspectMaterial(data.api_material);
-            _shipInfo.InspectShip(data);
+            _shipInfo.InspectShip(url, data);
             _shipInfo.ClearBadlyDamagedShips();
-            _conditionTimer.CalcRegenTime();
+            _conditionTimer.CalcRegainTime();
             _missionInfo.InspectDeck(data.api_deck_port);
+            _questInfo.InspectDeck(data.api_deck_port);
             _dockInfo.InspectNDock(data.api_ndock);
             _akashiTimer.Port();
             _achievement.InspectBasic(data.api_basic);
             if (data.api_parallel_quest_count()) // 昔のログにはないので
-                _questInfo.QuestCount = (int)data.api_parallel_quest_count;
+                _questInfo.AcceptMax = (int)data.api_parallel_quest_count;
+            if (data.api_event_object())
+                _airBase.InspectEventObject(data.api_event_object);
+            if (data.api_plane_info())
+                _airBase.InspectPlaneInfo(data.api_plane_info);
             _battleInfo.CleanupResult();
-            _battleInfo.InBattle = false;
-            _shipInfo.ClearEscapedShips();
-            _miscTextInfo.ClearIfNeeded();
+            _battleInfo.BattleState = BattleState.None;
+            _miscTextInfo.Port();
+            _cellInfo.Port();
             SaveState();
+            RepeatingTimerController?.Resume();
+            foreach (var s in new[] {"遠征終了", "入渠終了", "疲労回復", "泊地修理", "大破警告"})
+                RepeatingTimerController?.Stop(s);
             return Update.All;
         }
 
@@ -152,7 +222,7 @@ namespace KancolleSniffer
             {
                 _itemInfo.InspectSlotItem(data.api_slot_item, true);
                 _dockInfo.InspectKDock(data.api_kdock);
-                return Update.Timer;
+                return Update.None;
             }
             if (url.EndsWith("api_get_member/basic"))
             {
@@ -176,6 +246,7 @@ namespace KancolleSniffer
                 _dockInfo.InspectNDock(data);
                 _conditionTimer.CheckCond();
                 _akashiTimer.CheckFleet();
+                RepeatingTimerController?.Stop("入渠終了");
                 return Update.NDock | Update.Timer | Update.Ship;
             }
             if (url.EndsWith("api_get_member/questlist"))
@@ -188,26 +259,27 @@ namespace KancolleSniffer
                 _shipInfo.InspectDeck(data);
                 _missionInfo.InspectDeck(data);
                 _akashiTimer.CheckFleet();
+                _questInfo.InspectDeck(data);
                 return Update.Mission | Update.Timer;
             }
             if (url.EndsWith("api_get_member/ship2"))
             {
                 // ここだけjsonなので注意
-                _shipInfo.InspectShip(json);
+                _shipInfo.InspectShip(url, json);
                 _akashiTimer.CheckFleet();
-                _battleInfo.InBattle = false;
+                _battleInfo.BattleState = BattleState.None;
                 return Update.Item | Update.Ship | Update.Battle;
             }
             if (url.EndsWith("api_get_member/ship_deck"))
             {
-                _shipInfo.InspectShip(data);
+                _shipInfo.InspectShip(url, data);
                 _akashiTimer.CheckFleet();
-                _battleInfo.InBattle = false;
-                return Update.Ship | Update.Battle;
+                _battleInfo.BattleState = BattleState.None;
+                return Update.Ship | Update.Battle | Update.Item;
             }
             if (url.EndsWith("api_get_member/ship3"))
             {
-                _shipInfo.InspectShip(data);
+                _shipInfo.InspectShip(url, data);
                 _akashiTimer.CheckFleet();
                 _conditionTimer.CheckCond();
                 return Update.Ship;
@@ -221,6 +293,8 @@ namespace KancolleSniffer
             {
                 _exMapInfo.InspectMapInfo(data);
                 _miscTextInfo.InspectMapInfo(data);
+                if (data.api_air_base())
+                    _airBase.Inspect(data.api_air_base);
                 return Update.Item;
             }
             if (url.EndsWith("api_req_member/get_practice_enemyinfo"))
@@ -230,12 +304,12 @@ namespace KancolleSniffer
             }
             if (url.EndsWith("api_get_member/preset_deck"))
             {
-                _shipInfo.InspectPresetDeck(data);
+                _presetDeck.Inspect(data);
                 return Update.None;
             }
             if (url.EndsWith("api_get_member/base_air_corps"))
             {
-                _baseAirCoprs.Inspect(data);
+                _airBase.Inspect(data);
                 return Update.Ship;
             }
             return Update.None;
@@ -248,14 +322,16 @@ namespace KancolleSniffer
                 _itemInfo.InspectCreateItem(data);
                 _materialInfo.InspectCreateIem(data);
                 _logger.InspectCreateItem(request, data);
-                return Update.Item;
+                _questInfo.CountCreateItem();
+                return Update.Item | Update.QuestList;
             }
             if (url.EndsWith("api_req_kousyou/getship"))
             {
                 _itemInfo.InspectGetShip(data);
-                _shipInfo.InspectShip(data);
+                _shipInfo.InspectShip(url, data);
                 _dockInfo.InspectKDock(data.api_kdock);
                 _conditionTimer.CheckCond();
+                RepeatingTimerController?.Stop("建造完了");
                 return Update.Item | Update.Timer;
             }
             if (url.EndsWith("api_req_kousyou/destroyship"))
@@ -264,13 +340,15 @@ namespace KancolleSniffer
                 _materialInfo.InspectDestroyShip(data);
                 _conditionTimer.CheckCond();
                 _akashiTimer.CheckFleet();
-                return Update.Item | Update.Ship;
+                _questInfo.InspectDestroyShip(request);
+                return Update.Item | Update.Ship | Update.QuestList;
             }
             if (url.EndsWith("api_req_kousyou/destroyitem2"))
             {
+                _questInfo.InspectDestroyItem(request, data); // 本当に削除される前
                 _itemInfo.InspectDestroyItem(request, data);
                 _materialInfo.InspectDestroyItem(data);
-                return Update.Item;
+                return Update.Item | Update.QuestList;
             }
             if (url.EndsWith("api_req_kousyou/remodel_slot"))
             {
@@ -278,12 +356,14 @@ namespace KancolleSniffer
                 _logger.InspectRemodelSlot(request, data); // 資材の差が必要なので_materialInfoより前
                 _itemInfo.InspectRemodelSlot(data);
                 _materialInfo.InspectRemodelSlot(data);
-                return Update.Item;
+                _questInfo.CountRemodelSlot();
+                return Update.Item | Update.QuestList;
             }
             if (url.EndsWith("api_req_kousyou/createship"))
             {
                 _logger.InspectCreateShip(request);
-                return Update.None;
+                _questInfo.CountCreateShip();
+                return Update.QuestList;
             }
             if (url.EndsWith("api_req_kousyou/createship_speedchange"))
             {
@@ -295,52 +375,49 @@ namespace KancolleSniffer
 
         private Update ApiBattle(string url, string request, dynamic data)
         {
-            if (IsNormalBattleAPI(url))
+            if (IsNormalBattleAPI(url) || IsCombinedBattleAPI(url))
             {
-                _battleInfo.InspectBattle(data, url);
+                _shipInfo.ClearBadlyDamagedShips();
+                RepeatingTimerController?.Stop("大破警告");
+                _battleInfo.InspectBattle(url, request, data);
                 _logger.InspectBattle(data);
+                _cellInfo.StartBattle();
                 return Update.Ship | Update.Battle;
             }
             if (url.EndsWith("api_req_practice/battle") || url.EndsWith("api_req_practice/midnight_battle"))
             {
                 if (url.EndsWith("/battle"))
                 {
-                    _shipInfo.InspectMapStart(request); // 演習を出撃中とみなす
+                    _shipInfo.StartPractice(request);
+                    _questInfo.StartPractice(request);
+                    _cellInfo.StartPractice();
                     _conditionTimer.InvalidateCond();
-                    _miscTextInfo.ClearFlag = true;
+                    RepeatingTimerController?.Suspend();
                 }
-                _battleInfo.InspectBattle(data, url);
+                _battleInfo.InspectBattle(url, request, data);
                 return Update.Ship | Update.Battle | Update.Timer;
             }
-            if (url.EndsWith("api_req_sortie/battleresult"))
+            if (url.EndsWith("api_req_sortie/battleresult") || url.EndsWith("api_req_combined_battle/battleresult"))
             {
                 _battleInfo.InspectBattleResult(data);
                 _exMapInfo.InspectBattleResult(data);
                 _logger.InspectBattleResult(data);
-                return Update.Ship;
+                _questInfo.InspectBattleResult(data);
+                _miscTextInfo.InspectBattleResult(data);
+                return Update.Ship | Update.QuestList;
             }
             if (url.EndsWith("api_req_practice/battle_result"))
             {
                 _battleInfo.InspectPracticeResult(data);
-                return Update.Ship;
-            }
-            if (IsCombinedBattleAPI(url))
-            {
-                _battleInfo.InspectCombinedBattle(data, url);
-                _logger.InspectBattle(data);
-                return Update.Ship | Update.Battle;
-            }
-            if (url.EndsWith("api_req_combined_battle/battleresult"))
-            {
-                _battleInfo.InspectCombinedBattleResult(data);
-                _logger.InspectBattleResult(data);
-                return Update.Ship;
+                _questInfo.InspectPracticeResult(data);
+                return Update.Ship | Update.QuestList;
             }
-            if (url.EndsWith("api_req_combined_battle/goback_port"))
+            if (url.EndsWith("/goback_port"))
             {
-                _battleInfo.CauseCombinedBattleEscape();
+                _battleInfo.CauseEscape();
                 return Update.Ship;
             }
+            _battleInfo.BattleState = BattleState.Unknown;
             return Update.None;
         }
 
@@ -349,6 +426,7 @@ namespace KancolleSniffer
             return url.EndsWith("api_req_sortie/battle") ||
                    url.EndsWith("api_req_sortie/airbattle") ||
                    url.EndsWith("api_req_sortie/ld_airbattle") ||
+                   url.EndsWith("api_req_sortie/ld_shooting") ||
                    url.EndsWith("api_req_battle_midnight/battle") ||
                    url.EndsWith("api_req_battle_midnight/sp_midnight");
         }
@@ -360,10 +438,15 @@ namespace KancolleSniffer
                    url.EndsWith("api_req_combined_battle/ld_airbattle") ||
                    url.EndsWith("api_req_combined_battle/battle_water") ||
                    url.EndsWith("api_req_combined_battle/midnight_battle") ||
-                   url.EndsWith("api_req_combined_battle/sp_midnight");
+                   url.EndsWith("api_req_combined_battle/sp_midnight") ||
+                   url.EndsWith("api_req_combined_battle/ec_battle") ||
+                   url.EndsWith("api_req_combined_battle/ec_midnight_battle") ||
+                   url.EndsWith("api_req_combined_battle/ec_night_to_day") ||
+                   url.EndsWith("api_req_combined_battle/each_battle") ||
+                   url.EndsWith("api_req_combined_battle/each_battle_water");
         }
 
-        private Update ApiOthers(string url, string request, dynamic data)
+        private Update ApiHensei(string url, string request, dynamic data)
         {
             if (url.EndsWith("api_req_hensei/change"))
             {
@@ -379,12 +462,12 @@ namespace KancolleSniffer
             }
             if (url.EndsWith("api_req_hensei/preset_register"))
             {
-                _shipInfo.InspectPresetRegister(data);
+                _presetDeck.InspectRegister(data);
                 return Update.None;
             }
             if (url.EndsWith("api_req_hensei/preset_delete"))
             {
-                _shipInfo.InspectPresetDelete(request);
+                _presetDeck.InspectDelete(request);
                 return Update.Timer;
             }
             if (url.EndsWith("api_req_hensei/combined"))
@@ -392,18 +475,18 @@ namespace KancolleSniffer
                 _shipInfo.InspectCombined(request);
                 return Update.Ship;
             }
-            if (url.EndsWith("api_req_hokyu/charge"))
-            {
-                _shipInfo.InspectCharge(data);
-                _materialInfo.InspectCharge(data);
-                return Update.Item | Update.Ship;
-            }
+            return Update.None;
+        }
+
+        private Update ApiKaisou(string url, string request, dynamic data)
+        {
             if (url.EndsWith("api_req_kaisou/powerup"))
             {
-                _shipInfo.InspectPowerup(request, data);
+                _shipInfo.InspectPowerUp(request, data);
                 _conditionTimer.CheckCond();
                 _akashiTimer.CheckFleet();
-                return Update.Item | Update.Ship;
+                _questInfo.InspectPowerUp(data);
+                return Update.Item | Update.Ship | Update.QuestList;
             }
             if (url.EndsWith("api_req_kaisou/slot_exchange_index"))
             {
@@ -415,39 +498,102 @@ namespace KancolleSniffer
                 _shipInfo.InspectSlotDeprive(data);
                 return Update.Ship;
             }
+            if (url.EndsWith("api_req_kaisou/marriage"))
+            {
+                _shipInfo.InspectMarriage(data);
+                return Update.Ship;
+            }
+            return Update.None;
+        }
+
+        private Update ApiAirCorps(string url, string request, dynamic data)
+        {
+            if (url.EndsWith("api_req_air_corps/supply"))
+            {
+                _materialInfo.InspectAirCorpsSupply(data);
+                _airBase.InspectSupply(request, data);
+                return Update.Item;
+            }
+            if (url.EndsWith("api_req_air_corps/set_plane"))
+            {
+                _materialInfo.InspectAirCorpsSetPlane(data);
+                _airBase.InspectSetPlane(request, data);
+                return Update.Item | Update.Ship;
+            }
+            if (url.EndsWith("api_req_air_corps/set_action"))
+            {
+                _airBase.InspectSetAction(request);
+                return Update.Ship;
+            }
+            if (url.EndsWith("api_req_air_corps/expand_base"))
+            {
+                _airBase.InspectExpandBase(request, data);
+                return Update.Ship;
+            }
+            return Update.None;
+        }
+
+        private Update ApiOthers(string url, string request, dynamic data)
+        {
+            if (url.EndsWith("api_req_hokyu/charge"))
+            {
+                _shipInfo.InspectCharge(data);
+                _materialInfo.InspectCharge(data);
+                _questInfo.CountCharge();
+                return Update.Item | Update.Ship | Update.QuestList;
+            }
             if (url.EndsWith("api_req_nyukyo/start"))
             {
                 _dockInfo.InspectNyukyo(request);
                 _conditionTimer.CheckCond();
                 _akashiTimer.CheckFleet();
-                return Update.Item | Update.Ship;
+                _questInfo.CountNyukyo();
+                var ndock = HttpUtility.ParseQueryString(request)["api_ndock_id"];
+                if (ndock != null && int.TryParse(ndock, out int id))
+                    RepeatingTimerController?.Stop("入渠終了", id - 1);
+                return Update.Item | Update.Ship | Update.QuestList;
             }
             if (url.EndsWith("api_req_nyukyo/speedchange"))
             {
                 _dockInfo.InspectSpeedChange(request);
                 _conditionTimer.CheckCond();
-                return Update.NDock | Update.Timer | Update.Ship;
+                return Update.NDock | Update.Timer | Update.Item | Update.Ship;
             }
             if (url.EndsWith("api_req_map/start"))
             {
                 _shipInfo.InspectMapStart(request); // 出撃中判定が必要なので_conditionTimerより前
                 _conditionTimer.InvalidateCond();
                 _exMapInfo.InspectMapStart(data);
+                _battleInfo.InspectMapStart(data);
                 _logger.InspectMapStart(data);
-                _miscTextInfo.ClearFlag = true;
-                return Update.Timer | Update.Ship;
+                _miscTextInfo.InspectMapStart(data);
+                _questInfo.InspectMapStart(data);
+                _cellInfo.InspectMapStart(data);
+                RepeatingTimerController?.Suspend("大破警告");
+                return Update.Timer | Update.Ship | Update.Cell;
             }
             if (url.EndsWith("api_req_map/next"))
             {
-                _battleInfo.InspectMapNext(request);
                 _exMapInfo.InspectMapNext(data);
+                _battleInfo.InspectMapNext(data);
                 _logger.InspectMapNext(data);
+                _questInfo.InspectMapNext(data);
+                _miscTextInfo.InspectMapNext(data);
+                _cellInfo.InspectMapNext(data);
+                return Update.Cell;
+            }
+            if (url.EndsWith("api_req_mission/start"))
+            {
+                var deck = HttpUtility.ParseQueryString(request)["api_deck_id"];
+                if (deck != null && int.TryParse(deck, out int id))
+                    RepeatingTimerController?.Stop("遠征終了", id - 1);
                 return Update.None;
             }
             if (url.EndsWith("api_req_mission/result"))
             {
                 _materialInfo.InspectMissionResult(data);
                 _logger.InspectMissionResult(data);
+                _questInfo.InspectMissionResult(request, data);
                 return Update.Item;
             }
             if (url.EndsWith("api_req_quest/stop"))
@@ -458,30 +604,17 @@ namespace KancolleSniffer
             if (url.EndsWith("api_req_quest/clearitemget"))
             {
                 _questInfo.InspectClearItemGet(request);
+                _logger.InspectClearItemGet(data);
                 return Update.QuestList;
             }
-            if (url.EndsWith("api_req_air_corps/supply"))
-            {
-                _materialInfo.InspectAirCorpsSupply(data);
-                return Update.Item;
-            }
-            if (url.EndsWith("api_req_air_corps/set_plane"))
-            {
-                _materialInfo.InspectAirCorpsSetPlane(data);
-                _baseAirCoprs.InspectSetPlane(request, data);
-                return Update.Item | Update.Ship;
-            }
-            if (url.EndsWith("api_req_air_corps/set_action"))
-            {
-                _baseAirCoprs.InspectSetAction(request);
-                return Update.Ship;
-            }
             return Update.None;
         }
 
         public NameAndTimer[] NDock => _dockInfo.NDock;
 
-        public RingTimer[] KDock => _dockInfo.KDock;
+        public AlarmTimer[] KDock => _dockInfo.KDock;
+
+        public AlarmCounter ItemCounter => _itemInfo.Counter;
 
         public ItemInfo Item => _itemInfo;
 
@@ -489,25 +622,28 @@ namespace KancolleSniffer
 
         public QuestStatus[] Quests => _questInfo.Quests;
 
+        public void GetQuestNotifications(out string[] notify, out string[] stop) =>
+            _questInfo.GetNotifications(out notify, out stop);
+
+        public void ClearQuests() => _questInfo.ClearQuests();
+
         public NameAndTimer[] Missions => _missionInfo.Missions;
 
         public DateTime GetConditionTimer(int fleet) => _conditionTimer.GetTimer(fleet);
 
-        public int[] GetConditionNotice() => _conditionTimer.GetNotice();
-
-        public ShipStatus[] GetShipStatuses(int fleet) => _shipInfo.GetShipStatuses(fleet);
+        public int[] GetConditionNotice(DateTime prev, DateTime now) => _conditionTimer.GetNotice(prev, now);
 
-        public int[] GetDeck(int fleet) => _shipInfo.GetDeck(fleet);
+        public AlarmCounter ShipCounter => _shipInfo.Counter;
 
-        public int CombinedFleetType => _shipInfo.CombinedFleetType;
+        public IReadOnlyList<Fleet> Fleets => _shipInfo.Fleets;
 
-        public ChargeStatus[] ChargeStatuses => _shipInfo.ChargeStatuses;
+        public ShipInfo.ShipStatusPair[] BattleResultStatusDiff => _shipInfo.BattleResultDiff;
 
-        public int[] GetFighterPower(int fleet) => _shipInfo.GetFighterPower(fleet);
+        public bool IsBattleResultError => _shipInfo.IsBattleResultError || _battleInfo.DisplayedResultRank.IsError;
 
-        public double GetContactTriggerRate(int fleet) => _shipInfo.GetContactTriggerRate(fleet);
+        public ShipStatus[] BattleStartStatus => _shipInfo.BattleStartStatus;
 
-        public double GetFleetLineOfSights(int fleet) => _shipInfo.GetLineOfSights(fleet);
+        public bool IsCombinedFleet => _shipInfo.Fleets[0].CombinedType != 0;
 
         public ShipStatus[] RepairList => _shipInfo.GetRepairList(_dockInfo);
 
@@ -515,7 +651,16 @@ namespace KancolleSniffer
 
         public string[] BadlyDamagedShips => _shipInfo.BadlyDamagedShips;
 
-        public ItemStatus[] ItemList => _itemInfo.GetItemListWithOwner(ShipList);
+        public ItemStatus[] ItemList
+        {
+            get
+            {
+                _itemInfo.ClearHolder();
+                _shipInfo.SetItemHolder();
+                _airBase.SetItemHolder();
+                return _itemInfo.ItemList;
+            }
+        }
 
         public AkashiTimer AkashiTimer => _akashiTimer;
 
@@ -527,7 +672,9 @@ namespace KancolleSniffer
 
         public string MiscText => _miscTextInfo.Text;
 
-        public BaseAirCoprs.AirCorpsInfo[] BaseAirCorps => _baseAirCoprs.AirCorps;
+        public AirBase.BaseInfo[] AirBase => _airBase.AllAirCorps;
+
+        public CellInfo CellInfo => _cellInfo;
 
         public void SetLogWriter(Action<string, string, string> writer, Func<DateTime> nowFunc)
         {
@@ -546,73 +693,17 @@ namespace KancolleSniffer
 
         public int MaterialLogInterval
         {
-            set { _logger.MaterialLogInterval = value; }
+            set => _logger.MaterialLogInterval = value;
         }
 
         public string LogOutputDir
         {
-            set { _logger.OutputDir = value; }
+            set => _logger.OutputDir = value;
         }
-    }
 
-    public class NameAndTimer
-    {
-        public string Name { get; set; }
-        public RingTimer Timer { get; set; }
-
-        public NameAndTimer()
+        public void FlashLog()
         {
-            Timer = new RingTimer();
+            _logger.FlashLog();
         }
     }
-
-    public class RingTimer
-    {
-        private readonly TimeSpan _spare;
-
-        public TimeSpan Rest { get; private set; }
-
-        public bool IsFinished => EndTime != DateTime.MinValue && Rest <= _spare;
-
-        public DateTime EndTime { get; private set; }
-
-        public bool NeedRing { get; set; }
-
-        public RingTimer(int spare = 60)
-        {
-            _spare = TimeSpan.FromSeconds(spare);
-        }
-
-        public void SetEndTime(double time)
-        {
-            SetEndTime((int)time == 0
-                ? DateTime.MinValue
-                : new DateTime(1970, 1, 1).ToLocalTime().AddSeconds(time / 1000));
-        }
-
-        public void SetEndTime(DateTime time)
-        {
-            EndTime = time;
-        }
-
-        public void Update()
-        {
-            if (EndTime == DateTime.MinValue)
-            {
-                Rest = TimeSpan.Zero;
-                return;
-            }
-            var prev = Rest;
-            Rest = EndTime - DateTime.Now;
-            if (Rest < TimeSpan.Zero)
-                Rest = TimeSpan.Zero;
-            if (prev > _spare && _spare >= Rest)
-                NeedRing = true;
-        }
-
-        public string ToString(bool finish = false)
-            => EndTime == DateTime.MinValue
-                ? ""
-                : finish ? EndTime.ToString(@"dd\ HH\:mm") : $@"{(int)Rest.TotalHours:d2}:{Rest:mm\:ss}";
-    }
 }
\ No newline at end of file