出撃して最初の戦闘の記録のボス欄を「出撃」にする

diff --git a/KancolleSniffer.Test/LoggerTest.cs b/KancolleSniffer.Test/LoggerTest.cs
index 3938ab8..c1c9444 100644 (file)
--- a/KancolleSniffer.Test/LoggerTest.cs
+++ b/KancolleSniffer.Test/LoggerTest.cs
@@ -123,7 +123,7 @@ namespace KancolleSniffer.Test
             sniffer.SetLogWriter((path, s, h) => { result += s + "|"; }, () => new DateTime(2015, 1, 1));\r
             sniffer.EnableLog(LogType.Battle);\r
             SnifferTest.SniffLogFile(sniffer, "battle_004");\r
-            PAssert.That(() => "2015-01-01 00:00:00,珊瑚諸島沖,1,,S,同航戦,単縦陣,単縦陣,敵前衛艦隊,重巡洋艦,青葉," +\r
+            PAssert.That(() => "2015-01-01 00:00:00,珊瑚諸島沖,1,出撃,S,同航戦,単縦陣,単縦陣,敵前衛艦隊,重巡洋艦,青葉," +\r
                                "武蔵改(Lv133),86/106,扶桑改二(Lv87),77/77,北上改二(Lv113),49/49,飛龍改二(Lv133),63/74,蒼龍改二(Lv133),74/74,龍鳳改(Lv97),48/48," +\r
                                "軽巡ヘ級(flagship),57/57,重巡リ級(flagship),76/76,重巡リ級(flagship),76/76,雷巡チ級(elite),50/50,駆逐ニ級(elite),45/45,駆逐ニ級(elite),45/45|" +\r
                                "2015-01-01 00:00:00,珊瑚諸島沖,2,,B,反航戦,単横陣,単横陣,敵潜水艦隊,,," +\r
@@ -146,7 +146,7 @@ namespace KancolleSniffer.Test
             sniffer.SetLogWriter((path, s, h) => { result += s + "|"; }, () => new DateTime(2015, 1, 1));\r
             sniffer.EnableLog(LogType.Battle);\r
             SnifferTest.SniffLogFile(sniffer, "sp_midnight_001");\r
-            PAssert.That(() => "2015-01-01 00:00:00,サブ島沖海域,3,,D,反航戦,単縦陣,単縦陣,敵前衛警戒艦隊,,," +\r
+            PAssert.That(() => "2015-01-01 00:00:00,サブ島沖海域,3,出撃,D,反航戦,単縦陣,単縦陣,敵前衛警戒艦隊,,," +\r
                                "Prinz Eugen改(Lv52),1/63,,,,,,,,,,," +\r
                                "軽巡ヘ級(flagship),57/57,重巡リ級(flagship),76/76,重巡リ級(flagship),76/76,雷巡チ級(elite),50/50,雷巡チ級(elite),50/50,駆逐ロ級(flagship),43/43|"\r
                                == result);\r
@@ -160,7 +160,7 @@ namespace KancolleSniffer.Test
             sniffer.SetLogWriter((path, s, h) => { result += s + "|"; }, () => new DateTime(2015, 1, 1));\r
             sniffer.EnableLog(LogType.Battle);\r
             SnifferTest.SniffLogFile(sniffer, "combined_surface_001");\r
-            PAssert.That(() => "2015-01-01 00:00:00,南西方面海域,3,,S,同航戦,第四警戒航行序列,単縦陣,ピケット水雷戦隊 A群,,," +\r
+            PAssert.That(() => "2015-01-01 00:00:00,南西方面海域,3,出撃,S,同航戦,第四警戒航行序列,単縦陣,ピケット水雷戦隊 A群,,," +\r
                                "あきつ丸改(Lv68),40/40,山城改二(Lv85),77/77,扶桑改二(Lv85),77/77,利根改二(Lv117),59/66,筑摩改二(Lv117),51/65,神通改二(Lv97),47/50," +\r
                                "軽巡ツ級(elite),66/66,軽巡ト級(elite),55/55,駆逐イ級後期型,35/35,駆逐イ級後期型,35/35,駆逐イ級後期型,35/35,駆逐イ級後期型,35/35|" +\r
                                "2015-01-01 00:00:00,南西方面海域,7,,S,同航戦,第四警戒航行序列,複縦陣,任務部隊 D群,駆逐艦,満潮," +\r

diff --git a/KancolleSniffer/Logger.cs b/KancolleSniffer/Logger.cs
index 8c275c4..09dff50 100644 (file)
--- a/KancolleSniffer/Logger.cs
+++ b/KancolleSniffer/Logger.cs
@@ -52,6 +52,7 @@ namespace KancolleSniffer
         private int _kdockId;\r
         private DateTime _prevTime;\r
         private int _materialLogInterval = 10;\r
+        private bool _start;\r
 \r
         public int MaterialLogInterval\r
         {\r
@@ -113,7 +114,13 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
-        public void InspectMap(dynamic json)\r
+        public void InspectMapStart(dynamic json)\r
+        {\r
+            _start = true;\r
+            _map = json;\r
+        }\r
+\r
+        public void InspectMapNext(dynamic json)\r
         {\r
             _map = json;\r
         }\r
@@ -152,7 +159,11 @@ namespace KancolleSniffer
                     : string.Format("{0},{1}/{2}", _shipMaster[edeck[i]].Name, enowhp[i], emaxhp[i]));\r
             }\r
             var cell = (int)_map.api_no;\r
-            var boss = cell == (int)_map.api_bosscell_no || (int)_map.api_event_id == 5 ? "ボス" : "";\r
+            var boss = "";\r
+            if (_start)\r
+                boss = "出撃";\r
+            else if (cell == (int)_map.api_bosscell_no || (int)_map.api_event_id == 5)\r
+                boss = "ボス";\r
             _writer("海戦・ドロップ報告書", string.Join(",", _nowFunc().ToString(DateTimeFormat),\r
                 result.api_quest_name,\r
                 cell, boss,\r
@@ -170,6 +181,7 @@ namespace KancolleSniffer
                 "敵艦1,敵艦1HP,敵艦2,敵艦2HP,敵艦3,敵艦3HP,敵艦4,敵艦4HP,敵艦5,敵艦5HP,敵艦6,敵艦6HP"\r
                 );\r
             _map = _battle = null;\r
+            _start = false;\r
         }\r
 \r
         private string FormationName(dynamic f)\r

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index bbe97c3..c24e701 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -288,12 +288,12 @@ namespace KancolleSniffer
             {\r
                 _shipInfo.StartSortie(request);\r
                 _conditionTimer.InvalidateCond();\r
-                _logger.InspectMap(data);\r
+                _logger.InspectMapStart(data);\r
                 return Update.Timer;\r
             }\r
             if (url.EndsWith("api_req_map/next"))\r
             {\r
-                _logger.InspectMap(data);\r
+                _logger.InspectMapNext(data);\r
                 return Update.None;\r
             }\r
             if (url.EndsWith("api_req_mission/result"))\r