通常の夜戦のダメージが戦闘結果に反映されないのを直す

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / Sniffer.cs

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index 7f5d4ea..f8e5abe 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -16,7 +16,6 @@
 // along with this program; if not, see <http://www.gnu.org/licenses/>.\r
 \r
 using System;\r
-using System.IO;\r
 \r
 namespace KancolleSniffer\r
 {\r
@@ -75,12 +74,6 @@ namespace KancolleSniffer
         {\r
             var data = json.IsDefined("api_data") ? json.api_data : new object();\r
 \r
-            if (LogFile != null)\r
-            {\r
-                File.AppendAllText(LogFile,\r
-                    string.Format("url: {0}\nrequest: {1}\nresponse: {2}\n", url, request, json.ToString()));\r
-            }\r
-\r
             if (url.EndsWith("api_start2"))\r
             {\r
                 _start = true;\r
@@ -219,14 +212,19 @@ namespace KancolleSniffer
                 _battleInfo.InspectBattle(data);\r
                 if (!url.EndsWith("api_req_practice/battle"))\r
                     return Update.Battle;\r
-                _shipInfo.StartSortie(request);\r
+                _shipInfo.StartSortie(request); // 演習を出撃中とみなす\r
                 return Update.Battle | Update.Timer;\r
             }\r
-            if (url.EndsWith("api_req_sortie/battleresult") || url.EndsWith("api_req_practice/battleresult"))\r
+            if (url.EndsWith("api_req_sortie/battleresult"))\r
             {\r
                 _battleInfo.CauseDamage();\r
                 return Update.Ship;\r
             }\r
+            if (url.EndsWith("api_req_practice/battle_result"))\r
+            {\r
+                _battleInfo.CausePracticeDamage();\r
+                return Update.Ship;\r
+            }\r
             if (IsCombinedBattleAPI(url))\r
             {\r
                 _battleInfo.InspectCombinedBattle(data, url.EndsWith("battle_water"));\r
@@ -263,6 +261,7 @@ namespace KancolleSniffer
         public bool IsNormalBattleAPI(string url)\r
         {\r
             return url.EndsWith("api_req_sortie/battle") || url.EndsWith("api_req_practice/battle") ||\r
+                   url.EndsWith("api_req_battle_midnight/battle") ||\r
                    url.EndsWith("api_req_battle_midnight/sp_midnight") ||\r
                    url.EndsWith("api_req_practice/midnight_battle");\r
         }\r
@@ -331,7 +330,7 @@ namespace KancolleSniffer
             return _shipInfo.GetLineOfSights(fleet);\r
         }\r
 \r
-        public DamageStatus[] DamagedShipList\r
+        public ShipStatus[] DamagedShipList\r
         {\r
             get { return _shipInfo.GetDamagedShipList(_dockInfo); }\r
         }\r
@@ -365,8 +364,6 @@ namespace KancolleSniffer
         {\r
             get { return _battleInfo; }\r
         }\r
-\r
-        public string LogFile { get; set; }\r
     }\r
 \r
     public class NameAndTimer\r