初戦が空襲戦の時にログに"出撃"が出力されないのを直す

diff --git a/KancolleSniffer.Test/LoggerTest.cs b/KancolleSniffer.Test/LoggerTest.cs
index 044497b..cfd1640 100644 (file)
--- a/KancolleSniffer.Test/LoggerTest.cs
+++ b/KancolleSniffer.Test/LoggerTest.cs
@@ -203,7 +203,7 @@ namespace KancolleSniffer.Test
             sniffer.SetLogWriter((path, s, h) => { result += s + "|"; }, () => new DateTime(2019, 1, 1));\r
             sniffer.EnableLog(LogType.Battle);\r
             SnifferTest.SniffLogFile(sniffer, "airraid_battle_001");\r
-            Assert.AreEqual("2019-01-01 00:00:00,アリューシャン列島沖,12,,S,同航戦,単縦陣,輪形陣,,,," +\r
+            Assert.AreEqual("2019-01-01 00:00:00,アリューシャン列島沖,12,出撃,S,同航戦,単縦陣,輪形陣,,,," +\r
                             "基地航空隊1(Lv0),200/200,基地航空隊2(Lv0),200/200,基地航空隊3(Lv0),200/200,,,,,,," +\r
                             "北方棲妹,790/790,砲台小鬼,130/130,砲台小鬼,130/130,飛行場姫,500/500,飛行場姫,500/500,集積地棲姫,600/600,425～426,231,航空優勢,44-3|",\r
                 result);\r
@@ -220,7 +220,7 @@ namespace KancolleSniffer.Test
             sniffer.SetLogWriter((path, s, h) => { result += s + "|"; }, () => new DateTime(2019, 1, 1));\r
             sniffer.EnableLog(LogType.Battle);\r
             SnifferTest.SniffLogFile(sniffer, "airraid_battle_003");\r
-            Assert.AreEqual("2019-01-01 00:00:00,北太平洋ハワイ諸島戦域,22,,A,Ｔ字戦(不利),単縦陣,輪形陣,,,," +\r
+            Assert.AreEqual("2019-01-01 00:00:00,北太平洋ハワイ諸島戦域,22,出撃,A,Ｔ字戦(不利),単縦陣,輪形陣,,,," +\r
                             "基地航空隊1(Lv0),200/200,基地航空隊2(Lv0),188/200,基地航空隊3(Lv0),200/200,,,,,,," +\r
                             "中枢棲姫,900/900,飛行場姫,500/500,飛行場姫,500/500,飛行場姫,500/500,砲台小鬼,130/130,集積地棲姫,600/600,471～473,212,航空優勢,44-4|",\r
                 result);\r

diff --git a/KancolleSniffer/Log/BattleLogger.cs b/KancolleSniffer/Log/BattleLogger.cs
index ca86be3..60ba9c8 100644 (file)
--- a/KancolleSniffer/Log/BattleLogger.cs
+++ b/KancolleSniffer/Log/BattleLogger.cs
@@ -96,10 +96,10 @@ namespace KancolleSniffer.Log
             var fShips = GenerateShipList(_battleInfo.Result.Friend, s => $"{s.Name}(Lv{s.Level})");\r
             var eShips = GenerateShipList(_battleInfo.Result.Enemy, s => $"{s.Name}");\r
             var boss = "";\r
+            if (_cell.Start)\r
+                boss = "出撃";\r
             if (_battleInfo.BattleState != BattleState.AirRaid)\r
             {\r
-                if (_cell.Start)\r
-                    boss = "出撃";\r
                 if (_cell.Boss)\r
                     boss = _cell.Start ? "出撃&ボス" : "ボス";\r
             }\r