BaseAirCorpsをAirBaseにリネームする

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 78fad62..521a28d 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -109,13 +109,13 @@ namespace KancolleSniffer.Test
         /// 基地航空隊の制空値を正しく計算する\r
         /// </summary>\r
         [TestMethod]\r
-        public void FighterPowerOfBaseAirCorps()\r
+        public void FighterPowerOfAirBase()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "baseaircorps_001");\r
-            PAssert.That(() => (int)sniffer.BaseAirCorps[0].AirCorps[0].CalcFighterPower()[1].AirCombat == 301);\r
-            sniffer.BaseAirCorps[0].AirCorps[0].Action = 2; // 防空\r
-            PAssert.That(() => (int)sniffer.BaseAirCorps[0].AirCorps[0].CalcFighterPower()[1].Interception == 320);\r
+            SniffLogFile(sniffer, "airbase_001");\r
+            PAssert.That(() => (int)sniffer.AirBase[0].AirCorps[0].CalcFighterPower()[1].AirCombat == 301);\r
+            sniffer.AirBase[0].AirCorps[0].Action = 2; // 防空\r
+            PAssert.That(() => (int)sniffer.AirBase[0].AirCorps[0].CalcFighterPower()[1].Interception == 320);\r
         }\r
 \r
         /// <summary>\r
@@ -125,8 +125,8 @@ namespace KancolleSniffer.Test
         public void FighterPowerWithReconBonus()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "baseaircorps_002");\r
-            PAssert.That(() => (int)sniffer.BaseAirCorps[0].AirCorps[2].CalcFighterPower()[0].Interception == 353);\r
+            SniffLogFile(sniffer, "airbase_002");\r
+            PAssert.That(() => (int)sniffer.AirBase[0].AirCorps[2].CalcFighterPower()[0].Interception == 353);\r
         }\r
 \r
         /// <summary>\r
@@ -136,19 +136,19 @@ namespace KancolleSniffer.Test
         public void FighterPowerOfLandBasedAttackAircraft()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "baseaircorps_003");\r
-            PAssert.That(() => (int)sniffer.BaseAirCorps[1].AirCorps[0].CalcFighterPower()[0].AirCombat == 121);\r
+            SniffLogFile(sniffer, "airbase_003");\r
+            PAssert.That(() => (int)sniffer.AirBase[1].AirCorps[0].CalcFighterPower()[0].AirCombat == 121);\r
         }\r
 \r
         /// <summary>\r
         /// 基地航空隊の出撃コストを計算する\r
         /// </summary>\r
         [TestMethod]\r
-        public void CostForSortieOfBaseAirCorps()\r
+        public void CostForSortieOfAirBase()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "baseaircorps_003");\r
-            PAssert.That(() => sniffer.BaseAirCorps[1].AirCorps[0].CostForSortie.SequenceEqual(new[] {99, 47}));\r
+            SniffLogFile(sniffer, "airbase_003");\r
+            PAssert.That(() => sniffer.AirBase[1].AirCorps[0].CostForSortie.SequenceEqual(new[] {99, 47}));\r
         }\r
 \r
         /// <summary>\r
@@ -158,8 +158,8 @@ namespace KancolleSniffer.Test
         public void FighterPowerOfLandBAseFighter()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "baseaircorps_004");\r
-            PAssert.That(() => (int)sniffer.BaseAirCorps[1].AirCorps[0].CalcFighterPower()[0].AirCombat == 328);\r
+            SniffLogFile(sniffer, "airbase_004");\r
+            PAssert.That(() => (int)sniffer.AirBase[1].AirCorps[0].CalcFighterPower()[0].AirCombat == 328);\r
         }\r
 \r
         /// <summary>\r

diff --git a/KancolleSniffer/Config.cs b/KancolleSniffer/Config.cs
index 16e3e04..79ae6af 100644 (file)
--- a/KancolleSniffer/Config.cs
+++ b/KancolleSniffer/Config.cs
@@ -42,7 +42,9 @@ namespace KancolleSniffer
     public enum ShipCategory\r
     {\r
         None = 0,\r
+        // ReSharper disable UnusedMember.Global\r
         BattleShip = 1 << 0,\r
+\r
         AircraftCarrier = 1 << 1,\r
         HeavyCruiser = 1 << 2,\r
         LightCruiser = 1 << 3,\r
@@ -50,6 +52,7 @@ namespace KancolleSniffer
         Escort = 1 << 5,\r
         Submarine = 1 << 6,\r
         Assistant = 1 << 7,\r
+        // ReSharper restore UnusedMember.Global\r
         All = (1 << 8) - 1\r
     }\r
 \r

