艦隊情報のテキスト形式で補強スロットが先に来るのを直す

diff --git a/KancolleSniffer/BattleInfo.cs b/KancolleSniffer/BattleInfo.cs
index 04dddc4..14e5035 100644 (file)
--- a/KancolleSniffer/BattleInfo.cs
+++ b/KancolleSniffer/BattleInfo.cs
@@ -586,7 +586,7 @@ namespace KancolleSniffer
                 _status.NowHp = 0;\r
                 if (_practice)\r
                     return;\r
-                foreach (var item in _status.AllSlot)\r
+                foreach (var item in new[] {_status.SlotEx}.Concat(_status.Slot))\r
                 {\r
                     if (item.Spec.Id == 42)\r
                     {\r

diff --git a/KancolleSniffer/ShipStatus.cs b/KancolleSniffer/ShipStatus.cs
index ca85652..c074583 100644 (file)
--- a/KancolleSniffer/ShipStatus.cs
+++ b/KancolleSniffer/ShipStatus.cs
@@ -53,7 +53,7 @@ namespace KancolleSniffer
 \r
         public int CombinedFleetType { get; set; }\r
 \r
-        public IEnumerable<ItemStatus> AllSlot => SlotEx.Id == 0 ? Slot : new[] {SlotEx}.Concat(Slot);\r
+        public IEnumerable<ItemStatus> AllSlot => SlotEx.Id == 0 ? Slot : Slot.Concat(new[] {SlotEx});\r
 \r
         public ShipStatus()\r
         {\r
@@ -79,7 +79,9 @@ namespace KancolleSniffer
             if (now == 0 && max > 0)\r
                 return Damage.Sunk;\r
             var ratio = max == 0 ? 1 : (double)now / max;\r
-            return ratio > 0.75 ? Damage.Minor : ratio > 0.5 ? Damage.Small : ratio > 0.25 ? Damage.Half : Damage.Badly;\r
+            return ratio > 0.75 ? Damage.Minor :\r
+                ratio > 0.5 ? Damage.Small :\r
+                ratio > 0.25 ? Damage.Half : Damage.Badly;\r
         }\r
 \r
         public TimeSpan RepairTime => TimeSpan.FromSeconds((int)(RepairTimePerHp.TotalSeconds * (MaxHp - NowHp)) + 30);\r