X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=KancolleSniffer%2FAkashiTimer.cs;h=584fce113b38304ca6af657a22d832e8281d868e;hb=fb0c774b0eaea6a7d4ee4b59379c82b2f27d5d3c;hp=a36dcf4885b554cf7baad0c4b9ec7f6adab1a342;hpb=fe9301b5843af559be4e3c23608edef1a5739ed7;p=kancollesniffer%2FKancolleSniffer.git

diff --git a/KancolleSniffer/AkashiTimer.cs b/KancolleSniffer/AkashiTimer.cs
index a36dcf4..584fce1 100644
--- a/KancolleSniffer/AkashiTimer.cs
+++ b/KancolleSniffer/AkashiTimer.cs
@@ -1,19 +1,16 @@
 // Copyright (C) 2014, 2015 Kazuhiro Fujieda <fujieda@users.osdn.me>
 // 
-// This program is part of KancolleSniffer.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
-// KancolleSniffer is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+//    http://www.apache.org/licenses/LICENSE-2.0
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, see <http://www.gnu.org/licenses/>.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System;
 using System.Collections.Generic;
@@ -25,6 +22,7 @@ namespace KancolleSniffer
     {
         private readonly ShipInfo _shipInfo;
         private readonly DockInfo _dockInfo;
+        private readonly PresetDeck _presetDeck;
         private readonly RepairStatus[] _repairStatuses = new RepairStatus[ShipInfo.FleetCount];
         private DateTime _start;
         private DateTime _prev;
@@ -45,18 +43,23 @@ namespace KancolleSniffer
         {
             private ShipStatus[] _target = new ShipStatus[0];
             private int[] _deck = new int[0];
+            private TimeSpan FirstRepairTime => TimeSpan.FromMinutes(20);
+
+            private bool PassedFirstRepairTime(DateTime start, DateTime prev, DateTime now) =>
+                prev - start < FirstRepairTime && now - start >= FirstRepairTime;
+
+            private TimeSpan RepairTime(ShipStatus ship, int damage) =>
+                TimeSpan.FromMinutes(Math.Ceiling(ship.RepairTime.TotalMinutes / (ship.MaxHp - ship.NowHp) * damage));
+
 
             public int[] Deck
             {
-                set { _deck = value; }
+                set => _deck = value;
             }
 
             public State State { get; set; }
 
-            public void Invalidate()
-            {
-                _target = new ShipStatus[0];
-            }
+            public bool IsRepaired(ShipStatus[] target) => _target.Zip(target, (a, b) => a.NowHp < b.NowHp).Any(x => x);
 
             public bool DeckChanged(IEnumerable<int> deck) => !_deck.SequenceEqual(deck);
 
@@ -73,17 +76,17 @@ namespace KancolleSniffer
                     var damage = s.MaxHp - s.NowHp;
                     if (damage == 0)
                         return new RepairSpan(0, TimeSpan.MinValue);
-                    if (spent < TimeSpan.FromMinutes(20))
-                        return new RepairSpan(0, TimeSpan.FromMinutes(20) - spent);
+                    if (spent < FirstRepairTime)
+                        return new RepairSpan(0, FirstRepairTime - spent);
                     if (damage == 1)
                         return new RepairSpan(1, TimeSpan.Zero);
                     for (var d = 2; d <= damage; d++)
                     {
-                        var sec = s.CalcRepairSec(d) + 60;
-                        if (sec <= 20 * 60)
+                        var span = RepairTime(s, d);
+                        if (span <= FirstRepairTime)
                             continue;
-                        if (TimeSpan.FromSeconds(sec) > spent)
-                            return new RepairSpan(d - 1, TimeSpan.FromSeconds(sec) - spent);
+                        if (span > spent)
+                            return new RepairSpan(d - 1, span - spent);
                     }
                     return new RepairSpan(damage, TimeSpan.Zero);
                 }).ToArray();
