From 1763752c2d1ada9d19df6b15b9b7ba7951352b09 Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Fri, 30 Mar 2018 23:01:40 +0900
Subject: [PATCH] =?utf8?q?=E5=AF=BE=E7=A9=BA=E7=A0=B2=E7=81=AB=E3=81=AB?=
 =?utf8?q?=E3=81=8A=E3=81=91=E3=82=8B=E8=A3=85=E5=82=99=E3=81=AE=E5=8A=B9?=
 =?utf8?q?=E6=9E=9C=E3=82=92=E6=9C=80=E6=96=B0=E3=81=AE=E6=A4=9C=E8=A8=BC?=
 =?utf8?q?=E7=B5=90=E6=9E=9C=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer/ItemInfo.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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