母港に戻る前に連合艦隊表示にできるようにする

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

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index 7bb2d6d..7382765 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -130,7 +130,7 @@ namespace KancolleSniffer
             _conditionTimer.CalcRegenTime();\r
             _missionInfo.InspectDeck(data.api_deck_port);\r
             _dockInfo.InspectNDock(data.api_ndock);\r
-            _akashiTimer.SetTimer(true);\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
@@ -168,7 +168,7 @@ namespace KancolleSniffer
             {\r
                 _dockInfo.InspectNDock(data);\r
                 _conditionTimer.CheckCond();\r
-                _akashiTimer.SetTimer();\r
+                _akashiTimer.CheckFleet();\r
                 return Update.NDock | Update.Timer | Update.Ship;\r
             }\r
             if (url.EndsWith("api_get_member/questlist"))\r
@@ -180,28 +180,28 @@ namespace KancolleSniffer
             {\r
                 _shipInfo.InspectDeck(data);\r
                 _missionInfo.InspectDeck(data);\r
-                _akashiTimer.SetTimer();\r
+                _akashiTimer.CheckFleet();\r
                 return Update.Mission | Update.Timer;\r
             }\r
             if (url.EndsWith("api_get_member/ship2"))\r
             {\r
                 // ここだけjsonなので注意\r
                 _shipInfo.InspectShip(json);\r
-                _akashiTimer.SetTimer();\r
+                _akashiTimer.CheckFleet();\r
                 _battleInfo.InBattle = false;\r
                 return Update.Item | Update.Ship | Update.Battle;\r
             }\r
             if (url.EndsWith("api_get_member/ship_deck"))\r
             {\r
                 _shipInfo.InspectShip(data);\r
-                _akashiTimer.SetTimer();\r
+                _akashiTimer.CheckFleet();\r
                 _battleInfo.InBattle = false;\r
                 return Update.Ship | Update.Battle;\r
             }\r
             if (url.EndsWith("api_get_member/ship3"))\r
             {\r
                 _shipInfo.InspectShip(data);\r
-                _akashiTimer.SetTimer();\r
+                _akashiTimer.CheckFleet();\r
                 _conditionTimer.CheckCond();\r
                 return Update.Ship;\r
             }\r
@@ -221,6 +221,11 @@ namespace KancolleSniffer
                 _miscTextInfo.InspectPracticeEnemyInfo(data);\r
                 return Update.Item;\r
             }\r
+            if (url.EndsWith("api_get_member/preset_deck"))\r
+            {\r
+                _shipInfo.InspectPresetDeck(data);\r
+                return Update.None;\r
+            }\r
             return Update.None;\r
         }\r
 \r
@@ -246,7 +251,7 @@ namespace KancolleSniffer
                 _shipInfo.InspectDestroyShip(request, data);\r
                 _materialInfo.InspectDestroyShip(data);\r
                 _conditionTimer.CheckCond();\r
-                _akashiTimer.SetTimer();\r
+                _akashiTimer.CheckFleet();\r
                 return Update.Item | Update.Ship;\r
             }\r
             if (url.EndsWith("api_req_kousyou/destroyitem2"))\r
@@ -349,15 +354,24 @@ namespace KancolleSniffer
             if (url.EndsWith("api_req_hensei/change"))\r
             {\r
                 _shipInfo.InspectChange(request);\r
-                _akashiTimer.SetTimer();\r
+                _akashiTimer.InspectChange(request);\r
                 return Update.Ship;\r
             }\r
             if (url.EndsWith("api_req_hensei/preset_select"))\r
             {\r
                 _shipInfo.InspectDeck(new[] {data});\r
-                _akashiTimer.SetTimer();\r
+                _akashiTimer.CheckFleet();\r
                 return Update.Ship;\r
             }\r
+            if (url.EndsWith("api_req_hensei/preset_register"))\r
+            {\r
+                _shipInfo.InspectPresetRegister(data);\r
+                return Update.None;\r
+            }\r
+            if (url.EndsWith("api_req_hensei/combined"))\r
+            {\r
+                _shipInfo.InspectCombined(request);\r
+            }\r
             if (url.EndsWith("api_req_hokyu/charge"))\r
             {\r
                 _shipInfo.InspectCharge(data);\r
@@ -368,7 +382,7 @@ namespace KancolleSniffer
             {\r
                 _shipInfo.InspectPowerup(request, data);\r
                 _conditionTimer.CheckCond();\r
-                _akashiTimer.SetTimer();\r
+                _akashiTimer.CheckFleet();\r
                 return Update.Item | Update.Ship;\r
             }\r
             if (url.EndsWith("api_req_kaisou/slot_exchange_index"))\r
@@ -380,7 +394,7 @@ namespace KancolleSniffer
             {\r
                 _dockInfo.InspectNyukyo(request);\r
                 _conditionTimer.CheckCond();\r
-                _akashiTimer.SetTimer();\r
+                _akashiTimer.CheckFleet();\r
                 return Update.Item | Update.Ship;\r
             }\r
             if (url.EndsWith("api_req_nyukyo/speedchange"))\r
@@ -433,6 +447,8 @@ namespace KancolleSniffer
 \r
         public int[] GetDeck(int fleet) => _shipInfo.GetDeck(fleet);\r
 \r
+        public int CombinedFleetType => _shipInfo.CombinedFleetType;\r
+\r
         public ChargeStatus[] ChargeStatuses => _shipInfo.ChargeStatuses;\r
 \r
         public int GetFighterPower(int fleet, bool withBonus) => _shipInfo.GetFighterPower(fleet, withBonus);\r
@@ -445,9 +461,7 @@ namespace KancolleSniffer
 \r
         public ItemStatus[] ItemList => _itemInfo.GetItemListWithOwner(ShipList);\r
 \r
-        public AkashiTimer.RepairSpan[] GetAkashiTimers(int fleet) => _akashiTimer.GetTimers(fleet);\r
-\r
-        public AkashiTimer.Notice[] GetAkashiTimerNotice() => _akashiTimer.GetNotice();\r
+        public AkashiTimer AkashiTimer => _akashiTimer;\r
 \r
         public Achievement Achievement => _achievement;\r
 \r