基地空襲戦の結果を戦況に表示する

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index f5c6a2d..3234db9 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -565,7 +565,7 @@ namespace KancolleSniffer
                 _questCounter.InspectMapNext(data);\r
                 _miscTextInfo.InspectMapNext(data);\r
                 _cellInfo.InspectMapNext(data);\r
-                return Update.Cell;\r
+                return Update.Cell | (data.api_destruction_battle() ? Update.Battle : 0);\r
             }\r
             if (url.EndsWith("api_req_mission/start"))\r
             {\r

diff --git a/KancolleSniffer/View/BattleResultPanel.cs b/KancolleSniffer/View/BattleResultPanel.cs
index b65e218..de95683 100644 (file)
--- a/KancolleSniffer/View/BattleResultPanel.cs
+++ b/KancolleSniffer/View/BattleResultPanel.cs
@@ -19,7 +19,6 @@ using System.Linq;
 using System.Text.RegularExpressions;\r
 using System.Windows.Forms;\r
 using KancolleSniffer.Model;\r
-using KancolleSniffer.Util;\r
 using static System.Math;\r
 \r
 namespace KancolleSniffer.View\r
@@ -259,7 +258,8 @@ namespace KancolleSniffer.View
                 }\r
                 else\r
                 {\r
-                    labels.Set(ship);\r
+                    labels.Hp.Set(ship);\r
+                    labels.Name.SetName(ShortenAirBaseName(ship.Name));\r
                 }\r
                 ToolTip.SetToolTip(labels.Name, GetEquipString(ship));\r
             }\r
@@ -295,6 +295,11 @@ namespace KancolleSniffer.View
                 match => match.Value == "(elite)" ? "(e)" : "(f)");\r
         }\r
 \r
+        private static string ShortenAirBaseName(string name)\r
+        {\r
+            return Regex.Replace(name, "^基地航空隊", "航空隊");\r
+        }\r
+\r
         private void ShowResultRank(BattleResultRank rank)\r
         {\r
             var result = new[] {"完全S", "勝利S", "勝利A", "勝利B", "敗北C", "敗北D", "敗北E"};\r