各種報告書の表を列単位で検索可能にする

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / Model / ItemSpec.cs

diff --git a/KancolleSniffer/Model/ItemSpec.cs b/KancolleSniffer/Model/ItemSpec.cs
index 4ca1e5d..ba78050 100644 (file)
--- a/KancolleSniffer/Model/ItemSpec.cs
+++ b/KancolleSniffer/Model/ItemSpec.cs
@@ -19,8 +19,8 @@ namespace KancolleSniffer.Model
 {\r
     public class ItemSpec\r
     {\r
-        public static bool IncreaceLandPowerTp = false;\r
         public int Id;\r
+        public bool Empty => Id == -1;\r
         public string Name;\r
         public int Type;\r
         public string TypeName;\r
@@ -134,11 +134,22 @@ namespace KancolleSniffer.Model
         public bool IsSonar => Type == 14 || // ソナー\r
                                Type == 40; // 大型ソナー\r
 \r
-        public bool IsDepthCharge => Type == 15;\r
+        public bool IsDCT => // Depth Charge Thrower\r
+            Id == 44 || // 九四式爆雷投射機\r
+            Id == 45; // 三式爆雷投射機\r
+\r
+        public bool IsDC => // Depth Charge\r
+            Id == 226 || // 九五式爆雷\r
+            Id == 227; // 二式爆雷\r
+\r
+        public bool IsSpecialDCT => Id == 287 || // 三式爆雷投射機 集中配備\r
+                                    Id == 288; // 試製15cm9連装対潜噴進砲\r
 \r
         public bool IsRepairFacility => Type == 31;\r
 \r
-        public bool IsAntiAirGun => Type == 21;\r
+        public bool IsDrum => Id == 75;\r
+\r
+        public bool IsArmyAircraft => Type == 25 || Type == 26;\r
 \r
         public double ContactTriggerRate\r
         {\r
@@ -191,20 +202,21 @@ namespace KancolleSniffer.Model
             }\r
         }\r
 \r
-        public double ReconPlaneInterceptionBonus\r
+        public AirBaseParams ReconPlaneAirBaseBonus\r
         {\r
             get\r
             {\r
                 switch (Type)\r
                 {\r
                     case 9:\r
-                        return LoS <= 7 ? 1.2 : 1.3;\r
+                        return new AirBaseParams(1.0, LoS <= 7 ? 1.2 : 1.3);\r
                     case 10:\r
                     case 41:\r
-                        return LoS <= 7 ? 1.1 :\r
-                            LoS <= 8 ? 1.13 : 1.16;\r
+                        return new AirBaseParams(1.0, LoS <= 7 ? 1.1 : LoS <= 8 ? 1.13 : 1.16);\r
+                    case 49:\r
+                        return new AirBaseParams(LoS <= 8 ? 1.15 : 1.18, LoS <= 8 ? 1.18 : 1.24);\r
                 }\r
-                return 1;\r
+                return new AirBaseParams(1.0, 1.0);\r
             }\r
         }\r
 \r