diff --git a/KancolleSniffer/KancolleSniffer.csproj b/KancolleSniffer/KancolleSniffer.csproj
index 30fedb7..0e31651 100644 (file)
--- a/KancolleSniffer/KancolleSniffer.csproj
+++ b/KancolleSniffer/KancolleSniffer.csproj
@@ -74,7 +74,7 @@
     </Compile>\r
     <Compile Include="View\AirBattleResultPanel.cs" />\r
     <Compile Include="Util\Ascii85.cs" />\r
-    <Compile Include="Model\BaseAirCoprs.cs" />\r
+    <Compile Include="Model\AirBase.cs" />\r
     <Compile Include="Model\BattleInfo.cs" />\r
     <Compile Include="View\BattleResultPanel.cs">\r
       <SubType>Component</SubType>\r

diff --git a/KancolleSniffer/Model/BaseAirCoprs.cs b/KancolleSniffer/Model/AirBase.cs
similarity index 96%
rename from KancolleSniffer/Model/BaseAirCoprs.cs
rename to KancolleSniffer/Model/AirBase.cs
index 05e441f..1c02087 100644 (file)
--- a/KancolleSniffer/Model/BaseAirCoprs.cs
+++ b/KancolleSniffer/Model/AirBase.cs
@@ -20,12 +20,12 @@ using KancolleSniffer.Util;
 \r
 namespace KancolleSniffer.Model\r
 {\r
-    public class BaseAirCorps\r
+    public class AirBase\r
     {\r
         private readonly ItemInfo _itemInfo;\r
         private List<int> _relocatingPlanes = new List<int>();\r
 \r
-        public BaseAirCorps(ItemInfo item)\r
+        public AirBase(ItemInfo item)\r
         {\r
             _itemInfo = item;\r
         }\r

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index 28dc70d..b5c8369 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -41,7 +41,7 @@ namespace KancolleSniffer
         private readonly Logger _logger;\r
         private readonly ExMapInfo _exMapInfo = new ExMapInfo();\r
         private readonly MiscTextInfo _miscTextInfo;\r
-        private readonly BaseAirCorps _baseAirCorps;\r
+        private readonly AirBase _airBase;\r
         private readonly PresetDeck _presetDeck = new PresetDeck();\r
         private readonly CellInfo _cellInfo = new CellInfo();\r
         private readonly Status _status = new Status();\r
@@ -96,7 +96,7 @@ namespace KancolleSniffer
             _battleInfo = new BattleInfo(_shipInfo, _itemInfo);\r
             _logger = new Logger(_shipInfo, _itemInfo, _battleInfo);\r
             _questInfo = new QuestInfo(_itemInfo, _battleInfo);\r
-            _baseAirCorps = new BaseAirCorps(_itemInfo);\r
+            _airBase = new AirBase(_itemInfo);\r
             _miscTextInfo = new MiscTextInfo(_shipInfo, _itemInfo);\r
             _haveState = new List<IHaveState> {_achievement, _materialInfo, _conditionTimer, _exMapInfo, _questInfo};\r
             AdditionalData = new AdditionalData();\r
@@ -200,9 +200,9 @@ namespace KancolleSniffer
             if (data.api_parallel_quest_count()) // 昔のログにはないので\r
                 _questInfo.AcceptMax = (int)data.api_parallel_quest_count;\r
             if (data.api_event_object())\r
-                _baseAirCorps.InspectEventObject(data.api_event_object);\r
+                _airBase.InspectEventObject(data.api_event_object);\r
             if (data.api_plane_info())\r
-                _baseAirCorps.InspectPlaneInfo(data.api_plane_info);\r
+                _airBase.InspectPlaneInfo(data.api_plane_info);\r
             _battleInfo.CleanupResult();\r
             _battleInfo.BattleState = BattleState.None;\r
             _miscTextInfo.Port();\r
@@ -294,7 +294,7 @@ namespace KancolleSniffer
                 _exMapInfo.InspectMapInfo(data);\r
                 _miscTextInfo.InspectMapInfo(data);\r
                 if (data.api_air_base())\r
-                    _baseAirCorps.Inspect(data.api_air_base);\r
+                    _airBase.Inspect(data.api_air_base);\r
                 return Update.Item;\r
             }\r
             if (url.EndsWith("api_req_member/get_practice_enemyinfo"))\r
@@ -309,7 +309,7 @@ namespace KancolleSniffer
             }\r
             if (url.EndsWith("api_get_member/base_air_corps"))\r
             {\r
-                _baseAirCorps.Inspect(data);\r
+                _airBase.Inspect(data);\r
                 return Update.Ship;\r
             }\r
             return Update.None;\r
