敵味方の識別を簡単にする

diff --git a/KancolleSniffer/ShipMaster.cs b/KancolleSniffer/ShipMaster.cs
index 8e994f5..8d53623 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 static bool IsEnemyId(int id) => id > 1500;\r
+\r
         public void Inspect(dynamic json)\r
         {\r
             var dict = new Dictionary<double, string>();\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 (!IsEnemyId((int)json.api_id) || flagship == "-" || flagship == "")\r
                 return name;\r
             return name + "(" + flagship + ")";\r
         }\r
@@ -104,6 +106,7 @@ namespace KancolleSniffer
     public class ShipSpec\r
     {\r
         public int Id { get; set; }\r
+        public bool IsEnemy => ShipMaster.IsEnemyId(Id);\r
         public int SortNo { get; set; }\r
         public string Name { get; set; }\r
         public int FuelMax { get; set; }\r