From a437fac38f3e699ae95cf3f1ab692970f1bf9983 Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sun, 7 Feb 2021 21:31:15 +0900
Subject: [PATCH] =?utf8?q?=E3=80=8C=E7=B2=BE=E9=8B=AD=E8=BB=BD=E5=B7=A1?=
 =?utf8?q?=E3=80=8D=E6=BC=94=E7=BF=92=EF=BC=81=E3=81=AE=E3=82=AB=E3=82=A6?=
 =?utf8?q?=E3=83=B3=E3=82=BF=E3=83=BC=E3=82=92=E5=AE=9F=E8=A3=85=E3=81=99?=
 =?utf8?q?=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer.Test/QuestCounterTest.cs | 30 ++++++++++++++++++++++++++++++
 KancolleSniffer/Model/QuestCountList.cs  |  1 +
 KancolleSniffer/Model/QuestCounter.cs    |  4 ++++
 3 files changed, 35 insertions(+)

diff --git a/KancolleSniffer.Test/QuestCounterTest.cs b/KancolleSniffer.Test/QuestCounterTest.cs
index 2700566..938c5e2 100644
--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -1731,6 +1731,36 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
+        /// 348: 「精鋭軽巡」演習！
+        /// </summary>
+        [TestMethod]
+        public void PracticeResult_348()
+        {
+            var count = InjectQuest(348);
+
+            _battleInfo.InjectResultStatus(ShipStatusList(3, 3, 21, 2, 2),
+                new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);
+            InjectPracticeResult("B");
+            Assert.AreEqual(0, count.Now);
+
+            InjectPracticeResult("A");
+            Assert.AreEqual(1, count.Now);
+
+            _battleInfo.Result.Friend.Main[0] = ShipStatus(4);
+            InjectPracticeResult("A");
+            Assert.AreEqual(1, count.Now);
+
+            _battleInfo.Result.Friend.Main[0] = ShipStatus(21);
+            _battleInfo.Result.Friend.Main[4] = ShipStatus(1);
+            InjectPracticeResult("A");
+            Assert.AreEqual(1, count.Now);
+
+            _battleInfo.Result.Friend.Main[4] = ShipStatus(2);
+            InjectPracticeResult("A");
+            Assert.AreEqual(2, count.Now);
+        }
+
+        /// <summary>
         /// 402: 「遠征」を3回成功させよう！
         /// 403: 「遠征」を10回成功させよう！
         /// 404: 大規模遠征作戦、発令！
diff --git a/KancolleSniffer/Model/QuestCountList.cs b/KancolleSniffer/Model/QuestCountList.cs
index 8ed593f..7fa4760 100644
--- a/KancolleSniffer/Model/QuestCountList.cs
+++ b/KancolleSniffer/Model/QuestCountList.cs
@@ -100,6 +100,7 @@ namespace KancolleSniffer.Model
             {342, new QuestPractice {Interval = Quarterly, Max = 4, Rank = "A", Material = new[] {0, 4, 4, 0}, Shift = 1}}, // 342: 小艦艇群演習強化任務
             {345, new QuestPractice {Interval = Yearly10, Max = 4, Rank = "A", Material = new[] {0, 5, 4, 0}, Shift = 1}}, // 345: 演習ティータイム！
             {346, new QuestPractice {Interval = Yearly10, Max = 4, Rank = "S", Material = new[] {0, 4, 6, 0}, Shift = 1}}, // 346: 最精鋭！主力オブ主力、演習開始！
+            {348, new QuestPractice {Interval = Yearly2, Max = 4, Rank = "A", Material = new[] {0, 3, 0, 3}, Shift = 1}}, // 348: 「精鋭軽巡」演習！
 
             {402, new QuestMission {Interval = Daily, Max = 3, Material = new[] {0, 0, 1, 0}}}, // 402: 「遠征」を3回成功させよう！
             {403, new QuestMission {Interval = Daily, Max = 10, Material = new[] {0, 0, 0, 0}}}, // 403: 「遠征」を10回成功させよう！
diff --git a/KancolleSniffer/Model/QuestCounter.cs b/KancolleSniffer/Model/QuestCounter.cs
index cc3e3e6..d99e59d 100644
--- a/KancolleSniffer/Model/QuestCounter.cs
+++ b/KancolleSniffer/Model/QuestCounter.cs
@@ -356,6 +356,10 @@ namespace KancolleSniffer.Model
                     return specs.Names.Count("Warspite", "金剛", "Ark Royal", "Nelson", "Jervis", "Janus") >= 4;
                 case 346:
                     return specs.Names.Count("夕雲改二", "巻雲改二", "風雲改二", "秋雲改二") == 4;
+                case 348:
+                    return new[] {3, 21}.Contains(specs.FlagshipType) &&
+                           specs.Types.Skip(1).Count(type => new[] {3, 4, 21}.Contains(type)) >= 2 &&
+                           specs.Types.Count(type => type == 2) >= 2;
                 default:
                     return true;
             }
-- 
2.11.0