@@ -511,23 +511,23 @@ namespace KancolleSniffer
             if (url.EndsWith("api_req_air_corps/supply"))\r
             {\r
                 _materialInfo.InspectAirCorpsSupply(data);\r
-                _baseAirCorps.InspectSupply(request, data);\r
+                _airBase.InspectSupply(request, data);\r
                 return Update.Item;\r
             }\r
             if (url.EndsWith("api_req_air_corps/set_plane"))\r
             {\r
                 _materialInfo.InspectAirCorpsSetPlane(data);\r
-                _baseAirCorps.InspectSetPlane(request, data);\r
+                _airBase.InspectSetPlane(request, data);\r
                 return Update.Item | Update.Ship;\r
             }\r
             if (url.EndsWith("api_req_air_corps/set_action"))\r
             {\r
-                _baseAirCorps.InspectSetAction(request);\r
+                _airBase.InspectSetAction(request);\r
                 return Update.Ship;\r
             }\r
             if (url.EndsWith("api_req_air_corps/expand_base"))\r
             {\r
-                _baseAirCorps.InspectExpandBase(request, data);\r
+                _airBase.InspectExpandBase(request, data);\r
                 return Update.Ship;\r
             }\r
             return Update.None;\r
@@ -657,7 +657,7 @@ namespace KancolleSniffer
             {\r
                 _itemInfo.ClearHolder();\r
                 _shipInfo.SetItemHolder();\r
-                _baseAirCorps.SetItemHolder();\r
+                _airBase.SetItemHolder();\r
                 return _itemInfo.ItemList;\r
             }\r
         }\r
@@ -672,7 +672,7 @@ namespace KancolleSniffer
 \r
         public string MiscText => _miscTextInfo.Text;\r
 \r
-        public BaseAirCorps.BaseInfo[] BaseAirCorps => _baseAirCorps.AllAirCorps;\r
+        public AirBase.BaseInfo[] AirBase => _airBase.AllAirCorps;\r
 \r
         public CellInfo CellInfo => _cellInfo;\r
 \r

diff --git a/KancolleSniffer/TextGenerator.cs b/KancolleSniffer/TextGenerator.cs
index a5a7c09..08841b7 100644 (file)
--- a/KancolleSniffer/TextGenerator.cs
+++ b/KancolleSniffer/TextGenerator.cs
@@ -64,7 +64,7 @@ namespace KancolleSniffer
             var sb = new StringBuilder();\r
             for (var f = 0; f < ShipInfo.FleetCount; f++)\r
                 sb.Append(GenerateFleetData(sniffer, f, dict));\r
-            sb.Append(GenerateBaseAirCorps(sniffer, dict));\r
+            sb.Append(GenerateAirBase(sniffer, dict));\r
             return sb.ToString();\r
         }\r
 \r
@@ -91,12 +91,12 @@ namespace KancolleSniffer
             return sb;\r
         }\r
 \r
-        private static StringBuilder GenerateBaseAirCorps(Sniffer sniffer, ItemName dict)\r
+        private static StringBuilder GenerateAirBase(Sniffer sniffer, ItemName dict)\r
         {\r
             var sb = new StringBuilder();\r
-            if (sniffer.BaseAirCorps == null)\r
+            if (sniffer.AirBase == null)\r
                 return sb;\r
-            foreach (var baseInfo in sniffer.BaseAirCorps)\r
+            foreach (var baseInfo in sniffer.AirBase)\r
             {\r
                 sb.Append(baseInfo.AreaName + " 基地航空隊\r\n");\r
                 var i = 0;\r

diff --git a/KancolleSniffer/View/FleetPanel.cs b/KancolleSniffer/View/FleetPanel.cs
index 054799e..19cb9fa 100644 (file)
--- a/KancolleSniffer/View/FleetPanel.cs
+++ b/KancolleSniffer/View/FleetPanel.cs
@@ -182,10 +182,10 @@ namespace KancolleSniffer.View
                 });\r
                 list.AddRange(shipRecords);\r
             }\r
-            if (sniffer.BaseAirCorps != null)\r
+            if (sniffer.AirBase != null)\r
             {\r
                 var name = new[] {"第一", "第二", "第三"};\r
-                foreach (var baseInfo in sniffer.BaseAirCorps)\r
+                foreach (var baseInfo in sniffer.AirBase)\r
                 {\r
                     list.Add(new Record {Fleet = baseInfo.AreaName + " 基地航空隊"});\r
                     var i = 0;\r