判定式(33)の計算に補強増設スロットを含める

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 5e0ee29..38a2d76 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -221,6 +221,18 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// 補強増設スロットに見張り員を装備した場合の判定式(33)\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void LineOfSightWithExSlot()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "lineofsight_003");\r
+            var fleet = sniffer.Fleets[0];\r
+            PAssert.That(() => Abs(fleet.GetLineOfSights(1) - -28.8) < 0.01);\r
+        }\r
+\r
+        /// <summary>\r
         /// 触接開始率を正しく計算する\r
         /// </summary>\r
         [TestMethod]\r

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index 8f2f46e..6f856eb 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit 8f2f46eb61f8229e4d14d2bf939e3e6c9152a947
+Subproject commit 6f856ebaa461bf26b79b1083ab4b2452d4bc638a

diff --git a/KancolleSniffer/Model/Fleet.cs b/KancolleSniffer/Model/Fleet.cs
index dbcea00..bb9debf 100644 (file)
--- a/KancolleSniffer/Model/Fleet.cs
+++ b/KancolleSniffer/Model/Fleet.cs
@@ -221,7 +221,7 @@ namespace KancolleSniffer.Model
             {\r
                 emptyBonus--;\r
                 var itemLoS = 0;\r
-                foreach (var item in s.Slot)\r
+                foreach (var item in s.AllSlot)\r
                 {\r
                     var spec = item.Spec;\r
                     itemLoS += spec.LoS;\r