Commit: f94e1367899507548a98846eafbae611c26634a7 - KancolleSniffer (git)

Commit MetaInfo

• Revisión: f94e1367899507548a98846eafbae611c26634a7 (tree)
• Tiempo: 2020-02-24 16:46:21
• Autor: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Log Message

素対潜に装備ボーナスが含まれているのを直す

Cambiar Resumen

• modified: KancolleSniffer.Test/ShipStatusTest.cs
• modified: KancolleSniffer/Model/ShipStatus.cs

Diferencia incremental

--- a/KancolleSniffer.Test/ShipStatusTest.cs
+++ b/KancolleSniffer.Test/ShipStatusTest.cs
@@ -616,6 +616,26 @@ namespace KancolleSniffer.Test
                 };
                 Assert.AreEqual("83.8", ship.EffectiveAntiSubmarine.ToString("f1"), "三種コンビネーションにならない");
             }
+
+            [TestMethod]
+            public void 装備ボーナス()
+            {
+                var ship = new ShipStatus
+                {
+                    Fleet = new Fleet(null, 0, null),
+                    Firepower = 50,
+                    Spec = new ShipSpec
+                    {
+                        Name = "神風改"
+                    },
+                    AntiSubmarine = 50 + 10 + 3,
+                    Slot = new[]
+                    {
+                        三式水中探信儀
+                    }
+                };
+                Assert.AreEqual(50, ship.ShipAntiSubmarine);
+            }
         }
 
         // ReSharper disable once InconsistentNaming
@@ -635,7 +655,8 @@ namespace KancolleSniffer.Test
         private static readonly ItemStatus A25mm三連装機銃集中配備 = new ItemStatus
         {
             Id = 1,
-            Spec = new ItemSpec{
+            Spec = new ItemSpec
+            {
                 Id = 131,
                 Type = 21,
                 IconType = 15,
@@ -651,13 +672,13 @@ namespace KancolleSniffer.Test
             [TestInitialize]
             public void Initialize()
             {
-                _ship =new ShipStatus
+                _ship = new ShipStatus
                 {
                     AntiAir = 93,
                     Lucky = 46,
                     Spec = new ShipSpec
                     {
-                        ShipType = 4,
+                        ShipType = 4
                     },
                     Slot = new ItemStatus[0]
                 };

--- a/KancolleSniffer/Model/ShipStatus.cs
+++ b/KancolleSniffer/Model/ShipStatus.cs
@@ -215,7 +215,39 @@ namespace KancolleSniffer.Model
             }
         }
 
-        public int ShipAntiSubmarine => AntiSubmarine - Slot.Sum(item => item.Spec.AntiSubmarine);
+        public int ShipAntiSubmarine => AntiSubmarine - Slot.Sum(item => item.Spec.AntiSubmarine + AntiSubmarineBonus(item.Spec));
+
+        private int AntiSubmarineBonus(ItemSpec spec)
+        {
+            switch (spec.Name)
+            {
+                case "四式水中聴音機":
+                    if (Spec.ShipClass == 54) // 秋月型
+                        return 1;
+                    if (new[] {"五十鈴改二", "那珂改二", "由良改二", "夕張改二", "夕張改二特"}.Any(name => Spec.Name == name))
+                        return 1;
+                    if (Spec.Name == "夕張改二丁")
+                        return 3;
+                    break;
+                case "三式水中探信儀":
+                    if (new[] {"神風", "春風", "時雨", "山風", "舞風", "朝霜"}.Any(Spec.Name.StartsWith))
+                        return 3;
+                    if (new[] {"潮", "雷", "山雲", "磯風", "浜風", "岸波"}.Any(Spec.Name.StartsWith))
+                        return 2;
+                    break;
+                case "三式爆雷投射機 集中配備":
+                    if (new[] {"五十鈴改二", "那珂改二", "由良改二"}.Any(name => Spec.Name == name))
+                        return 1;
+                    break;
+                case "試製15cm9連装対潜噴進砲":
+                    if (new[] {"五十鈴改二", "那珂改二", "由良改二", "夕張改二"}.Any(name => Spec.Name == name))
+                        return 2;
+                    if (Spec.Name == "夕張改二丁")
+                        return 3;
+                    break;
+            }
+            return 0;
+        }
 
         public bool CanOpeningAntiSubmarineAttack
         {