敵艦のIDが古いテストを通すための細工を削除する

diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs
index abf64d6..ff929f2 100644 (file)
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -510,11 +510,6 @@ namespace KancolleSniffer
             _escapedShips.Clear();\r
         }\r
 \r
-        public bool UseOldEnemyId\r
-        {\r
-            set => _shipMaster.UseOldEnemyId = value;\r
-        }\r
-\r
         public void InjectShips(dynamic battle, dynamic item)\r
         {\r
             var deck = (int)battle.api_deck_id - 1;\r

diff --git a/KancolleSniffer/ShipMaster.cs b/KancolleSniffer/ShipMaster.cs
index 929f095..64528a8 100644 (file)
--- a/KancolleSniffer/ShipMaster.cs
+++ b/KancolleSniffer/ShipMaster.cs
@@ -21,8 +21,6 @@ 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
@@ -49,7 +47,7 @@ namespace KancolleSniffer
                 }\r
                 shipSpec.MaxEq = entry.api_maxeq()\r
                     ? entry.api_maxeq\r
-                    : MissingData.MaxEq.TryGetValue(shipSpec.Id + (UseOldEnemyId ? 1000 : 0), out var maxEq)\r
+                    : MissingData.MaxEq.TryGetValue(shipSpec.Id, out var maxEq)\r
                         ? maxEq\r
                         : null;\r
             }\r
@@ -62,7 +60,7 @@ namespace KancolleSniffer
         {\r
             var name = json.api_name;\r
             var flagship = json.api_yomi;\r
-            if ((int)json.api_id <= (UseOldEnemyId ? 500 : 1500) || flagship == "-" || flagship == "")\r
+            if ((int)json.api_id <= 1500 || flagship == "-" || flagship == "")\r
                 return name;\r
             return name + "(" + flagship + ")";\r
         }\r

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index 16df547..32ca509 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -609,11 +609,6 @@ 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