From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Fri, 22 Dec 2017 13:21:28 +0000 (+0900)
Subject: 第4艦隊まで開放していないとエラーがたくさん出るのを直す
X-Git-Tag: v9.38~1
X-Git-Url: http://git.osdn.net/view?p=kancollesniffer%2FKancolleSniffer.git;a=commitdiff_plain;h=d900b3b7b32970b72d120ff355e53d50f783372a

第4艦隊まで開放していないとエラーがたくさん出るのを直す
---

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 480ac46..ce9ff1d 100644
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -660,5 +660,17 @@ namespace KancolleSniffer.Test
             PAssert.That(() => sniffer.Item.NowEquips == 1118);
             PAssert.That(() => sniffer.Material.Current.Take(4).SequenceEqual(new[] {285615, 286250, 291010, 284744}));
         }
+
+        /// <summary>
+        /// 第2艦隊までしか解放していなくてもエラーにならないようにする
+        /// </summary>
+        [TestMethod]
+        public void TwoFleets()
+        {
+            var sniffer = new Sniffer(true);
+            SniffLogFile(sniffer, "twofleets_001");
+            var expected = Enumerable.Repeat(new ChargeStatus(5, 5), ShipInfo.FleetCount);
+            PAssert.That(() => expected.SequenceEqual(sniffer.ChargeStatuses));
+        }
     }
 }
\ No newline at end of file
diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index db10704..aa1d9f8 160000
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit db107042fc086e42a82afb693c2a5052993a82fd
+Subproject commit aa1d9f836f05d30e5166a8d3781c27653a67e9ba
diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs
index c0ecde1..ba8cacb 100644
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -56,7 +56,7 @@ namespace KancolleSniffer
         public const int FleetCount = 4;
         public const int MemberCount = 6;
 
-        private readonly int[][] _decks = new int[FleetCount][];
+        private readonly int[][] _decks;
         private readonly Dictionary<int, ShipStatus> _shipInfo = new Dictionary<int, ShipStatus>();
         private readonly ShipMaster _shipMaster = new ShipMaster();
         private readonly ItemInfo _itemInfo;
@@ -85,8 +85,7 @@ namespace KancolleSniffer
         public ShipInfo(ItemInfo itemInfo)
         {
             _itemInfo = itemInfo;
-            for (var fleet = 0; fleet < _decks.Length; fleet++)
-                _decks[fleet] = new int[0];
+            _decks = Enumerable.Repeat(Enumerable.Repeat(-1, MemberCount).ToArray(), FleetCount).ToArray();
             ClearShipInfo();
         }