ApiOthersからapi_req_air_corpsとapi_req_henseiをわける

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index c08d30a..f492fe2 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -125,6 +125,10 @@ namespace KancolleSniffer
                 return ApiKousyou(url, request, data);\r
             if (url.Contains("battle") || url.Contains("sortie"))\r
                 return ApiBattle(url, request, data);\r
+            if (url.Contains("hensei"))\r
+                return ApiHensei(url, request, data);\r
+            if (url.Contains("air_corps"))\r
+                return ApiAirCorps(url, request, data);\r
             return ApiOthers(url, request, data);\r
         }\r
 \r
@@ -400,7 +404,7 @@ namespace KancolleSniffer
                    url.EndsWith("api_req_combined_battle/each_battle_water");\r
         }\r
 \r
-        private Update ApiOthers(string url, string request, dynamic data)\r
+        private Update ApiHensei(string url, string request, dynamic data)\r
         {\r
             if (url.EndsWith("api_req_hensei/change"))\r
             {\r
@@ -429,6 +433,38 @@ namespace KancolleSniffer
                 _shipInfo.InspectCombined(request);\r
                 return Update.Ship;\r
             }\r
+            return Update.None;\r
+        }\r
+\r
+        private Update ApiAirCorps(string url, string request, dynamic data)\r
+        {\r
+            if (url.EndsWith("api_req_air_corps/supply"))\r
+            {\r
+                _materialInfo.InspectAirCorpsSupply(data);\r
+                _baseAirCoprs.InspectSupply(request, data);\r
+                return Update.Item;\r
+            }\r
+            if (url.EndsWith("api_req_air_corps/set_plane"))\r
+            {\r
+                _materialInfo.InspectAirCorpsSetPlane(data);\r
+                _baseAirCoprs.InspectSetPlane(request, data);\r
+                return Update.Item | Update.Ship;\r
+            }\r
+            if (url.EndsWith("api_req_air_corps/set_action"))\r
+            {\r
+                _baseAirCoprs.InspectSetAction(request);\r
+                return Update.Ship;\r
+            }\r
+            if (url.EndsWith("api_req_air_corps/expand_base"))\r
+            {\r
+                _baseAirCoprs.InspectExpandBase(request, data);\r
+                return Update.Ship;\r
+            }\r
+            return Update.None;\r
+        }\r
+\r
+        private Update ApiOthers(string url, string request, dynamic data)\r
+        {\r
             if (url.EndsWith("api_req_hokyu/charge"))\r
             {\r
                 _shipInfo.InspectCharge(data);\r
@@ -519,28 +555,6 @@ namespace KancolleSniffer
                 _logger.InspectClearItemGet(data);\r
                 return Update.QuestList;\r
             }\r
-            if (url.EndsWith("api_req_air_corps/supply"))\r
-            {\r
-                _materialInfo.InspectAirCorpsSupply(data);\r
-                _baseAirCoprs.InspectSupply(request, data);\r
-                return Update.Item;\r
-            }\r
-            if (url.EndsWith("api_req_air_corps/set_plane"))\r
-            {\r
-                _materialInfo.InspectAirCorpsSetPlane(data);\r
-                _baseAirCoprs.InspectSetPlane(request, data);\r
-                return Update.Item | Update.Ship;\r
-            }\r
-            if (url.EndsWith("api_req_air_corps/set_action"))\r
-            {\r
-                _baseAirCoprs.InspectSetAction(request);\r
-                return Update.Ship;\r
-            }\r
-            if (url.EndsWith("api_req_air_corps/expand_base"))\r
-            {\r
-                _baseAirCoprs.InspectExpandBase(request, data);\r
-                return Update.Ship;\r
-            }\r
             return Update.None;\r
         }\r
 \r