対空砲火における装備の効果を最新の検証結果に合わせる

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / ItemInfo.cs

diff --git a/KancolleSniffer/ItemInfo.cs b/KancolleSniffer/ItemInfo.cs
index ef0f12c..5966dee 100644 (file)
--- a/KancolleSniffer/ItemInfo.cs
+++ b/KancolleSniffer/ItemInfo.cs
@@ -520,11 +520,11 @@ namespace KancolleSniffer
                     case 15: // 機銃\r
                         return 6 * Spec.AntiAir + 4 * Sqrt(Level);\r
                     case 16: // 高角砲\r
-                        return 4 * Spec.AntiAir + 3 * Sqrt(Level);\r
+                        return 4 * Spec.AntiAir + (Spec.AntiAir >= 8 ? 3 : 2) * Sqrt(Level);\r
                     case 11: // 電探\r
                         return 3 * Spec.AntiAir;\r
                     case 30: // 高射装置\r
-                        return 4 * Spec.AntiAir;\r
+                        return 4 * Spec.AntiAir + 2 * Sqrt(Level);\r
                 }\r
                 return 0;\r
             }\r
@@ -549,10 +549,12 @@ namespace KancolleSniffer
                     case 12: // 三式弾\r
                         return 0.6 * Spec.AntiAir;\r
                     case 16: // 高角砲\r
-                        return 0.35 * Spec.AntiAir + 3 * Sqrt(Level);\r
+                        return 0.35 * Spec.AntiAir + (Spec.AntiAir >= 8 ? 3 : 2) * Sqrt(Level);\r
                     case 30: // 高射装置\r
-                        return 0.35 * Spec.AntiAir;\r
+                        return 0.35 * Spec.AntiAir + 2 * Sqrt(Level);\r
                     default:\r
+                        if (Spec.Id == 9) // 46cm三連装砲\r
+                            return 0.25 * Spec.AntiAir;\r
                         if (Spec.Type == 10) // 水偵\r
                             return 0.2 * Spec.AntiAir;\r
                         break;\r