提交: 8c040d7bb4f89c9b1537dfd111867168112f6fb9 - KancolleSniffer (git)

Commit MetaInfo

• 修訂: 8c040d7bb4f89c9b1537dfd111867168112f6fb9 (tree)
• 時間: 2019-11-17 21:44:23
• 作者: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Log Message

南西諸島方面「海上警備行動」発令！のカウンターを実装する

Change Summary

• modified: KancolleSniffer.Test/QuestCounterTest.cs
• modified: KancolleSniffer/Model/QuestCountList.cs
• modified: KancolleSniffer/Model/QuestCounter.cs

差異

--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -136,7 +136,8 @@ namespace KancolleSniffer.Test
                     new QuestCount {Id = 893, NowArray = new[] {1, 1, 1, 1}},
                     new QuestCount {Id = 894, NowArray = new[] {1, 1, 1, 1, 1}},
                     new QuestCount {Id = 280, NowArray = new[] {1, 1, 1, 1}},
-                    new QuestCount {Id = 872, NowArray = new[] {1, 1, 1, 1}}
+                    new QuestCount {Id = 872, NowArray = new[] {1, 1, 1, 1}},
+                    new QuestCount {Id = 284, NowArray = new[] {1, 1, 1, 1}}
                 }
             };
             new QuestInfo().LoadState(status);
@@ -173,6 +174,9 @@ namespace KancolleSniffer.Test
             var q872 = status.QuestCountList.First(q => q.Id == 872);
             Assert.IsTrue(q872.ToString() == "4/4");
             Assert.IsTrue(q872.ToToolTip() == "7-2M 5-5 6-2 6-5");
+            var q284 = status.QuestCountList.First(q => q.Id == 284);
+            Assert.IsTrue(q284.ToString() == "4/4");
+            Assert.IsTrue(q284.ToToolTip() == "1-4 2-1 2-2 2-3");
         }
     }
 
@@ -603,7 +607,7 @@ namespace KancolleSniffer.Test
             var quest = InjectQuest(280);
 
             _battleInfo.InjectResultStatus(
-                ShipStatusList(7, 1, 1, 1, 8, 8), new ShipStatus[0],
+                ShipStatusList(7, 2, 1, 1, 8, 8), new ShipStatus[0],
                 new ShipStatus[0], new ShipStatus[0]);
 
             InjectMapNext(12, 4);
@@ -643,6 +647,36 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
+        ///  // 284: 南西諸島方面「海上警備行動」発令！
+        /// </summary>
+        [TestMethod]
+        public void BattleResult_284()
+        {
+            var quest = InjectQuest(284);
+
+            _battleInfo.InjectResultStatus(
+                ShipStatusList(7, 2, 1, 1, 8, 8), new ShipStatus[0],
+                new ShipStatus[0], new ShipStatus[0]);
+
+            InjectMapNext(14, 4);
+            InjectBattleResult("S");
+            InjectMapNext(14, 5);
+            InjectBattleResult("A");
+            Assert.IsTrue(CheckCount(quest, new[] {0, 0, 0, 0}));
+
+            InjectBattleResult("S");
+            InjectMapNext(21, 5);
+            InjectBattleResult("S");
+            InjectMapNext(22, 5);
+            InjectBattleResult("S");
+            InjectMapNext(23, 5);
+            InjectBattleResult("S");
+            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1, 1}));
+
+            // 艦種チェックは280と共通
+        }
+
+        /// <summary>
         /// 822: 沖ノ島海域迎撃戦
         /// 854: 戦果拡張任務！「Z作戦」前段作戦
         /// </summary>

--- a/KancolleSniffer/Model/QuestCountList.cs
+++ b/KancolleSniffer/Model/QuestCountList.cs
@@ -58,6 +58,7 @@ namespace KancolleSniffer.Model
             {265, new QuestSortie {Interval = Monthly, Max = 10, Rank = "A", Maps = new[] {15}, Material = new[] {0, 0, 5, 3}}}, // 265: 海上護衛強化月間
             {266, new QuestSpec {Interval = Monthly, Max = 1, Material = new[] {4, 4, 0, 2}}}, // 266: 「水上反撃部隊」突入せよ！
             {280, new QuestSpec {Interval = Monthly, MaxArray = new[] {1, 1, 1, 1}, Material = new[] {0, 4, 4, 2}}}, // 280: 兵站線確保！海上警備を強化実施せよ！
+            {284, new QuestSpec {Interval = Quarterly, MaxArray = new[] {1, 1, 1, 1}, Material = new[] {0, 0, 0, 4}}}, // 284: 南西諸島方面「海上警備行動」発令！
 
             {822, new QuestSortie {Interval = Quarterly, Max = 2, Rank = "S", Maps = new[] {24}, Material = new[] {0, 0, 0, 5}}}, // 822: 沖ノ島海域迎撃戦
             {854, new QuestSpec {Interval = Quarterly, MaxArray = new[] {1, 1, 1, 1}, Material = new[] {0, 0, 0, 4}}}, // 854: 戦果拡張任務！「Z作戦」前段作戦

--- a/KancolleSniffer/Model/QuestCounter.cs
+++ b/KancolleSniffer/Model/QuestCounter.cs
@@ -77,7 +77,7 @@ namespace KancolleSniffer.Model
 
         public override string ToString()
         {
-            if (Id == 280 || Id == 426 || Id == 854 || Id == 872 || Id == 873 || Id == 888 || Id == 894)
+            if (Id == 280 || Id == 284 || Id == 426 || Id == 854 || Id == 872 || Id == 873 || Id == 888 || Id == 894)
                 return $"{NowArray.Count(n => n >= 1)}/{Spec.MaxArray.Length}";
             return NowArray != null
                 ? string.Join(" ", NowArray.Zip(Spec.MaxArray, (n, m) => $"{n}/{m}"))
@@ -109,6 +109,10 @@ namespace KancolleSniffer.Model
                     return string.Join(" ",
                         new[] {"1-2", "1-3", "1-4", "2-1"}.Zip(NowArray, (map, n) => n >= 1 ? map : "")
                             .Where(s => !string.IsNullOrEmpty(s)));
+                case 284:
+                    return string.Join(" ",
+                        new[] {"1-4", "2-1", "2-2", "2-3"}.Zip(NowArray, (map, n) => n >= 1 ? map : "")
+                            .Where(s => !string.IsNullOrEmpty(s)));
                 case 426:
                     return string.Join(" ",
                         new[] {"警備任務", "対潜警戒任務", "海上護衛任務", "強硬偵察任務"}
@@ -333,6 +337,28 @@ namespace KancolleSniffer.Model
                             }
                         }
                         break;
+                    case 284:
+                        if (_boss && rank.S &&
+                            specs.Types.Count(type => type == 1 || type == 2) >= 3 &&
+                            specs.Types.Intersect(new[] {3, 4, 7, 21}).Any())
+                        {
+                            switch (_map)
+                            {
+                                case 14:
+                                    IncrementNth(count, 0);
+                                    break;
+                                case 21:
+                                    IncrementNth(count, 1);
+                                    break;
+                                case 22:
+                                    IncrementNth(count, 2);
+                                    break;
+                                case 23:
+                                    IncrementNth(count, 3);
+                                    break;
+                            }
+                        }
+                        break;
                     case 854:
                         if (_boss)
                         {