補強増設スロットの装備状況が装備一覧に反映されないのを直す

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index ab1e334..dd767cb 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -736,6 +736,19 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// 装備の所持者を設定する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void SetItemHolder()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "itemholder_001");\r
+            var itemIds = new HashSet<int> {75298, 76572, 82725, 90213, 5910};\r
+            var items = sniffer.ItemList.Where(status => itemIds.Contains(status.Id));\r
+            PAssert.That(() => items.All(x => x.Holder.Id == 861));\r
+        }\r
+\r
+        /// <summary>\r
         /// 資材の変動を正しく反映する\r
         /// </summary>\r
         [TestMethod]\r

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index b41e0f0..c617d04 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit b41e0f0016ece2bb5ce5239ef4f322ac3576e4ad
+Subproject commit c617d04f110d073cb8f7c310b86da0b7e5fd8bac

diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs
index f708d4d..215446e 100644 (file)
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -512,8 +512,11 @@ namespace KancolleSniffer
         public void SetItemHolder()\r
         {\r
             foreach (var ship in _shipInfo.Values)\r
+            {\r
                 foreach (var item in ship.Slot)\r
                     _itemInfo.GetStatus(item.Id).Holder = ship;\r
+                _itemInfo.GetStatus(ship.SlotEx.Id).Holder = ship;\r
+            }\r
         }\r
 \r
         public ShipSpec GetSpec(int id) => _shipMaster[id];\r