明石が中破以上でもタイマーが進んでしまうのを直す

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

diff --git a/KancolleSniffer/AkashiTimer.cs b/KancolleSniffer/AkashiTimer.cs
index 53d2dcd..e59a887 100644 (file)
--- a/KancolleSniffer/AkashiTimer.cs
+++ b/KancolleSniffer/AkashiTimer.cs
@@ -18,6 +18,7 @@
 using System;\r
 using System.Collections.Generic;\r
 using System.Linq;\r
+using System.Web;\r
 \r
 namespace KancolleSniffer\r
 {\r
@@ -53,11 +54,6 @@ namespace KancolleSniffer
 \r
             public State State { get; set; }\r
 \r
-            public void Invalidate()\r
-            {\r
-                _target = new ShipStatus[0];\r
-            }\r
-\r
             public bool IsRepaired(ShipStatus[] target) => _target.Zip(target, (a, b) => a.NowHp < b.NowHp).Any(x => x);\r
 \r
             public bool DeckChanged(IEnumerable<int> deck) => !_deck.SequenceEqual(deck);\r
@@ -150,38 +146,28 @@ namespace KancolleSniffer
                 _repairStatuses[i] = new RepairStatus();\r
         }\r
 \r
-        [Flags]\r
         private enum State\r
         {\r
-            Stop = 0,\r
-            Continue = 1,\r
-            Reset = 2,\r
-            Reparing = 4\r
+            Continue = 0,\r
+            Reset = 1,\r
         }\r
 \r
         public void Port()\r
         {\r
             CheckFleet();\r
             var now = DateTime.Now;\r
-            var reparing = _repairStatuses.Any(r => (r.State & State.Reparing) != 0);\r
-            var stop = _repairStatuses.All(r => (r.State & State.Continue) == 0);\r
-            if (now - _start > TimeSpan.FromMinutes(20))\r
-            {\r
-                if (reparing)\r
-                    _start = now;\r
-                else if (stop)\r
-                    _start = DateTime.MinValue;\r
-            }\r
-            else if (!stop && _start == DateTime.MinValue)\r
-            {\r
+            var reset = _repairStatuses.Any(r => r.State == State.Reset);\r
+            if (_start == DateTime.MinValue || now - _start > TimeSpan.FromMinutes(20) || reset)\r
                 _start = now;\r
-            }\r
         }\r
 \r
-        public void DeckChanged()\r
+        public void InspectChange(string request)\r
         {\r
             CheckFleet();\r
-            if (_repairStatuses.Any(r => (r.State & State.Reset) != 0))\r
+            var values = HttpUtility.ParseQueryString(request);\r
+            if (int.Parse(values["api_ship_idx"]) == -1)\r
+                return;\r
+            if (_repairStatuses.Any(r => r.State == State.Reset))\r
                 _start = DateTime.Now;\r
         }\r
 \r
@@ -196,35 +182,40 @@ namespace KancolleSniffer
             var deck = _shipInfo.GetDeck(fleet).ToArray();\r
             var repair = _repairStatuses[fleet];\r
             var fs = _shipInfo.GetStatus(deck[0]);\r
-            /*\r
-             * 旗艦が明石でないか明石がドックに入っている場合は泊地修理を止める。\r
-            */\r
-            if (!fs.Name.StartsWith("明石") || _shipInfo.InMission(fleet))\r
+            repair.State = State.Continue;\r
+            if (!fs.Spec.IsRepairShip)\r
             {\r
-                repair.Invalidate();\r
-                repair.State = State.Stop;\r
+                repair.UpdateTarget(new ShipStatus[0]);\r
                 repair.Deck = deck;\r
                 return;\r
             }\r
-            var cap = fs.Slot.Count(item => item.Spec.Name == "艦艇修理施設") + 2;\r
+            if (repair.DeckChanged(deck))\r
+            {\r
+                repair.State = State.Reset;\r
+                repair.Deck = deck;\r
+            }\r
+            var target = RepairTarget(deck);\r
+            if (repair.IsRepaired(target))\r
+                repair.State = State.Reset;\r
+            repair.UpdateTarget(target);\r
+        }\r
+\r
+        private ShipStatus[] RepairTarget(int[] deck)\r
+        {\r
+            var fs = _shipInfo.GetStatus(deck[0]);\r
+            if (fs.DamageLevel >= ShipStatus.Damage.Half)\r
+                return new ShipStatus[0];\r
+            var cap = fs.Slot.Count(item => item.Spec.IsRepairFacility) + 2;\r
             /*\r
              * 泊地修理の条件を満たさない艦はMaxHp==NowHpのダミーを設定する。\r
-             * 入渠中の艦娘は終わったときに回復扱いされないようNowHp=MaxHpにする。\r
-             * 中破以上でNowHp=MaxHpにすると回復扱いされるのでNowHp=MaxHp=0にする。\r
+             * - 入渠中の艦娘は終わったときに回復扱いされないようNowHp=MaxHpに\r
+             * - 中破以上でNowHp=MaxHpにすると回復扱いされるのでNowHp=MaxHp=0に\r
             */\r
-            var target = (from id in deck.Take(cap)\r
+            return (from id in deck.Take(cap)\r
                 let s = _shipInfo.GetStatus(id)\r
                 let full = new ShipStatus {NowHp = s.MaxHp, MaxHp = s.MaxHp}\r
                 let zero = new ShipStatus()\r
                 select _dockInfo.InNDock(id) ? full : s.DamageLevel >= ShipStatus.Damage.Half ? zero : s).ToArray();\r
-            repair.State = State.Continue;\r
-            if (repair.DeckChanged(deck) || repair.IsRepaired(target))\r
-                repair.State |= State.Reset;\r
-            if (target[0].DamageLevel < ShipStatus.Damage.Half &&\r
-                target.Any(s => s.NowHp < s.MaxHp))\r
-                repair.State |= State.Reparing;\r
-            repair.UpdateTarget(target);\r
-            repair.Deck = deck;\r
         }\r
 \r
         public RepairSpan[] GetTimers(int fleet)\r
@@ -234,13 +225,17 @@ namespace KancolleSniffer
         {\r
             get\r
             {\r
-                if (_start == DateTime.MinValue || _repairStatuses.Any(rs => rs.State != State.Stop))\r
+                if (_start == DateTime.MinValue)\r
                     return TimeSpan.MinValue;\r
                 var r = _start + TimeSpan.FromMinutes(20) - DateTime.Now;\r
                 return r >= TimeSpan.Zero ? r : TimeSpan.Zero;\r
             }\r
         }\r
 \r
+        public bool CheckReparing(int fleet) => GetTimers(fleet).Any(r => r.Span != TimeSpan.MinValue);\r
+\r
+        public bool CheckReparing() => Enumerable.Range(0, ShipInfo.FleetCount).Any(CheckReparing);\r
+\r
         public Notice[] GetNotice()\r
         {\r
             var now = DateTime.Now;\r