明石タイマーの実装を正確にする

diff --git a/KancolleSniffer/AkashiTimer.cs b/KancolleSniffer/AkashiTimer.cs
index c444a29..e540bb9 100644 (file)
--- a/KancolleSniffer/AkashiTimer.cs
+++ b/KancolleSniffer/AkashiTimer.cs
@@ -48,7 +48,9 @@ namespace KancolleSniffer
             private bool PassedFirstRepairTime(DateTime start, DateTime prev, DateTime now) =>\r
                 prev - start < FirstRepairTime && now - start >= FirstRepairTime;\r
 \r
-            private TimeSpan RepairTime(ShipStatus ship, int damage) => ship.RepairTimeByDamage(damage) + TimeSpan.FromSeconds(70);\r
+            private TimeSpan RepairTime(ShipStatus ship, int damage) =>\r
+                TimeSpan.FromMinutes(Math.Ceiling(ship.RepairTime.TotalMinutes / (ship.MaxHp - ship.NowHp) * damage));\r
+\r
 \r
             public int[] Deck\r
             {\r

diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs
index 49dbfe2..a74715f 100644 (file)
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -89,8 +89,6 @@ namespace KancolleSniffer
                                      ? Level * 10\r
                                      : Level * 5 + Floor(Sqrt(Level - 11)) * 10 + 50));\r
 \r
-        public TimeSpan RepairTimeByDamage(int damage) => TimeSpan.FromTicks(RepairTimePerHp.Ticks * damage);\r
-\r
         public double EffectiveFirepower\r
         {\r
             get\r