OSDN Git Service

敵艦のIDが古いテストを通すための細工を削除する
[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / Sniffer.cs
index 382e098..32ca509 100644 (file)
@@ -14,7 +14,6 @@
 \r
 using System;\r
 using System.Collections.Generic;\r
-using System.Globalization;\r
 using System.Linq;\r
 \r
 namespace KancolleSniffer\r
@@ -24,7 +23,7 @@ namespace KancolleSniffer
         private bool _start;\r
         private readonly ItemInfo _itemInfo = new ItemInfo();\r
         private readonly MaterialInfo _materialInfo = new MaterialInfo();\r
-        private readonly QuestInfo _questInfo = new QuestInfo();\r
+        private readonly QuestInfo _questInfo;\r
         private readonly MissionInfo _missionInfo = new MissionInfo();\r
         private readonly ShipInfo _shipInfo;\r
         private readonly ConditionTimer _conditionTimer;\r
@@ -34,13 +33,23 @@ namespace KancolleSniffer
         private readonly BattleInfo _battleInfo;\r
         private readonly Logger _logger;\r
         private readonly ExMapInfo _exMapInfo = new ExMapInfo();\r
-        private readonly MiscTextInfo _miscTextInfo = new MiscTextInfo();\r
+        private readonly MiscTextInfo _miscTextInfo;\r
         private readonly BaseAirCoprs _baseAirCoprs;\r
         private readonly PresetDeck _presetDeck = new PresetDeck();\r
         private readonly Status _status = new Status();\r
         private bool _saveState;\r
         private readonly List<IHaveState> _haveState;\r
 \r
+        public interface IRepeatingTimerController\r
+        {\r
+            void Stop(string key);\r
+            void Stop(string key, int fleet);\r
+            void Suspend();\r
+            void Resume();\r
+        }\r
+\r
+        public IRepeatingTimerController RepeatingTimerController { get; set; }\r
+\r
         [Flags]\r
         public enum Update\r
         {\r
@@ -57,19 +66,22 @@ namespace KancolleSniffer
             All = (1 << 9) - 1\r
         }\r
 \r
-        public Sniffer()\r
+        public Sniffer(bool start = false)\r
         {\r
+            _start = start;\r
             _shipInfo = new ShipInfo(_itemInfo);\r
             _conditionTimer = new ConditionTimer(_shipInfo);\r
             _dockInfo = new DockInfo(_shipInfo, _materialInfo);\r
             _akashiTimer = new AkashiTimer(_shipInfo, _dockInfo, _presetDeck);\r
             _battleInfo = new BattleInfo(_shipInfo, _itemInfo);\r
             _logger = new Logger(_shipInfo, _itemInfo, _battleInfo);\r
+            _questInfo = new QuestInfo(_itemInfo, _battleInfo);\r
             _baseAirCoprs = new BaseAirCoprs(_itemInfo);\r
-            _haveState = new List<IHaveState> {_achievement, _materialInfo, _conditionTimer, _exMapInfo};\r
+            _miscTextInfo = new MiscTextInfo(_shipInfo, _itemInfo);\r
+            _haveState = new List<IHaveState> {_achievement, _materialInfo, _conditionTimer, _exMapInfo, _questInfo};\r
         }\r
 \r
-        private void SaveState()\r
+        public void SaveState()\r
         {\r
             if (!_saveState)\r
                 return;\r
@@ -102,6 +114,7 @@ namespace KancolleSniffer
             }\r
             if (!_start)\r
                 return Update.None;\r
+\r
             if (url.EndsWith("api_port/port"))\r
                 return ApiPort(data);\r
             if (url.Contains("member"))\r
@@ -119,6 +132,7 @@ namespace KancolleSniffer
             _missionInfo.InspectMaster(data.api_mst_mission);\r
             _itemInfo.InspectMaster(data);\r
             _exMapInfo.ResetIfNeeded();\r
+            _miscTextInfo.InspectMaster(data);\r
             _start = true;\r
             return Update.Start;\r
         }\r
@@ -133,11 +147,12 @@ namespace KancolleSniffer
             _shipInfo.ClearBadlyDamagedShips();\r
             _conditionTimer.CalcRegenTime();\r
             _missionInfo.InspectDeck(data.api_deck_port);\r
+            _questInfo.InspectDeck(data.api_deck_port);\r
             _dockInfo.InspectNDock(data.api_ndock);\r
             _akashiTimer.Port();\r
             _achievement.InspectBasic(data.api_basic);\r
             if (data.api_parallel_quest_count()) // 昔のログにはないので\r
