TPの計算式を修正する

 * 陸戦部隊への加算を無効にする
 * 鬼怒改二の大発効果を加算する
 * 特大発艇を計上する
 * 戦闘糧食が1だったのを4に直す

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 5f60879..5260692 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -499,12 +499,16 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void TransportPoint()\r
         {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "transportpoint_001");\r
+            var sniffer1 = new Sniffer();\r
+            SniffLogFile(sniffer1, "transportpoint_001");\r
             ItemSpec.IncreaceLandPowerTp = false;\r
-            PAssert.That(() => (int)sniffer.GetShipStatuses(0).Sum(s => s.TransportPoint) == 27);\r
+            PAssert.That(() => (int)sniffer1.GetShipStatuses(0).Sum(s => s.TransportPoint) == 27);\r
             ItemSpec.IncreaceLandPowerTp = true;\r
-            PAssert.That(() => (int)sniffer.GetShipStatuses(0).Sum(s => s.TransportPoint) == 37, "陸上戦力揚陸時");\r
+            PAssert.That(() => (int)sniffer1.GetShipStatuses(0).Sum(s => s.TransportPoint) == 37, "陸上戦力揚陸時");\r
+\r
+            var sniffer2 = new Sniffer();\r
+            SniffLogFile(sniffer2, "transportpoint_002");\r
+            PAssert.That(() => (int)sniffer2.GetShipStatuses(0).Sum(s => s.TransportPoint) == 22, "鬼怒改二+特大発+おにぎり");\r
         }\r
 \r
         /// <summary>\r

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index dcc1717..3cc6d1c 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit dcc1717edd28e4eaf4bd2f30406f1748e961721e
+Subproject commit 3cc6d1cbb33606c544f6178f8eb179d5f40d77d0

diff --git a/KancolleSniffer/ItemInfo.cs b/KancolleSniffer/ItemInfo.cs
index 1f035f4..19bcbe3 100644 (file)
--- a/KancolleSniffer/ItemInfo.cs
+++ b/KancolleSniffer/ItemInfo.cs
@@ -21,7 +21,7 @@ namespace KancolleSniffer
 {\r
     public class ItemSpec\r
     {\r
-        public static bool IncreaceLandPowerTp = true;\r
+        public static bool IncreaceLandPowerTp = false;\r
         public int Id;\r
         public string Name;\r
         public int Type;\r
@@ -153,12 +153,14 @@ namespace KancolleSniffer
                         return 5.0;\r
                     case 68: // 大発動艇\r
                         return 8.0;\r
+                    case 193: // 特大発動艇\r
+                        return 8.0;\r
                     case 166: // 大発動艇(八九式中戦車&陸戦隊)\r
                         return IncreaceLandPowerTp ? 13.0 : 8.0;\r
                     case 167: // 特二式内火艇\r
                         return IncreaceLandPowerTp ? 7.0 : 2.0;\r
                     case 145: // 戦闘糧食\r
-                        return 1.0;\r
+                        return 4.0;\r
                     case 150: // 秋刀魚の缶詰\r
                         return 1.0;\r
                     default:\r

diff --git a/KancolleSniffer/ShipMaster.cs b/KancolleSniffer/ShipMaster.cs
index 8533614..a40c567 100644 (file)
--- a/KancolleSniffer/ShipMaster.cs
+++ b/KancolleSniffer/ShipMaster.cs
@@ -163,7 +163,7 @@ namespace KancolleSniffer
                     case 2:\r
                         return 5.0;\r
                     case 3:\r
-                        return 2.0;\r
+                        return Id == 487 ? 10.0 : 2.0; // 鬼怒改二は大発分を加算\r
                     case 6:\r
                         return 4.0;\r
                     case 10:\r