対空噴進弾幕の発動率の計算式を更新する

diff --git a/KancolleSniffer.Test/ShipStatusTest.cs b/KancolleSniffer.Test/ShipStatusTest.cs
index ddcbe9b..289e0bb 100644 (file)
--- a/KancolleSniffer.Test/ShipStatusTest.cs
+++ b/KancolleSniffer.Test/ShipStatusTest.cs
@@ -674,7 +674,7 @@ namespace KancolleSniffer.Test
                 {\r
                     A12cm30連装噴進砲改二\r
                 };\r
-                Assert.AreEqual("63.1", _ship.AntiAirPropellantBarrageChance.ToString("f1"));\r
+                Assert.AreEqual("61.7", _ship.AntiAirPropellantBarrageChance.ToString("f1"));\r
             }\r
 \r
             [TestMethod]\r
@@ -682,7 +682,7 @@ namespace KancolleSniffer.Test
             {\r
                 _ship.AntiAir = 85 + 8;\r
                 _ship.SlotEx = A12cm30連装噴進砲改二;\r
-                Assert.AreEqual("63.1", _ship.AntiAirPropellantBarrageChance.ToString("f1"));\r
+                Assert.AreEqual("61.7", _ship.AntiAirPropellantBarrageChance.ToString("f1"));\r
             }\r
 \r
             [TestMethod]\r
@@ -694,7 +694,7 @@ namespace KancolleSniffer.Test
                     A12cm30連装噴進砲改二,\r
                     A12cm30連装噴進砲改二\r
                 };\r
-                Assert.AreEqual("95.1", _ship.AntiAirPropellantBarrageChance.ToString("f1"));\r
+                Assert.AreEqual("93.8", _ship.AntiAirPropellantBarrageChance.ToString("f1"));\r
             }\r
 \r
             [TestMethod]\r
@@ -707,7 +707,7 @@ namespace KancolleSniffer.Test
                     A12cm30連装噴進砲改二,\r
                     A25mm三連装機銃集中配備\r
                 };\r
-                Assert.AreEqual("114.3", _ship.AntiAirPropellantBarrageChance.ToString("f1"), "噴進砲改二2+機銃");\r
+                Assert.AreEqual("113.0", _ship.AntiAirPropellantBarrageChance.ToString("f1"), "噴進砲改二2+機銃");\r
             }\r
 \r
             [TestMethod]\r
@@ -719,7 +719,7 @@ namespace KancolleSniffer.Test
                     A12cm30連装噴進砲改二\r
                 };\r
                 _ship.Spec.ShipClass = 2;\r
-                Assert.AreEqual("88.1", _ship.AntiAirPropellantBarrageChance.ToString("f1"));\r
+                Assert.AreEqual("86.7", _ship.AntiAirPropellantBarrageChance.ToString("f1"));\r
             }\r
         }\r
     }\r

diff --git a/KancolleSniffer/Model/ShipStatus.cs b/KancolleSniffer/Model/ShipStatus.cs
index 01db3b5..45724e2 100644 (file)
--- a/KancolleSniffer/Model/ShipStatus.cs
+++ b/KancolleSniffer/Model/ShipStatus.cs
@@ -371,7 +371,7 @@ namespace KancolleSniffer.Model
                 if (launcherCount == 0)\r
                     return 0;\r
                 var iseClass = Spec.ShipClass == 2;\r
-                var baseChance = (EffectiveAntiAirForShip + Lucky) / 282.0;\r
+                var baseChance = (EffectiveAntiAirForShip + 0.9 * Lucky) / 281.0;\r
                 return (baseChance + 0.15 * (launcherCount - 1) + (iseClass ? 0.25 : 0)) * 100;\r
             }\r
         }\r