From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sun, 11 Mar 2018 05:17:29 +0000 (+0900)
Subject: 補給艦のTPが計上されないのを直す
X-Git-Tag: v10.4~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1865091a7c804c8fcd166478ee2e2b323ad5a7e7;p=kancollesniffer%2FKancolleSniffer.git

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

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 8e0565d..d2d2504 100644
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -332,24 +332,21 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
-        /// TPを正しく計算する
+        /// TPを計算する
         /// </summary>
         [TestMethod]
         public void TransportPoint()
         {
             DataLoader.LoadTpSpec();
 
-            var sniffer1 = new Sniffer();
-            SniffLogFile(sniffer1, "transportpoint_001");
-            PAssert.That(() => (int)sniffer1.GetShipStatuses(0).Sum(s => s.TransportPoint) == 47);
-
-            var sniffer2 = new Sniffer();
-            SniffLogFile(sniffer2, "transportpoint_002");
-            PAssert.That(() => (int)sniffer2.GetShipStatuses(0).Sum(s => s.TransportPoint) == 19, "鬼怒改二+特大発+おにぎり");
-
-            var sniffer3 = new Sniffer();
-            SniffLogFile(sniffer3, "transportpoint_003");
-            PAssert.That(() => (int)sniffer3.GetShipStatuses(0).Sum(s => s.TransportPoint) == 13, "駆逐艦+士魂部隊");
+            var msgs = new[] {"", "鬼怒改二+特大発+おにぎり", "駆逐艦+士魂部隊", "補給艦"};
+            var results = new[] {47, 19, 13, 15};
+            for (int i = 0; i < msgs.Length; i++)
+            {
+                var sniffer = new Sniffer();
+                SniffLogFile(sniffer, "transportpoint_00" + (i + 1));
+                PAssert.That(() => (int)sniffer.GetShipStatuses(0).Sum(s => s.TransportPoint) == results[i], msgs[i]);
+            }
         }
 
         /// <summary>
diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index 850fabc..9cc6b5a 160000
--- 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
--- a/KancolleSniffer/ShipMaster.cs
+++ b/KancolleSniffer/ShipMaster.cs
@@ -145,6 +145,7 @@ namespace KancolleSniffer
                     case 16: // 水上機母艦
                     case 17: // 揚陸艦
                     case 21: // 練習巡洋艦
+                    case 22: // 補給艦
                         return 1.0;
                     case 5: // 重巡洋艦
                     case 6: // 航空巡洋艦
@@ -177,8 +178,6 @@ namespace KancolleSniffer
                         return 4.0;
                     case 10:
                         return 7.0;
-                    case 15:
-                        return 15.0;
                     case 16:
                         return 9.0;
                     case 17:
@@ -187,6 +186,8 @@ namespace KancolleSniffer
                         return 7.0;
                     case 21:
                         return 6.0;
+                    case 22:
+                        return 15.0;
                     default:
                         return 0;
                 }