-                _questInfo.QuestCount = (int)data.api_parallel_quest_count;\r
+                _questInfo.AcceptMax = (int)data.api_parallel_quest_count;\r
             if (data.api_event_object())\r
                 _baseAirCoprs.InspectEventObject(data.api_event_object);\r
             if (data.api_plane_info())\r
@@ -145,8 +160,11 @@ namespace KancolleSniffer
             _battleInfo.CleanupResult();\r
             _battleInfo.BattleState = BattleState.None;\r
             _shipInfo.ClearEscapedShips();\r
-            _miscTextInfo.ClearIfNeeded();\r
+            _miscTextInfo.Port();\r
             SaveState();\r
+            RepeatingTimerController?.Resume();\r
+            foreach (var s in new[] {"遠征終了", "入渠終了", "疲労回復", "泊地修理"})\r
+                RepeatingTimerController?.Stop(s);\r
             return Update.All;\r
         }\r
 \r
@@ -158,7 +176,7 @@ namespace KancolleSniffer
             {\r
                 _itemInfo.InspectSlotItem(data.api_slot_item, true);\r
                 _dockInfo.InspectKDock(data.api_kdock);\r
-                return Update.Timer;\r
+                return Update.None;\r
             }\r
             if (url.EndsWith("api_get_member/basic"))\r
             {\r
@@ -182,6 +200,7 @@ namespace KancolleSniffer
                 _dockInfo.InspectNDock(data);\r
                 _conditionTimer.CheckCond();\r
                 _akashiTimer.CheckFleet();\r
+                RepeatingTimerController?.Stop("入渠終了");\r
                 return Update.NDock | Update.Timer | Update.Ship;\r
             }\r
             if (url.EndsWith("api_get_member/questlist"))\r
@@ -194,6 +213,7 @@ namespace KancolleSniffer
                 _shipInfo.InspectDeck(data);\r
                 _missionInfo.InspectDeck(data);\r
                 _akashiTimer.CheckFleet();\r
+                _questInfo.InspectDeck(data);\r
                 return Update.Mission | Update.Timer;\r
             }\r
             if (url.EndsWith("api_get_member/ship2"))\r
@@ -256,7 +276,8 @@ namespace KancolleSniffer
                 _itemInfo.InspectCreateItem(data);\r
                 _materialInfo.InspectCreateIem(data);\r
                 _logger.InspectCreateItem(request, data);\r
-                return Update.Item;\r
+                _questInfo.CountCreateItem();\r
+                return Update.Item | Update.QuestList;\r
             }\r
             if (url.EndsWith("api_req_kousyou/getship"))\r
             {\r
@@ -264,6 +285,7 @@ namespace KancolleSniffer
                 _shipInfo.InspectShip(data);\r
                 _dockInfo.InspectKDock(data.api_kdock);\r
                 _conditionTimer.CheckCond();\r
+                RepeatingTimerController?.Stop("建造完了");\r
                 return Update.Item | Update.Timer;\r
             }\r
             if (url.EndsWith("api_req_kousyou/destroyship"))\r
@@ -272,13 +294,15 @@ namespace KancolleSniffer
                 _materialInfo.InspectDestroyShip(data);\r
                 _conditionTimer.CheckCond();\r
                 _akashiTimer.CheckFleet();\r
