海域ゲージ情報で通常海域の表示を残ゲージ数にする

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index ec508f7..0392d3c 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -936,10 +936,10 @@ namespace KancolleSniffer.Test
             PAssert.That(() =>\r
                 sniffer.MiscText ==\r
                                "[海域ゲージ]\r\n" +\r
-                               "1-6 : æ\92\83ç ´ 2/7\r\n" +\r
-                               "2-5 : æ\92\83ç ´ 0/4\r\n" +\r
-                               "3-5 : æ\92\83ç ´ 0/4\r\n" +\r
-                               "4-4 : æ\92\83ç ´ 0/4\r\n");\r
+                               "1-6 : æ®\8bã\82\8a 5/7\r\n" +\r
+                               "2-5 : æ®\8bã\82\8a 4/4\r\n" +\r
+                               "3-5 : æ®\8bã\82\8a 4/4\r\n" +\r
+                               "4-4 : æ®\8bã\82\8a 4/4\r\n");\r
         }\r
 \r
         /// <summary>\r

diff --git a/KancolleSniffer/Model/MiscTextInfo.cs b/KancolleSniffer/Model/MiscTextInfo.cs
index 0fcfbce..c3db5b9 100644 (file)
--- a/KancolleSniffer/Model/MiscTextInfo.cs
+++ b/KancolleSniffer/Model/MiscTextInfo.cs
@@ -74,13 +74,16 @@ namespace KancolleSniffer.Model
                 if (entry.api_eventmap())\r
                 {\r
                     var eventMap = entry.api_eventmap;\r
-                    Text += $"{map / 10}-{map % 10} : HP {(int)eventMap.api_now_maphp}/{(int)eventMap.api_max_maphp}\r\n";\r
+                    Text +=\r
+                        $"{map / 10}-{map % 10} : HP {(int)eventMap.api_now_maphp}/{(int)eventMap.api_max_maphp}\r\n";\r
                     continue;\r
                 }\r
                 if (!entry.api_defeat_count())\r
                     continue;\r
-                var reqStr = _gaugeCount.TryGetValue(map, out var req) ? req.ToString() : "?";\r
-                Text += $"{map / 10}-{map % 10} : 撃破 {(int)entry.api_defeat_count}/{reqStr}\r\n";\r
+                var count = _gaugeCount.TryGetValue(map, out var max)\r
+                    ? $"{max - (int)entry.api_defeat_count}/{max}"\r
+                    : "?/?";\r
+                Text += $"{map / 10}-{map % 10} : 残り {count}\r\n";\r
             }\r
         }\r
 \r