@@ -91,7 +94,6 @@ namespace KancolleSniffer
 
             public Notice GetNotice(DateTime start, DateTime prev, DateTime now)
             {
-                var m20 = TimeSpan.FromMinutes(20);
                 var proc = new List<string>();
                 var comp = new List<string>();
                 foreach (var s in _target)
@@ -101,7 +103,7 @@ namespace KancolleSniffer
                         continue;
                     if (damage == 1)
                     {
-                        if (prev - start < m20 && now - start >= m20)
+                        if (PassedFirstRepairTime(start, prev, now))
                             comp.Add(s.Name);
                         continue;
                     }
@@ -109,14 +111,13 @@ namespace KancolleSniffer
                     // 完全回復から減らしながら所要時間と経過時間と比較する。
                     for (var d = damage; d >= 2; d--)
                     {
-                        var sec = s.CalcRepairSec(d) + 60;
-                        if (sec <= 20 * 60)
+                        var span = RepairTime(s, d);
+                        if (span <= FirstRepairTime)
                         {
-                            if (d == damage && (prev - start < m20 && now - start >= m20))
+                            if (d == damage && PassedFirstRepairTime(start, prev, now))
                                 comp.Add(s.Name);
                             continue;
                         }
-                        var span = TimeSpan.FromSeconds(sec);
                         if (span <= prev - start || now - start < span)
                             continue;
                         if (d == damage)
@@ -140,46 +141,37 @@ namespace KancolleSniffer
             public string Completed { get; set; }
         }
 
-        public AkashiTimer(ShipInfo ship, DockInfo dock)
+        public AkashiTimer(ShipInfo ship, DockInfo dock, PresetDeck preset)
         {
             _shipInfo = ship;
             _dockInfo = dock;
+            _presetDeck = preset;
             for (var i = 0; i < _repairStatuses.Length; i++)
                 _repairStatuses[i] = new RepairStatus();
         }
 
-        [Flags]
         private enum State
         {
-            Stop = 0,
-            Continue = 1,
-            Reset = 2,
-            Reparing = 4
+            Continue = 0,
+            Reset = 1,
         }
 
         public void Port()
         {
             CheckFleet();
             var now = DateTime.Now;
-            var reparing = _repairStatuses.Any(r => (r.State & State.Reparing) != 0);
-            var stop = _repairStatuses.All(r => (r.State & State.Continue) == 0);
-            if (now - _start > TimeSpan.FromMinutes(20))
-            {
-                if (reparing)
-                    _start = now;
-                else if (stop)
-                    _start = DateTime.MinValue;
-            }
-            else if (!stop && _start == DateTime.MinValue)
-            {
+            var reset = _repairStatuses.Any(r => r.State == State.Reset);
+            if (_start == DateTime.MinValue || now - _start > TimeSpan.FromMinutes(20) || reset)
                 _start = now;
-            }
         }
 
-        public void DeckChanged()
+        public void InspectChange(string request)
         {
             CheckFleet();
-            if (_repairStatuses.Any(r => (r.State & State.Reset) != 0))
+            var values = HttpUtility.ParseQueryString(request);
+            if (int.Parse(values["api_ship_idx"]) == -1)
+                return;
+            if (_repairStatuses.Any(r => r.State == State.Reset))
                 _start = DateTime.Now;
         }
 
@@ -194,35 +186,40 @@ namespace KancolleSniffer
             var deck = _shipInfo.GetDeck(fleet).ToArray();
             var repair = _repairStatuses[fleet];
             var fs = _shipInfo.GetStatus(deck[0]);
-            /*
-             * 旗艦が明石でないか明石がドックに入っている場合は泊地修理を止める。
-            */
-            if (!fs.Name.StartsWith("明石") || _shipInfo.InMission(fleet))
+            repair.State = State.Continue;
+            if (!fs.Spec.IsRepairShip)
             {
-                repair.Invalidate();
-                repair.State = State.Stop;
+                repair.UpdateTarget(new ShipStatus[0]);
                 repair.Deck = deck;
                 return;
             }
-            var cap = fs.Slot.Count(item => item.Spec.Name == "艦艇修理施設") + 2;
+            if (repair.DeckChanged(deck))
+            {
+                repair.State = State.Reset;
+                repair.Deck = deck;
+            }
+            var target = RepairTarget(deck);
+            if (repair.IsRepaired(target))
+                repair.State = State.Reset;
+            repair.UpdateTarget(target);
+        }
+
+        private ShipStatus[] RepairTarget(int[] deck)
+        {
+            var fs = _shipInfo.GetStatus(deck[0]);
+            if (!fs.Spec.IsRepairShip || _dockInfo.InNDock(fs.Id) || fs.DamageLevel >= ShipStatus.Damage.Half)
+                return new ShipStatus[0];
+            var cap = fs.Slot.Count(item => item.Spec.IsRepairFacility) + 2;
             /*
              * 泊地修理の条件を満たさない艦はMaxHp==NowHpのダミーを設定する。
-             * 入渠中の艦娘は終わったときに回復扱いされないようNowHp=MaxHpにする。
-             * 中破以上でNowHp=MaxHpにすると回復扱いされるのでNowHp=MaxHp=0にする。
+             * - 入渠中の艦娘は終わったときに回復扱いされないようNowHp=MaxHpに
+             * - 中破以上でNowHp=MaxHpにすると回復扱いされるのでNowHp=MaxHp=0に
             */
-            var target = (from id in deck.Take(cap)
-                let s = _shipInfo.GetStatus(id)
+            return (from id in deck.Take(cap)
+                let s = (ShipStatus)_shipInfo.GetStatus(id).Clone()
                 let full = new ShipStatus {NowHp = s.MaxHp, MaxHp = s.MaxHp}
                 let zero = new ShipStatus()
                 select _dockInfo.InNDock(id) ? full : s.DamageLevel >= ShipStatus.Damage.Half ? zero : s).ToArray();
-            repair.State = State.Continue;
-            if (repair.DeckChanged(deck))
-                repair.State |= State.Reset;
-            if (target[0].DamageLevel < ShipStatus.Damage.Half &&
-                target.Any(s => s.NowHp < s.MaxHp))
-                repair.State |= State.Reparing;
-            repair.UpdateTarget(target);
-            repair.Deck = deck;
         }
 
         public RepairSpan[] GetTimers(int fleet)
@@ -232,13 +229,21 @@ namespace KancolleSniffer
         {
             get
             {
-                if (_start == DateTime.MinValue || _repairStatuses.Any(rs => rs.State != State.Stop))
+                if (_start == DateTime.MinValue)
                     return TimeSpan.MinValue;
-                var r = _start + TimeSpan.FromMinutes(20) - DateTime.Now;
+                var r = TimeSpan.FromMinutes(20) - TimeSpan.FromSeconds((int)(DateTime.Now - _start).TotalSeconds);
                 return r >= TimeSpan.Zero ? r : TimeSpan.Zero;
             }
         }
 
+        public bool CheckReparing(int fleet) => GetTimers(fleet).Any(r => r.Span != TimeSpan.MinValue);
+
+        public bool CheckReparing() => Enumerable.Range(0, ShipInfo.FleetCount).Any(CheckReparing);
+
+        public bool CheckPresetReparing()
+            => _presetDeck.Decks.Where(deck => deck != null)
+                .Any(deck => RepairTarget(deck).Any(s => s.NowHp < s.MaxHp));
+
         public Notice[] GetNotice()
         {
             var now = DateTime.Now;