-                return Update.Item | Update.Ship;\r
+                _questInfo.InspectDestroyShip(request);\r
+                return Update.Item | Update.Ship | Update.QuestList;\r
             }\r
             if (url.EndsWith("api_req_kousyou/destroyitem2"))\r
             {\r
+                _questInfo.InspectDestroyItem(request, data); // 本当に削除される前\r
                 _itemInfo.InspectDestroyItem(request, data);\r
                 _materialInfo.InspectDestroyItem(data);\r
-                return Update.Item;\r
+                return Update.Item | Update.QuestList;\r
             }\r
             if (url.EndsWith("api_req_kousyou/remodel_slot"))\r
             {\r
@@ -286,12 +310,14 @@ namespace KancolleSniffer
                 _logger.InspectRemodelSlot(request, data); // 資材の差が必要なので_materialInfoより前\r
                 _itemInfo.InspectRemodelSlot(data);\r
                 _materialInfo.InspectRemodelSlot(data);\r
-                return Update.Item;\r
+                _questInfo.CountRemodelSlot();\r
+                return Update.Item | Update.QuestList;\r
             }\r
             if (url.EndsWith("api_req_kousyou/createship"))\r
             {\r
                 _logger.InspectCreateShip(request);\r
-                return Update.None;\r
+                _questInfo.CountCreateShip();\r
+                return Update.QuestList;\r
             }\r
             if (url.EndsWith("api_req_kousyou/createship_speedchange"))\r
             {\r
@@ -305,7 +331,7 @@ namespace KancolleSniffer
         {\r
             if (IsNormalBattleAPI(url) || IsCombinedBattleAPI(url))\r
             {\r
-                _battleInfo.InspectBattle(data, url);\r
+                _battleInfo.InspectBattle(url, request, data);\r
                 _logger.InspectBattle(data);\r
                 return Update.Ship | Update.Battle;\r
             }\r
@@ -315,9 +341,9 @@ namespace KancolleSniffer
                 {\r
                     _shipInfo.InspectMapStart(request); // 演習を出撃中とみなす\r
                     _conditionTimer.InvalidateCond();\r
-                    _miscTextInfo.ClearFlag = true;\r
+                    RepeatingTimerController?.Suspend();\r
                 }\r
-                _battleInfo.InspectBattle(data, url);\r
+                _battleInfo.InspectBattle(url, request, data);\r
                 return Update.Ship | Update.Battle | Update.Timer;\r
             }\r
             if (url.EndsWith("api_req_sortie/battleresult") || url.EndsWith("api_req_combined_battle/battleresult"))\r
@@ -325,12 +351,15 @@ namespace KancolleSniffer
                 _battleInfo.InspectBattleResult(data);\r
                 _exMapInfo.InspectBattleResult(data);\r
                 _logger.InspectBattleResult(data);\r
-                return Update.Ship;\r
+                _questInfo.InspectBattleResult(data);\r
+                _miscTextInfo.InspectBattleResult(data);\r
+                return Update.Ship | Update.QuestList;\r
             }\r
             if (url.EndsWith("api_req_practice/battle_result"))\r
             {\r
                 _battleInfo.InspectPracticeResult(data);\r
-                return Update.Ship;\r
+                _questInfo.InspectPracticeResult(data);\r
+                return Update.Ship | Update.QuestList;\r
             }\r
             if (url.EndsWith("/goback_port"))\r
             {\r
@@ -398,14 +427,16 @@ namespace KancolleSniffer
             {\r
                 _shipInfo.InspectCharge(data);\r
                 _materialInfo.InspectCharge(data);\r
-                return Update.Item | Update.Ship;\r
+                _questInfo.CountCharge();\r
+                return Update.Item | Update.Ship | Update.QuestList;\r
             }\r
             if (url.EndsWith("api_req_kaisou/powerup"))\r
             {\r
                 _shipInfo.InspectPowerup(request, data);\r
                 _conditionTimer.CheckCond();\r
                 _akashiTimer.CheckFleet();\r
-                return Update.Item | Update.Ship;\r
+                _questInfo.InspectPowerup(data);\r
+                return Update.Item | Update.Ship | Update.QuestList;\r
             }\r
             if (url.EndsWith("api_req_kaisou/slot_exchange_index"))\r
             {\r
@@ -422,7 +453,11 @@ namespace KancolleSniffer
                 _dockInfo.InspectNyukyo(request);\r
                 _conditionTimer.CheckCond();\r
                 _akashiTimer.CheckFleet();\r
-                return Update.Item | Update.Ship;\r
+                _questInfo.CountNyukyo();\r
+                var ndock = HttpUtility.ParseQueryString(request)["api_ndock_id"];\r
+                if (ndock != null && int.TryParse(ndock, out int id))\r
+                    RepeatingTimerController?.Stop("入渠終了", id - 1);\r
+                return Update.Item | Update.Ship | Update.QuestList;\r
             }\r
             if (url.EndsWith("api_req_nyukyo/speedchange"))\r
             {\r
@@ -437,21 +472,32 @@ namespace KancolleSniffer
                 _exMapInfo.InspectMapStart(data);\r
                 _battleInfo.InspectMapStart(data);\r
                 _logger.InspectMapStart(data);\r
-                _miscTextInfo.ClearFlag = true;\r
+                _miscTextInfo.SortieStarted = true;\r
+                _questInfo.InspectMapStart(data);\r
+                RepeatingTimerController?.Suspend();\r
                 return Update.Timer | Update.Ship;\r
             }\r
             if (url.EndsWith("api_req_map/next"))\r
             {\r
-                _battleInfo.InspectMapNext(request);\r
                 _exMapInfo.InspectMapNext(data);\r
                 _battleInfo.InspectMapNext(data);\r
                 _logger.InspectMapNext(data);\r
+                _questInfo.InspectMapNext(data);\r
+                _miscTextInfo.InspectMapNext(data);\r
+                return Update.None;\r
+            }\r
+            if (url.EndsWith("api_req_mission/start"))\r
+            {\r
+                var deck = HttpUtility.ParseQueryString(request)["api_deck_id"];\r
+                if (deck != null && int.TryParse(deck, out int id))\r
+                    RepeatingTimerController?.Stop("遠征終了", id - 1);\r
                 return Update.None;\r
             }\r
             if (url.EndsWith("api_req_mission/result"))\r
             {\r
                 _materialInfo.InspectMissionResult(data);\r
                 _logger.InspectMissionResult(data);\r
+                _questInfo.InspectMissionResult(request, data);\r
                 return Update.Item;\r
             }\r
             if (url.EndsWith("api_req_quest/stop"))\r
@@ -492,7 +538,7 @@ namespace KancolleSniffer
 \r
         public NameAndTimer[] NDock => _dockInfo.NDock;\r
 \r
-        public RingTimer[] KDock => _dockInfo.KDock;\r
+        public AlarmTimer[] KDock => _dockInfo.KDock;\r
 \r
         public ItemInfo Item => _itemInfo;\r
 \r
@@ -500,16 +546,20 @@ namespace KancolleSniffer
 \r
         public QuestStatus[] Quests => _questInfo.Quests;\r
 \r
+        public void ClearQuests() => _questInfo.ClearQuests();\r
+\r
         public NameAndTimer[] Missions => _missionInfo.Missions;\r
 \r
         public DateTime GetConditionTimer(int fleet) => _conditionTimer.GetTimer(fleet);\r
 \r
-        public int[] GetConditionNotice() => _conditionTimer.GetNotice();\r
+        public int[] GetConditionNotice(DateTime prev, DateTime now) => _conditionTimer.GetNotice(prev, now);\r
 \r
         public ShipStatus[] GetShipStatuses(int fleet) => _shipInfo.GetShipStatuses(fleet);\r
 \r
         public int[] GetDeck(int fleet) => _shipInfo.GetDeck(fleet);\r
 \r
+        public bool[] InSortie => _shipInfo.InSortie;\r
+\r
         public ShipInfo.ShipStatusPair[] BattleResultStatusDiff => _shipInfo.BattleResultDiff;\r
 \r
         public bool IsBattleResultStatusError => _shipInfo.IsBattleResultError;\r
@@ -559,11 +609,6 @@ 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
@@ -594,67 +639,4 @@ namespace KancolleSniffer
             _logger.FlashLog();\r
         }\r
     }\r
