最近実装された爆雷をシナジーの対象から外す

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

diff --git a/KancolleSniffer/Model/ItemSpec.cs b/KancolleSniffer/Model/ItemSpec.cs
index e071b7a..5fd67e7 100644 (file)
--- a/KancolleSniffer/Model/ItemSpec.cs
+++ b/KancolleSniffer/Model/ItemSpec.cs
@@ -100,6 +100,7 @@ namespace KancolleSniffer.Model
                     case 45:\r
                     case 47: // 陸上攻撃機\r
                     case 48: // 局地戦闘機\r
+                    case 49: // 陸上偵察機\r
                     case 56:\r
                     case 57:\r
                     case 58:\r
@@ -134,7 +135,7 @@ namespace KancolleSniffer.Model
         public bool IsSonar => Type == 14 || // ソナー\r
                                Type == 40; // 大型ソナー\r
 \r
-        public bool IsDCT =>  // Depth Charge Thrower\r
+        public bool IsDCT => // Depth Charge Thrower\r
             Id == 44 || // 九四式爆雷投射機\r
             Id == 45; // 三式爆雷投射機\r
 \r
@@ -142,13 +143,16 @@ namespace KancolleSniffer.Model
             Id == 226 || // 九五式爆雷\r
             Id == 227; // 二式爆雷\r
 \r
-        public bool IsSpecialDCT => Id == 287 || // 三式爆雷投射機 集中配備\r
-                                    Id == 288; // 試製15cm9連装対潜噴進砲\r
+        public bool IsSpecialDCT => Type == 15 && !IsDCT && !IsDC;\r
 \r
         public bool IsRepairFacility => Type == 31;\r
 \r
         public bool IsDrum => Id == 75;\r
 \r
+        public bool IsArmyAircraft => Type == 25 || Type == 26;\r
+\r
+        public bool IsNightRecon => Id == 102;\r
+\r
         public double ContactTriggerRate\r
         {\r
             get\r
@@ -158,6 +162,7 @@ namespace KancolleSniffer.Model
                     case 9: // 艦偵\r
                     case 10: // 水偵\r
                     case 41: // 大艇\r
+                    case 49: // 陸偵\r
                         return 0.04;\r
                     default:\r
                         return 0;\r
@@ -200,20 +205,21 @@ namespace KancolleSniffer.Model
             }\r
         }\r
 \r
-        public double ReconPlaneInterceptionBonus\r
+        public AirCorpsFighterPower.Pair ReconPlaneAirBaseBonus\r
         {\r
             get\r
             {\r
                 switch (Type)\r
                 {\r
                     case 9:\r
-                        return LoS <= 7 ? 1.2 : 1.3;\r
+                        return new AirCorpsFighterPower.Pair(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 AirCorpsFighterPower.Pair(1.0, LoS <= 7 ? 1.1 : LoS <= 8 ? 1.13 : 1.16);\r
+                    case 49:\r
+                        return new AirCorpsFighterPower.Pair(LoS <= 8 ? 1.15 : 1.18, LoS <= 8 ? 1.18 : 1.24);\r
                 }\r
-                return 1;\r
+                return new AirCorpsFighterPower.Pair(1.0, 1.0);\r
             }\r
         }\r
 \r