補給艦のTPが計上されないのを直す

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 8e0565d..d2d2504 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -332,24 +332,21 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
-        /// TPを正しく計算する\r
+        /// TPを計算する\r
         /// </summary>\r
         [TestMethod]\r
         public void TransportPoint()\r
         {\r
             DataLoader.LoadTpSpec();\r
 \r
-            var sniffer1 = new Sniffer();\r
-            SniffLogFile(sniffer1, "transportpoint_001");\r
-            PAssert.That(() => (int)sniffer1.GetShipStatuses(0).Sum(s => s.TransportPoint) == 47);\r
-\r
-            var sniffer2 = new Sniffer();\r
-            SniffLogFile(sniffer2, "transportpoint_002");\r
-            PAssert.That(() => (int)sniffer2.GetShipStatuses(0).Sum(s => s.TransportPoint) == 19, "鬼怒改二+特大発+おにぎり");\r
-\r
-            var sniffer3 = new Sniffer();\r
-            SniffLogFile(sniffer3, "transportpoint_003");\r
-            PAssert.That(() => (int)sniffer3.GetShipStatuses(0).Sum(s => s.TransportPoint) == 13, "駆逐艦+士魂部隊");\r
+            var msgs = new[] {"", "鬼怒改二+特大発+おにぎり", "駆逐艦+士魂部隊", "補給艦"};\r
+            var results = new[] {47, 19, 13, 15};\r
+            for (int i = 0; i < msgs.Length; i++)\r
+            {\r
+                var sniffer = new Sniffer();\r
+                SniffLogFile(sniffer, "transportpoint_00" + (i + 1));\r
+                PAssert.That(() => (int)sniffer.GetShipStatuses(0).Sum(s => s.TransportPoint) == results[i], msgs[i]);\r
+            }\r
         }\r
 \r
         /// <summary>\r

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index 850fabc..9cc6b5a 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit 850fabcfe72ce403b78988d60f512734a313628e
+Subproject commit 9cc6b5a36ebf6baef97f2400b06bbd2267a782d1

diff --git a/KancolleSniffer/ShipMaster.cs b/KancolleSniffer/ShipMaster.cs
index 22d9721..8e994f5 100644 (file)
--- a/KancolleSniffer/ShipMaster.cs
+++ b/KancolleSniffer/ShipMaster.cs
@@ -145,6 +145,7 @@ namespace KancolleSniffer
                     case 16: // 水上機母艦\r
                     case 17: // 揚陸艦\r
                     case 21: // 練習巡洋艦\r
+                    case 22: // 補給艦\r
                         return 1.0;\r
                     case 5: // 重巡洋艦\r
                     case 6: // 航空巡洋艦\r
@@ -177,8 +178,6 @@ namespace KancolleSniffer
                         return 4.0;\r
                     case 10:\r
                         return 7.0;\r
-                    case 15:\r
-                        return 15.0;\r
                     case 16:\r
                         return 9.0;\r
                     case 17:\r
@@ -187,6 +186,8 @@ namespace KancolleSniffer
                         return 7.0;\r
                     case 21:\r
                         return 6.0;\r
+                    case 22:\r
+                        return 15.0;\r
                     default:\r
                         return 0;\r
                 }\r