-\r
-    public class NameAndTimer\r
-    {\r
-        public string Name { get; set; }\r
-        public RingTimer Timer { get; set; }\r
-\r
-        public NameAndTimer()\r
-        {\r
-            Timer = new RingTimer();\r
-        }\r
-    }\r
-\r
-    public class RingTimer\r
-    {\r
-        private readonly TimeSpan _spare;\r
-\r
-        public TimeSpan Rest { get; private set; }\r
-\r
-        public bool IsFinished => EndTime != DateTime.MinValue && Rest <= _spare;\r
-\r
-        public DateTime EndTime { get; private set; }\r
-\r
-        public bool NeedRing { get; set; }\r
-\r
-        public RingTimer(int spare = 60)\r
-        {\r
-            _spare = TimeSpan.FromSeconds(spare);\r
-        }\r
-\r
-        public void SetEndTime(double time)\r
-        {\r
-            SetEndTime((int)time == 0\r
-                ? DateTime.MinValue\r
-                : new DateTime(1970, 1, 1).ToLocalTime().AddSeconds(time / 1000));\r
-        }\r
-\r
-        public void SetEndTime(DateTime time)\r
-        {\r
-            EndTime = time;\r
-        }\r
-\r
-        public void Update()\r
-        {\r
-            if (EndTime == DateTime.MinValue)\r
-            {\r
-                Rest = TimeSpan.Zero;\r
-                return;\r
-            }\r
-            var prev = Rest;\r
-            Rest = EndTime - DateTime.Now;\r
-            if (Rest < TimeSpan.Zero)\r
-                Rest = TimeSpan.Zero;\r
-            if (prev > _spare && _spare >= Rest)\r
-                NeedRing = true;\r
-        }\r
-\r
-        public string ToString(bool finish = false)\r
-            => EndTime == DateTime.MinValue\r
-                ? ""\r
-                : finish\r
-                    ? EndTime.ToString(@"dd\ HH\:mm", CultureInfo.InvariantCulture)\r
-                    : $"{(int)Rest.TotalHours:d2}:" + Rest.ToString(@"mm\:ss", CultureInfo.InvariantCulture);\r
-    }\r
 }
\ No newline at end of file