泊地周辺海域の安全確保を徹底せよ！の7-2-Gのカウントを直す

diff --git a/KancolleSniffer.Test/QuestInfoTest.cs b/KancolleSniffer.Test/QuestInfoTest.cs
index 98dfc13..80fe645 100644 (file)
--- a/KancolleSniffer.Test/QuestInfoTest.cs
+++ b/KancolleSniffer.Test/QuestInfoTest.cs
@@ -978,8 +978,8 @@ namespace KancolleSniffer.Test
             {\r
                 api_maparea_id = 7,\r
                 api_mapinfo_no = 2,\r
-                api_no = 9,\r
-                api_event_id = 4\r
+                api_no = 7,\r
+                api_event_id = 5\r
             }));\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
             PAssert.That(() => count.NowArray[2] == 1, "7-2G");\r

diff --git a/KancolleSniffer/Model/QuestInfo.cs b/KancolleSniffer/Model/QuestInfo.cs
index 0f4f703..6e42aed 100644 (file)
--- a/KancolleSniffer/Model/QuestInfo.cs
+++ b/KancolleSniffer/Model/QuestInfo.cs
@@ -633,14 +633,6 @@ namespace KancolleSniffer.Model
                 if (QuestSortie.CompareRank(rank, "S") != 0)\r
                     return;\r
                 var count = q893.Count;\r
-                if (!_boss)\r
-                {\r
-                    if (_map == 72 && _cell == 9)\r
-                    {\r
-                        IncrementNowArray(count, 2);\r
-                    }\r
-                    return;\r
-                }\r
                 switch (_map)\r
                 {\r
                     case 15:\r
@@ -650,6 +642,11 @@ namespace KancolleSniffer.Model
                         IncrementNowArray(count, 1);\r
                         break;\r
                     case 72:\r
+                        if (_cell == 7)\r
+                        {\r
+                            IncrementNowArray(count, 2);\r
+                            break;\r
+                        }\r
                         IncrementNowArray(count, 3);\r
                         break;\r
                 }\r