古いログによるテストを通るようにする

diff --git a/KancolleSniffer.Test/LoggerTest.cs b/KancolleSniffer.Test/LoggerTest.cs
index 78a52a6..339ed67 100644 (file)
--- a/KancolleSniffer.Test/LoggerTest.cs
+++ b/KancolleSniffer.Test/LoggerTest.cs
@@ -115,7 +115,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void InspectBattleResult()\r
         {\r
-            var sniffer = new Sniffer();\r
+            var sniffer = new Sniffer {UseOldEnemyId = true};\r
             var result = "";\r
             sniffer.SetLogWriter((path, s, h) => { result += s + "|"; }, () => new DateTime(2015, 1, 1));\r
             sniffer.EnableLog(LogType.Battle);\r
@@ -142,7 +142,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void InspectBattleResultOfSpMidnight()\r
         {\r
-            var sniffer = new Sniffer();\r
+            var sniffer = new Sniffer {UseOldEnemyId = true};\r
             var result = "";\r
             sniffer.SetLogWriter((path, s, h) => { result += s + "|"; }, () => new DateTime(2015, 1, 1));\r
             sniffer.EnableLog(LogType.Battle);\r
@@ -157,7 +157,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void InspectCombinedBattleResult()\r
         {\r
-            var sniffer = new Sniffer();\r
+            var sniffer = new Sniffer {UseOldEnemyId = true};\r
             var result = "";\r
             sniffer.SetLogWriter((path, s, h) => { result += s + "|"; }, () => new DateTime(2015, 1, 1));\r
             sniffer.EnableLog(LogType.Battle);\r
@@ -177,7 +177,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void InspectBothCombinedBattleResult()\r
         {\r
-            var sniffer = new Sniffer();\r
+            var sniffer = new Sniffer {UseOldEnemyId = true};\r
             var result = "";\r
             sniffer.SetLogWriter((path, s, h) => { result += s + "|"; }, () => new DateTime(2017, 1, 1));\r
             sniffer.EnableLog(LogType.Battle);\r
@@ -193,7 +193,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void InspectBattleResultStartAndBoss()\r
         {\r
-            var sniffer = new Sniffer();\r
+            var sniffer = new Sniffer {UseOldEnemyId = true};\r
             var result = "";\r
             sniffer.SetLogWriter((path, s, h) => { result += s + "|"; }, () => new DateTime(2015, 1, 1));\r
             sniffer.EnableLog(LogType.Battle);\r
@@ -228,7 +228,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void InspectBattleResultDropItemAndShip()\r
         {\r
-            var sniffer = new Sniffer();\r
+            var sniffer = new Sniffer {UseOldEnemyId = true};\r
             var result = "";\r
             sniffer.SetLogWriter((path, s, h) => { result += s + "|"; }, () => new DateTime(2015, 1, 1));\r
             sniffer.EnableLog(LogType.Battle);\r
@@ -252,7 +252,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void ReloadBeforeBattleResult()\r
         {\r
-            var sniffer = new Sniffer();\r
+            var sniffer = new Sniffer {UseOldEnemyId = true};\r
             var result = "";\r
             sniffer.SetLogWriter((path, s, h) => { result += s + "|"; }, () => new DateTime(2015, 1, 1));\r
             sniffer.EnableLog(LogType.Battle);\r
@@ -349,7 +349,7 @@ namespace KancolleSniffer.Test
                 new DateTime(2017, 4, 1, 5, 0, 0),\r
                 new DateTime(2017, 4, 1, 6, 0, 0),\r
                 new DateTime(2017, 4, 2, 5, 0, 0),\r
-                new DateTime(2017, 4, 2, 6,0,0)\r
+                new DateTime(2017, 4, 2, 6, 0, 0)\r
             }.GetEnumerator();\r
             logger.SetWriter((path, s, h) => { result += s + "|"; }, () =>\r
             {\r
@@ -360,7 +360,7 @@ namespace KancolleSniffer.Test
                 logger.InspectBasic(JsonParser.Parse($"{{\"api_experience\": {i * 1000}}}"));\r
             logger.InspectBattleResult(JsonParser.Parse("{\"api_get_exmap_rate\": \"100\"}"));\r
             PAssert.That(() =>\r
-                "2017-03-31 21:00:00,0,0|2017-03-31 21:00:00,0,0|2017-03-31 22:00:00,1000,0|"+\r
+                "2017-03-31 21:00:00,0,0|2017-03-31 21:00:00,0,0|2017-03-31 22:00:00,1000,0|" +\r
                 "2017-04-01 06:00:00,4000,0|2017-04-02 05:00:00,5000,0|2017-04-02 06:00:00,5000,100|"\r
                 == result);\r
         }\r

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 86ec2df..feb587f 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -315,7 +315,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "sunk_001");\r
-            PAssert.That(() => sniffer.BadlyDamagedShips.SequenceEqual(new [] {"磯波"}));\r
+            PAssert.That(() => sniffer.BadlyDamagedShips.SequenceEqual(new[] {"磯波"}));\r
         }\r
 \r
         /// <summary>\r
@@ -414,7 +414,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void ZeroValueEmptySlot()\r
         {\r
-            var sniffer = new Sniffer();\r
+            var sniffer = new Sniffer {UseOldEnemyId = true};\r
             SniffLogFile(sniffer, "battle_006");\r
             PAssert.That(() => sniffer.Battle.EnemyFighterPower == "0");\r
         }\r
@@ -451,7 +451,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "fighterpower_003");\r
-            PAssert.That(() => sniffer.GetFighterPower(0).SequenceEqual(new [] {135, 135}));\r
+            PAssert.That(() => sniffer.GetFighterPower(0).SequenceEqual(new[] {135, 135}));\r
         }\r
 \r
         /// <summary>\r
@@ -464,7 +464,7 @@ namespace KancolleSniffer.Test
             SniffLogFile(sniffer, "baseaircorps_001");\r
             PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[0].FighterPower[1] == 301);\r
             sniffer.BaseAirCorps[0].AirCorps[0].Action = 2; // 防空\r
-            PAssert.That(()=>sniffer.BaseAirCorps[0].AirCorps[0].FighterPower[1] == 320);\r
+            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[0].FighterPower[1] == 320);\r
         }\r
 \r
         /// <summary>\r

diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs
index 4f1a72d..fe13041 100644 (file)
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -628,5 +628,10 @@ namespace KancolleSniffer
         {\r
             _escapedShips.Clear();\r
         }\r
+\r
+        public bool UseOldEnemyId\r
+        {\r
+            set { _shipMaster.UseOldEnemyId = value; }\r
+        }\r
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer/ShipMaster.cs b/KancolleSniffer/ShipMaster.cs
index b985a7a..a76f2ca 100644 (file)
--- a/KancolleSniffer/ShipMaster.cs
+++ b/KancolleSniffer/ShipMaster.cs
@@ -21,6 +21,8 @@ namespace KancolleSniffer
         public const int NumSlots = 5;\r
         private readonly Dictionary<int, ShipSpec> _shipSpecs = new Dictionary<int, ShipSpec>();\r
 \r
+        public bool UseOldEnemyId { get; set; }\r
+\r
         public void Inspect(dynamic json)\r
         {\r
             var dict = new Dictionary<double, string>();\r
@@ -48,7 +50,7 @@ namespace KancolleSniffer
                 int[] maxEq;\r
                 shipSpec.MaxEq = entry.api_maxeq()\r
                     ? entry.api_maxeq\r
-                    : MissingData.MaxEq.TryGetValue(shipSpec.Id, out maxEq) ? maxEq : null;\r
+                    : MissingData.MaxEq.TryGetValue(shipSpec.Id + (UseOldEnemyId ? 1000 : 0), out maxEq) ? maxEq : null;\r
             }\r
             _shipSpecs[-1] = new ShipSpec();\r
             SetRemodelBaseAndStep();\r
@@ -59,7 +61,7 @@ namespace KancolleSniffer
         {\r
             var name = json.api_name;\r
             var flagship = json.api_yomi;\r
-            if ((int)json.api_id <= 1500 || flagship == "-" || flagship == "")\r
+            if ((int)json.api_id <= (UseOldEnemyId ? 500 : 1500) || flagship == "-" || flagship == "")\r
                 return name;\r
             return name + "(" + flagship + ")";\r
         }\r

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index 9bd38d2..ddf23ff 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -543,6 +543,11 @@ namespace KancolleSniffer
 \r
         public BaseAirCoprs.BaseInfo[] BaseAirCorps => _baseAirCoprs.AllAirCorps;\r
 \r
+        public bool UseOldEnemyId\r
+        {\r
+            set { _shipInfo.UseOldEnemyId = value; }\r
+        }\r
+\r
         public void SetLogWriter(Action<string, string, string> writer, Func<DateTime> nowFunc)\r
         {\r
             _logger.SetWriter(writer, nowFunc);\r