初戦がボスのときに報告書にボスとして記録されないのを直す

diff --git a/KancolleSniffer.Test/LoggerTest.cs b/KancolleSniffer.Test/LoggerTest.cs
index c1c9444..d94d616 100644 (file)
--- a/KancolleSniffer.Test/LoggerTest.cs
+++ b/KancolleSniffer.Test/LoggerTest.cs
@@ -170,6 +170,20 @@ namespace KancolleSniffer.Test
         }\r
 \r
         [TestMethod]\r
+        public void InspectBattleResultStartAndBoss()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            var result = "";\r
+            sniffer.SetLogWriter((path, s, h) => { result += s + "|"; }, () => new DateTime(2015, 1, 1));\r
+            sniffer.EnableLog(LogType.Battle);\r
+            SnifferTest.SniffLogFile(sniffer, "battle_005");\r
+            PAssert.That(() => "2015-01-01 00:00:00,バシー島沖,7,出撃&ボス,S,同航戦,単縦陣,単縦陣,敵通商破壊艦隊,軽空母,龍驤," +\r
+                               "那珂改二(Lv97),48/48,隼鷹改二(Lv129),62/62,北上改二(Lv129),49/49,大井改二(Lv115),40/49,呂500(Lv62),13/13,伊168改(Lv97),15/15," +\r
+                               "重巡リ級(elite),60/60,重巡リ級,58/58,雷巡チ級(elite),50/50,軽巡ヘ級,36/36,駆逐ニ級,28/28,駆逐ニ級,28/28|"\r
+                               == result);\r
+        }\r
+\r
+        [TestMethod]\r
         public void InspectMaterial()\r
         {\r
             var sniffer = new Sniffer();\r

diff --git a/KancolleSniffer/Logger.cs b/KancolleSniffer/Logger.cs
index 5ba11ad..2f9b7a0 100644 (file)
--- a/KancolleSniffer/Logger.cs
+++ b/KancolleSniffer/Logger.cs
@@ -101,9 +101,9 @@ namespace KancolleSniffer
                 if (flag == 1)\r
                     material[(int)Material.Bucket] = count;\r
                 else if (flag == 2)\r
-                    material[(int)Material.Burner + 2] = count;  // 高速建造材と開発資材が反対なのでいつか直す\r
+                    material[(int)Material.Burner + 2] = count; // 高速建造材と開発資材が反対なのでいつか直す\r
                 else if (flag == 3)\r
-                    material[(int)Material.Development -2] = count;\r
+                    material[(int)Material.Development - 2] = count;\r
             }\r
             if ((_logType & LogType.Mission) != 0)\r
             {\r
@@ -162,8 +162,8 @@ namespace KancolleSniffer
             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
+            if (cell == (int)_map.api_bosscell_no || (int)_map.api_event_id == 5)\r
+                boss = _start ? "出撃&ボス" : "ボス";\r
             _writer("海戦・ドロップ報告書", string.Join(",", _nowFunc().ToString(DateTimeFormat),\r
                 result.api_quest_name,\r
                 cell, boss,\r

diff --git a/LogViewer/index.html b/LogViewer/index.html
index 887a39f..ea93b0b 100644 (file)
--- a/LogViewer/index.html
+++ b/LogViewer/index.html
@@ -256,8 +256,8 @@ function setSortieStat(data) {
         var row = data[i];
         var date = moment(row[0]);
         var map = row[1];
-        var isBoss = row[3] == "ボス";
-        var isStart = row[3] == "出撃";
+        var isBoss = row[3].indexOf("ボス") != -1;
+        var isStart = row[3].indexOf("出撃") != -1;
         var res = row[4];
         if (res == "E")
             res = "D";