X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=KancolleSniffer.Test%2FSnifferTest.cs;h=ec3c5ef5aa9a895f9f4632cd4d099be87ba9f963;hb=29f7c97d3b67bcd3fe7f4d6e779ebe1760828ea4;hp=5f60879eec404c460d1d8b6bf475cace526c622e;hpb=e9376f67801bc07cdd3a09b0a32ee421aa444992;p=kancollesniffer%2FKancolleSniffer.git

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 5f60879..ec3c5ef 100644
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -17,14 +17,34 @@ using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using DynaJson;
 using ExpressionToCodeLib;
+using KancolleSniffer.Model;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using static System.Math;
 
 namespace KancolleSniffer.Test
 {
+    using Sniffer = SnifferTest.TestingSniffer;
+
     [TestClass]
     public class SnifferTest
     {
+        [ClassInitialize]
+        public static void Initialize(TestContext context)
+        {
+            ExpressionToCodeConfiguration.GlobalAssertionConfiguration = ExpressionToCodeConfiguration
+                .GlobalAssertionConfiguration.WithPrintedListLengthLimit(200).WithMaximumValueLength(1000);
+        }
+
+        public class TestingSniffer : KancolleSniffer.Sniffer
+        {
+            public TestingSniffer(bool start = false) : base(start)
+            {
+                AdditionalData.UseNumEquipsFile = false;
+            }
+        }
+
         public static StreamReader OpenLogFile(string name)
         {
             var dir = Path.GetDirectoryName(Path.GetDirectoryName(Environment.CurrentDirectory));
@@ -43,15 +63,17 @@ namespace KancolleSniffer.Test
                     var triple = new List<string>();
                     foreach (var s in new[] {"url: ", "request: ", "response: "})
                     {
-                        var line = stream.ReadLine();
-                        ln++;
-                        if (line == null)
-                            throw new Exception($"ログのurl, request, responseがそろっていません: {ln:d}行目");
-                        if (!line.StartsWith(s))
-                            throw new Exception($"ログに不正な行が含まれています: {ln:d}行目");
+                        string line;
+                        do
+                        {
+                            line = stream.ReadLine();
+                            ln++;
+                            if (line == null)
+                                throw new Exception($"ログの内容がそろっていません: {ln:d}行目");
+                        } while (!line.StartsWith(s));
                         triple.Add(line.Substring(s.Length));
                     }
-                    var json = JsonParser.Parse(triple[2]);
+                    var json = JsonObject.Parse(triple[2]);
                     sniffer.Sniff(triple[0], triple[1], json);
                     action?.Invoke(sniffer);
                 }
@@ -59,598 +81,449 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
-        ///  演習で受けたダメージが次の戦闘の結果に影響しない
-        /// </summary>
-        [TestMethod]
-        public void DamageInPracticeNotSpillIntoSortie()
-        {
-            var expected = new[] {31, 15, 15};
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "battle_001");
-            var result = sniffer.GetShipStatuses(0).Select(s => s.NowHp);
-            PAssert.That(() => (expected.SequenceEqual(result)));
-        }
-
-        /// <summary>
-        /// 演習では大破警告を出さない
-        /// </summary>
-        [TestMethod]
-        public void IgnoreDamagedShipsInPractice()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "practice_001");
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());
-        }
-
-        /// <summary>
-        /// 夜戦のダメージを戦闘結果に反映する
+        /// 一つもアイテムがない場合のrequire_info
         /// </summary>
         [TestMethod]
-        public void CaptureDamageInNightCombat()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "battle_002");
-            AssertEqualBattleResult(sniffer, new[] {28, 1, 13});
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());
-        }
-
-        private void AssertEqualBattleResult(Sniffer sniffer, IEnumerable<int> expected, string msg = null)
+        public void NoUseItemRequireInfo()
         {
-            var result = sniffer.GetShipStatuses(0).Select(s => s.NowHp);
-            PAssert.That(() => (expected.SequenceEqual(result)), msg);
+            var sniffer = new Sniffer(true);
+            SniffLogFile(sniffer, "require_info_001");
+            Assert.IsTrue(true);
         }
 
         /// <summary>
-        /// 連合艦隊(水上打撃部隊)による戦闘のダメージを結果に反映する
+        /// 一つもアイテムがない場合のuseitem
         /// </summary>
         [TestMethod]
-        public void CombinedFleetSurface()
+        public void NoUseItem()
         {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "combined_surface_001");
-            AssertEauqlCombinedResult(sniffer, new[] {40, 77, 77, 33, 51, 47}, new[] {39, 35, 11, 39, 37, 40});
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());
-
-            SniffLogFile(sniffer, "combined_surface_002");
-            AssertEauqlCombinedResult(sniffer, new[] {40, 77, 77, 33, 15, 6}, new[] {39, 35, 4, 3, 14, 40});
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());
-        }
-
-        private void AssertEauqlCombinedResult(Sniffer sniffer, IEnumerable<int> expected0, IEnumerable<int> expected1,
-            string msg = null)
-        {
-            var result0 = sniffer.GetShipStatuses(0).Select(s => s.NowHp);
-            var result1 = sniffer.GetShipStatuses(1).Select(s => s.NowHp);
-            PAssert.That(() => (expected0.SequenceEqual(result0) && expected1.SequenceEqual(result1)), msg);
+            var sniffer = new Sniffer(true);
+            SniffLogFile(sniffer, "useitem_001");
+            Assert.IsTrue(true);
         }
 
         /// <summary>
-        /// 開幕夜戦のダメージを戦闘結果に反映する
+        /// 熟練度込みの制空値を正しく計算する
         /// </summary>
         [TestMethod]
-        public void SpMidnight()
+        public void FighterPowerWithBonus()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "sp_midnight_001");
-            AssertEqualBattleResult(sniffer, new[] {1});
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());
+            SniffLogFile(sniffer, "fighterpower_001");
+            var fleet = sniffer.Fleets[0];
+            PAssert.That(() => fleet.FighterPower == new Range(156, 159));
+            SniffLogFile(sniffer, "fighterpower_002");
+            PAssert.That(() => fleet.FighterPower == new Range(140, 143), "全滅したスロットがある");
         }
 
         /// <summary>
-        /// 連合艦隊(空母機動部隊)による戦闘のダメージを結果に反映する
+        /// 改修効果込みの制空値を正しく計算する
         /// </summary>
         [TestMethod]
-        public void CombinedFleetAir()
+        public void FighterPowerWithImprovement()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "combined_air_001");
-            AssertEauqlCombinedResult(sniffer, new[] {40, 98, 90, 66, 78, 86}, new[] {47, 41, 5, 42, 43, 29});
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());
-
-            SniffLogFile(sniffer, "combined_air_002");
-            AssertEauqlCombinedResult(sniffer, new[] {13, 87, 90, 59, 69, 86}, new[] {47, 41, 5, 20, 43, 29});
+            SniffLogFile(sniffer, "fighterpower_003");
+            PAssert.That(() => sniffer.Fleets[0].FighterPower == new Range(135, 135));
         }
 
         /// <summary>
-        /// 護衛退避を正しく処理する
+        /// 基地航空隊の制空値を正しく計算する
         /// </summary>
         [TestMethod]
-        public void EscapeShip()
+        public void FighterPowerOfAirBase()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "combined_escape_001");
-            AssertEauqlCombinedResult(sniffer, new[] {37, 105, 106, 90, 66, 10}, new[] {41, 41, 37, 44, 43, 43},
-                "連合艦隊で2戦して大破が出るまで");
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());
-            SniffLogFile(sniffer, "combined_escape_002");
-            PAssert.That(() => sniffer.GetShipStatuses(0)[5].Escaped && sniffer.GetShipStatuses(1)[1].Escaped,
-                "続けて護衛退避を実行");
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());
-            SniffLogFile(sniffer, "combined_escape_003");
-            AssertEauqlCombinedResult(sniffer, new[] {37, 105, 106, 90, 1, 10}, new[] {41, 41, 32, 44, 43, 43},
-                "もう一戦して大破が出るまで");
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());
-            SniffLogFile(sniffer, "combined_escape_004");
-            PAssert.That(() => sniffer.GetShipStatuses(0)[5].Escaped && sniffer.GetShipStatuses(1)[1].Escaped &&
-                               sniffer.GetShipStatuses(0)[4].Escaped && sniffer.GetShipStatuses(1)[2].Escaped,
-                "続けて護衛退避を実行");
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());
+            SniffLogFile(sniffer, "airbase_001");
+            PAssert.That(() => sniffer.AirBase[0].AirCorps[0].CalcFighterPower().AirCombat.Max == 301);
+            sniffer.AirBase[0].AirCorps[0].Action = 2; // 防空
+            PAssert.That(() => sniffer.AirBase[0].AirCorps[0].CalcFighterPower().Interception.Max == 320);
         }
 
         /// <summary>
-        /// 護衛退避した空母を除いた制空値を計算する
+        /// 基地航空隊の防空時の偵察機補正を含む制空値を計算する
         /// </summary>
         [TestMethod]
-        public void FighterPowerWithoutEscapedShip()
+        public void FighterPowerWithReconBonus()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "combined_escape_001");
-            PAssert.That(() => sniffer.GetFighterPower(0)[0] == 187);
-            SniffLogFile(sniffer, "combined_escape_002");
-            PAssert.That(() => sniffer.GetFighterPower(0)[0] == 65);
+            SniffLogFile(sniffer, "airbase_002");
+            PAssert.That(() => sniffer.AirBase[0].AirCorps[2].CalcFighterPower().Interception.Min == 353);
         }
 
         /// <summary>
-        /// 護衛退避した艦娘を除いて勝利判定を計算する
+        /// 陸上攻撃機の熟練度を制空値に反映させる
         /// </summary>
         [TestMethod]
-        public void BattleResultRankWithEscapedShip()
+        public void FighterPowerOfLandBasedAttackAircraft()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "combined_escape_005");
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.D);
+            SniffLogFile(sniffer, "airbase_003");
+            PAssert.That(() => sniffer.AirBase[1].AirCorps[0].CalcFighterPower().AirCombat.Min == 121);
         }
 
-
         /// <summary>
-        /// 夜戦の開始時に昼戦の結果を反映する
+        /// 基地航空隊の出撃コストを計算する
         /// </summary>
         [TestMethod]
-        public void ResultOfDayBattleShowInNightBattle()
+        public void CostForSortieOfAirBase()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "battle_003");
-            AssertEqualBattleResult(sniffer, new[] {28, 2, 13});
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any(), "夜戦の開始時は大破警告を出さない");
+            SniffLogFile(sniffer, "airbase_003");
+            PAssert.That(() => sniffer.AirBase[1].AirCorps[0].CostForSortie.SequenceEqual(new[] {99, 47}));
         }
 
         /// <summary>
-        /// 通常艦隊の航空戦のダメージを結果に反映する
+        /// 陸上戦闘機の改修レベルを制空値に反映させる。
         /// </summary>
         [TestMethod]
-        public void AirBattle()
+        public void FighterPowerOfLandBAseFighter()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "airbattle_001");
-            AssertEqualBattleResult(sniffer, new[] {37, 36, 31, 37, 17, 63}, "夜戦あり");
-
-            sniffer = new Sniffer();
-            SniffLogFile(sniffer, "airbattle_002");
-            AssertEqualBattleResult(sniffer, new[] {66, 36, 16, 27, 35, 38}, "昼戦のみ");
+            SniffLogFile(sniffer, "airbase_004");
+            PAssert.That(() => sniffer.AirBase[1].AirCorps[0].CalcFighterPower().AirCombat.Min == 328);
         }
 
         /// <summary>
-        /// 支援射撃による敵の損傷を勝利判定に反映させる
+        /// 陸上偵察機の効果を反映した制空値を計算する
         /// </summary>
         [TestMethod]
-        public void SupportShellingChangeResultRank()
+        public void FighterPowerWithLandBaseReconBonus()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "support_001");
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.A);
-        }
+            SniffLogFile(sniffer, "airbase_005");
 
-        /// <summary>
-        /// ダメコンの使用を戦闘結果に反映させる
-        /// </summary>
-        [TestMethod]
-        public void DamageControl()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "damecon_001");
-            AssertEqualBattleResult(sniffer, new[] {30, 1, 3}, "戦闘前");
-            PAssert.That(() => sniffer.GetShipStatuses(0)[1].Slot.Select(item => item.Id).
-                SequenceEqual(new[] {2, 4593, -1, -1, -1}), "ダメコンを二つ装備");
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P, "判定は完全勝利");
-            SniffLogFile(sniffer, "damecon_002");
-            AssertEqualBattleResult(sniffer, new[] {30, 1, 3}, "戦闘後");
-            PAssert.That(() => sniffer.GetShipStatuses(0)[1].Slot.Select(item => item.Id).
-                SequenceEqual(new[] {-1, 4593, -1, -1, -1}), "ダメコンを一つ消費");
-        }
+            // 二式陸上偵察機(熟練)
+            var fp1 = sniffer.AirBase[0].AirCorps[0].CalcFighterPower();
+            PAssert.That(() => fp1.AirCombat.Min == 274);
+            PAssert.That(() => fp1.Interception.Min == 302);
 
-        /// <summary>
-        /// 補強装備スロットのダメコンの使用を反映する
-        /// </summary>
-        [TestMethod]
-        public void DamgeControlInSlotEx()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "damecon_003");
-            PAssert.That(() => sniffer.GetShipStatuses(0)[5].SlotEx.Id == 10306, "戦闘前");
-            SniffLogFile(sniffer, "damecon_004");
-            PAssert.That(() => sniffer.GetShipStatuses(0)[5].SlotEx.Id == -1, "戦闘後");
+            // 二式陸上偵察機
+            var fp3 = sniffer.AirBase[0].AirCorps[2].CalcFighterPower();
+            PAssert.That(() => fp3.AirCombat.Min == 206);
+            PAssert.That(() => fp3.Interception.Min == 310);
         }
 
         /// <summary>
-        /// 旗艦大破で女神を使った進撃を反映する
+        /// マップ索敵の判定式(33)を正しく計算する
         /// </summary>
         [TestMethod]
-        public void DamageControlForFlagShip()
+        public void LineOfSight()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "damecon_005");
-            var fs = sniffer.GetShipStatuses(0)[0];
-            PAssert.That(() => fs.SlotEx.Id == -1);
-            PAssert.That(() => fs.NowHp == fs.MaxHp);
-            PAssert.That(() => sniffer.BadlyDamagedShips.Length == 0);
+            SniffLogFile(sniffer, "lineofsight_001");
+            var fleet = sniffer.Fleets[0];
+            PAssert.That(() => Abs(fleet.GetLineOfSights(1) - 39.45) < 0.01);
+            PAssert.That(() => Abs(fleet.GetLineOfSights(3) - 115.19) < 0.01);
+            PAssert.That(() => Abs(fleet.GetLineOfSights(4) - 153.06) < 0.01);
+            SniffLogFile(sniffer, "lineofsight_002");
+            PAssert.That(() => Abs(fleet.GetLineOfSights(1) - -25.10) < 0.01, "艦隊に空きがある");
         }
 
         /// <summary>
-        /// 戦闘開始時に大破艦がいても夜戦突入時に警告を出さない
+        /// 補強増設スロットに見張り員を装備した場合の判定式(33)
         /// </summary>
         [TestMethod]
-        public void NotWarnDamagedShipOnRunIntoNightBattle()
+        public void LineOfSightWithExSlot()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "damecon_006");
-            PAssert.That(() => sniffer.BadlyDamagedShips.Length == 0);
+            SniffLogFile(sniffer, "lineofsight_003");
+            var fleet = sniffer.Fleets[0];
+            PAssert.That(() => Abs(fleet.GetLineOfSights(1) - -28.8) < 0.01);
         }
 
         /// <summary>
-        /// 連合艦隊(水上打撃部隊)で二回目の砲撃戦がない場合を正しく処理する
+        /// 触接開始率を正しく計算する
         /// </summary>
         [TestMethod]
-        // ReSharper disable once InconsistentNaming
-        public void CombinedFleetSurfaceWithout2ndShelling()
+        public void ContactTriggerRage()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "combined_surface_003");
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P);
+            SniffLogFile(sniffer, "contact_001");
+            PAssert.That(() => Abs(sniffer.Fleets[0].ContactTriggerRate - 1.8182) < 0.0001);
         }
 
         /// <summary>
-        /// 連合艦隊(水上打撃部隊)で開幕雷撃で戦闘が終わる場合を正しく処理する
+        /// TPを計算する
         /// </summary>
         [TestMethod]
-        // ReSharper disable once InconsistentNaming
-        public void CombinedFleetSurfaceWithoutAnyShelling()
+        public void TransportPoint()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "combined_surface_004");
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P);
+            var msgs = new[] {"", "鬼怒改二+特大発+おにぎり", "駆逐艦+士魂部隊", "補給艦"};
+            var results = new[] {47, 19, 13, 15};
+            for (var i = 0; i < msgs.Length; i++)
+            {
+                SniffLogFile(sniffer, "transportpoint_00" + (i + 1));
+                var j = i;
+                PAssert.That(() => (int)sniffer.Fleets[0].TransportPoint == results[j], msgs[j]);
+            }
         }
 
         /// <summary>
-        /// ship2に代わるship_deckを処理する
+        /// 対空砲火のパラメータを計算する
         /// </summary>
         [TestMethod]
-        public void ShipDeck()
+        public void AntiAirFire()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "ship_deck_001");
-            PAssert.That(() => sniffer.GetShipStatuses(0)[0].Fuel == 36);
+            SniffLogFile(sniffer, "antiairfire_001");
+            var ships = sniffer.Fleets[0].Ships;
+            PAssert.That(() => ships.Sum(ship => ship.EffectiveAntiAirForFleet) == 88);
+            PAssert.That(
+                () =>
+                    ships.Select(ship => ship.EffectiveAntiAirForShip)
+                        .SequenceEqual(new[] {92, 90, 88, 228, 146, 226}));
         }
 
         /// <summary>
-        /// 夜戦かどうかを選択する画面でリロードしても結果を次の戦闘に持ち越さない
+        /// 空母の夜戦火力を計算する
         /// </summary>
         [TestMethod]
-        public void ReloadBeforeBattleResult()
+        public void CvNightBattlePower()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "reload_001");
-            PAssert.That(() => sniffer.GetShipStatuses(0)[0].NowHp == 41);
+            SniffLogFile(sniffer, "nightbattlepower_001");
+            var ships = sniffer.Fleets[0].ActualShips;
+            PAssert.That(() =>
+                ships.Select(ship => (int)(ship.NightBattlePower * 100))
+                    .SequenceEqual(new[] {11202, 14985, 20092, 17354}));
+            // 夜間作戦航空要員を外す
+            ships[0].FreeSlot(3);
+            ships[1].FreeSlot(2);
+            ships[3].FreeSlot(2);
+            PAssert.That(() =>
+                ships.Select(ship => (int)(ship.NightBattlePower * 100))
+                    .SequenceEqual(new[] {6900, 7500, 20092, 0}));
+            // Ark RoyalからSwordfishを外す
+            ships[0].FreeSlot(0);
+            PAssert.That(() => (int)ships[0].NightBattlePower == 0);
         }
 
         /// <summary>
-        /// 航空戦のない演習を正しく処理する
+        /// 副砲の改修レベルの効果を計算する
         /// </summary>
         [TestMethod]
-        public void PracticeWithoutAirBattle()
+        public void SecondaryGunFirepowerLevelBonus()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "practice_002");
-            PAssert.That(() => sniffer.Battle.AirControlLevel == -1);
+            SniffLogFile(sniffer, "firepower_001");
+            var ships = sniffer.Fleets[0].Ships;
+            // ReSharper disable CompareOfFloatsByEqualityOperator
+            PAssert.That(() => ships[0].EffectiveFirepower == 93.5);
+            PAssert.That(() => ships[1].EffectiveFirepower == 82.5);
+            // ReSharper restore CompareOfFloatsByEqualityOperator
         }
 
         /// <summary>
-        /// 出撃時に大破している艦娘がいたら警告する
+        /// 連合艦隊補正の載った火力を計算する
         /// </summary>
         [TestMethod]
-        public void DamagedShipWarningOnMapStart()
+        public void CombinedFleetFirepower()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "mapstart_001");
-            PAssert.That(() => sniffer.BadlyDamagedShips.SequenceEqual(new[] {"大潮"}));
+            SniffLogFile(sniffer, "combined_status_001");
+            // ReSharper disable CompareOfFloatsByEqualityOperator
+            PAssert.That(() => sniffer.Fleets[0].Ships[0].EffectiveFirepower == 117.0);
+            PAssert.That(() => sniffer.Fleets[1].Ships[0].EffectiveFirepower == 72.0);
+            // ReSharper restore CompareOfFloatsByEqualityOperator
         }
 
         /// <summary>
-        /// 連合艦隊に大破艦がいる状態で第3艦隊が出撃したときに警告しない
+        /// 対潜攻撃力を計算する
         /// </summary>
         [TestMethod]
-        public void NotWarnDamagedShipInCombinedFleetOnMapStart()
+        public void AntiSubmarine()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "mapstart_002");
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());
+            SniffLogFile(sniffer, "antisubmarine_001");
+            PAssert.That(() => Abs(sniffer.Fleets[0].Ships[0].EffectiveAntiSubmarine - 92.16) < 0.01);
+            PAssert.That(() => Abs(sniffer.Fleets[0].Ships[1].EffectiveAntiSubmarine - 84.49) < 0.01);
+            PAssert.That(() => Abs(sniffer.Fleets[0].Ships[2].EffectiveAntiSubmarine - 57.84) < 0.01);
+            PAssert.That(() => Abs(sniffer.Fleets[0].Ships[3].EffectiveAntiSubmarine - 61.37) < 0.01);
         }
 
         /// <summary>
-        /// 先制対潜攻撃を正しく処理する
+        /// 夜戦発動率を計算する
         /// </summary>
         [TestMethod]
-        public void OpeningTaisen()
+        public void NightContactTriggerRate()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "opening_taisen_001");
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P);
+            SniffLogFile(sniffer, "nightrecon_001");
+            PAssert.That(() => Abs(sniffer.Fleets[0].NightContactTriggerRate - 84.64) < 0.01);
+            var ship = sniffer.Fleets[0].Ships[0];
+            var empty = Enumerable.Repeat(new ItemStatus(), 5).ToArray();
+            var orig = ship.Slot;
+            ship.Slot = empty;
+            PAssert.That(() => Abs(sniffer.Fleets[0].NightContactTriggerRate - 52) < 0.01);
+            ship.Slot = orig;
+            sniffer.Fleets[0].Ships[1].Slot = empty;
+            PAssert.That(() => Abs(sniffer.Fleets[0].NightContactTriggerRate - 68) < 0.01);
         }
 
         /// <summary>
-        /// 敵の空スロットの値が-1ではなく0のときにエラーにならない
+        /// 航空偵察スコアを計算する
         /// </summary>
         [TestMethod]
-        public void ZeroValueEmptySlot()
+        public void AirReconScore()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "battle_006");
-            PAssert.That(() => sniffer.Battle.EnemyFighterPower == "0");
+            SniffLogFile(sniffer, "airrecon_score_001");
+            PAssert.That(() => Abs(sniffer.Fleets[0].AirReconScore - 26.88) < 0.01);
         }
 
         /// <summary>
-        /// 熟練度込みの制空値を正しく計算する
-        /// </summary>
-        [TestMethod]
-        public void FighterPowerWithBonus()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "fighterpower_001");
-            PAssert.That(() => sniffer.GetFighterPower(0).SequenceEqual(new[] {156, 159}));
-            SniffLogFile(sniffer, "fighterpower_002");
-            PAssert.That(() => sniffer.GetFighterPower(0).SequenceEqual(new[] {140, 143}), "全滅したスロットがある");
-        }
-
-        /// <summary>
-        /// 改修効果込みの制空値を正しく計算する
+        /// 編成で空き番号を使ったローテートを正しく反映する
         /// </summary>
         [TestMethod]
-        public void FighterPowerWithImprovement()
+        public void RotateFleetMember()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "fighterpower_003");
-            PAssert.That(() => sniffer.GetFighterPower(0).SequenceEqual(new [] {135, 135}));
+            SniffLogFile(sniffer, "deck_001");
+            var result = sniffer.Fleets[0].Deck;
+            PAssert.That(() => new[] {756, 17204, 6156, 28806, 1069, -1}.SequenceEqual(result));
         }
 
         /// <summary>
-        /// 基地航空隊の制空値を正しく計算する
+        /// ドラッグ＆ドロップで離れた空き番号を使って編成をローテートする
         /// </summary>
         [TestMethod]
-        public void FighterPowerOfBaseAirCorps()
+        public void RotateFleetMemberWithDragAndDrop()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "baseaircorps_001");
-            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[0].FighterPower[1] == 301);
-            sniffer.BaseAirCorps[0].AirCorps[0].Action = 2; // 防空
-            PAssert.That(()=>sniffer.BaseAirCorps[0].AirCorps[0].FighterPower[1] == 320);
+            SniffLogFile(sniffer, "deck_005");
+            var result = sniffer.Fleets[0].Deck;
+            PAssert.That(() => new[] {57391, 50, 24475, 113, -1, -1}.SequenceEqual(result));
         }
 
         /// <summary>
-        /// 基地航空隊の防空時の偵察機補正を含む制空値を計算する
+        /// 編成で艦隊に配置ずみの艦娘を交換する
         /// </summary>
         [TestMethod]
-        public void FighterPowerWithReconBonus()
+        public void ExchangeFleetMember()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "baseaircorps_002");
-            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[2].FighterPower[0] == 349);
-        }
 
-        /// <summary>
-        /// マップ索敵の判定式(33)を正しく計算する
-        /// </summary>
-        [TestMethod]
-        public void LineOfSight()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "lineofsight_001");
-            PAssert.That(() => Math.Abs(sniffer.GetFleetLineOfSights(0) - 39.45) < 0.01);
-            SniffLogFile(sniffer, "lineofsight_002");
-            PAssert.That(() => Math.Abs(sniffer.GetFleetLineOfSights(0) - -25.10) < 0.01, "艦隊に空きがある");
-        }
+            SniffLogFile(sniffer, "deck_002");
+            var result0 = sniffer.Fleets[0].Deck;
+            PAssert.That(() => new[] {1069, 6156, 756, 3223, -1, -1}.SequenceEqual(result0), "編成で艦隊内で艦娘と交換する");
 
-        /// <summary>
-        /// 触接開始率を正しく計算する
-        /// </summary>
-        [TestMethod]
-        public void ContactTriggerRage()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "contact_001");
-            PAssert.That(() => Math.Abs(sniffer.GetContactTriggerRate(0) - 1.8182) < 0.0001);
-        }
+            SniffLogFile(sniffer, "deck_003");
+            var result10 = sniffer.Fleets[0].Deck;
+            var result11 = sniffer.Fleets[1].Deck;
+            PAssert.That(() => new[] {1069, 6156, 14258, 3223, -1, -1}.SequenceEqual(result10) &&
+                               new[] {101, 4487, 756, 14613, 28806, -1}.SequenceEqual(result11), "002に続いて艦隊をまたがって交換する");
 
-        /// <summary>
-        /// 空襲戦を正しく処理する
-        /// </summary>
-        [TestMethod]
-        public void LdAirBattle()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "ld_airbattle_001");
-            AssertEqualBattleResult(sniffer, new[] {31, 59, 62, 14, 36, 47});
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.A);
+            SniffLogFile(sniffer, "deck_004");
+            var result20 = sniffer.Fleets[0].Deck;
+            var result21 = sniffer.Fleets[1].Deck;
+            PAssert.That(() => new[] {1069, 6156, 14258, 3223, 756, -1}.SequenceEqual(result20) &&
+                               new[] {101, 4487, 14613, 28806, -1, -1}.SequenceEqual(result21),
+                "003に続いて空き番号にほかの艦隊の艦娘を配置する");
         }
 
         /// <summary>
-        /// 連合艦隊の空襲戦を正しく処理する
+        /// 随伴艦一括解除を実行する
         /// </summary>
         [TestMethod]
-        public void CombinedLdAirBattle()
+        public void WithdrawAccompanyingShipsAtOnce()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "ld_airbattle_002");
-            AssertEauqlCombinedResult(sniffer, new[] {31, 77, 77, 37, 41, 39}, new[] {45, 59, 64, 35, 36, 10});
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.A);
+            SniffLogFile(sniffer, "deck_006");
+            var result = sniffer.Fleets[0].Deck;
+            PAssert.That(() => new[] {135, -1, -1, -1, -1, -1}.SequenceEqual(result));
         }
 
         /// <summary>
-        /// TPを正しく計算する
+        /// 編成展開を正しく反映する
         /// </summary>
         [TestMethod]
-        public void TransportPoint()
+        public void PresetSelect()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "transportpoint_001");
-            ItemSpec.IncreaceLandPowerTp = false;
-            PAssert.That(() => (int)sniffer.GetShipStatuses(0).Sum(s => s.TransportPoint) == 27);
-            ItemSpec.IncreaceLandPowerTp = true;
-            PAssert.That(() => (int)sniffer.GetShipStatuses(0).Sum(s => s.TransportPoint) == 37, "陸上戦力揚陸時");
-        }
-
-        /// <summary>
-        /// 敵の連合艦隊に対応する
-        /// </summary>
-        [TestMethod]
-        public void EnemyCombinedBattle()
-        {
-            var sniffer1 = new Sniffer();
-            SniffLogFile(sniffer1, "ec_battle_001");
-            PAssert.That(() => sniffer1.Battle.ResultRank == BattleResultRank.S, "昼戦のみ");
-
-            var sniffer2 = new Sniffer();
-            SniffLogFile(sniffer2, "ec_battle_002");
-            PAssert.That(() => sniffer2.Battle.ResultRank == BattleResultRank.S, "夜戦込み");
-
-            var sniffer3 = new Sniffer();
-            SniffLogFile(sniffer3, "ec_battle_003");
-            PAssert.That(() => sniffer3.Battle.ResultRank == BattleResultRank.A, "護衛を撃ちもらす");
-        }
-
-        /// <summary>
-        /// 2-5をクリアしたときの特別戦果を反映する
-        /// </summary>
-        [TestMethod]
-        public void ExMapBattleResult()
-        {
-            var sniffer0 = new Sniffer();
-            sniffer0.ExMap.ClearClearStatus();
-            SniffLogFile(sniffer0, "eo_001");
-            PAssert.That(() => sniffer0.ExMap.Achievement == 100, "ほかのマップの情報なし");
-            var sniffer1 = new Sniffer();
-            SniffLogFile(sniffer1, "eo_001");
-            // すでに3-5をクリアしているので合計で250
-            PAssert.That(() => sniffer1.ExMap.Achievement == 250, "ほかのマップの情報あり");
-        }
-
-        /// <summary>
-        /// 1-6をクリアしたときの特別戦果を反映する
-        /// </summary>
-        [TestMethod]
-        public void ExMapMapNext()
-        {
-            var sniffer0 = new Sniffer();
-            sniffer0.ExMap.ClearClearStatus();
-            SniffLogFile(sniffer0, "eo_002");
-            PAssert.That(() => sniffer0.ExMap.Achievement == 75, "ほかのマップの情報なし");
-            var sniffer1 = new Sniffer();
-            SniffLogFile(sniffer1, "eo_002");
-            // 5-5以外クリアしているので合計で400
-            PAssert.That(() => sniffer1.ExMap.Achievement == 400, "ほかのマップの情報あり");
+            SniffLogFile(sniffer, "preset_001");
+            var result = sniffer.Fleets[0].Deck;
+            PAssert.That(() => new[] {50510, 632, 39843, 113, 478, 47422}.SequenceEqual(result));
         }
 
         /// <summary>
-        /// 編成で空き番号を使ったローテートを正しく反映する
+        /// 拡張した編成記録枠にすぐに記録してもエラーにならない
         /// </summary>
         [TestMethod]
-        public void RotateFleetMember()
+        public void PresetExpand()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "deck_001");
-            var result = sniffer.GetDeck(0);
-            PAssert.That(() => new[] {756, 17204, 6156, 28806, 1069, -1}.SequenceEqual(result));
+            SniffLogFile(sniffer, "preset_002");
         }
 
         /// <summary>
-        /// ドラッグ＆ドロップで離れた空き番号を使って編成をローテートする
+        /// 装備交換のAPIの仕様変更に対応する
         /// </summary>
         [TestMethod]
-        public void RotateFleetMemberWithDragAndDrop()
+        public void SlotExchangeVersion2()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "deck_005");
-            var result = sniffer.GetDeck(0);
-            PAssert.That(() => new[] {57391, 50, 24475, 113, -1, -1}.SequenceEqual(result));
+            SniffLogFile(sniffer, "slot_exchange_002");
+            var result = sniffer.Fleets[0].Ships[0].Slot.Select(item => item.Id);
+            PAssert.That(() => new[] {157798, 59001, 157804, -1, -1}.SequenceEqual(result));
         }
 
         /// <summary>
-        /// 編成で艦隊に配置ずみの艦娘を交換する
+        /// 近代化改修の結果をすぐに反映する
         /// </summary>
         [TestMethod]
-        public void ExchangeFleetMember()
+        public void PowerUpResult()
         {
             var sniffer = new Sniffer();
-
-            SniffLogFile(sniffer, "deck_002");
-            var result0 = sniffer.GetDeck(0);
-            PAssert.That(() => new[] {1069, 6156, 756, 3223, -1, -1}.SequenceEqual(result0), "編成で艦隊内で艦娘と交換する");
-
-            SniffLogFile(sniffer, "deck_003");
-            var result10 = sniffer.GetDeck(0);
-            var result11 = sniffer.GetDeck(1);
-            PAssert.That(() => new[] {1069, 6156, 14258, 3223, -1, -1}.SequenceEqual(result10) &&
-                               new[] {101, 4487, 756, 14613, 28806, -1}.SequenceEqual(result11), "002に続いて艦隊をまたがって交換する");
-
-            SniffLogFile(sniffer, "deck_004");
-            var result20 = sniffer.GetDeck(0);
-            var result21 = sniffer.GetDeck(1);
-            PAssert.That(() => new[] {1069, 6156, 14258, 3223, 756, -1}.SequenceEqual(result20) &&
-                               new[] {101, 4487, 14613, 28806, -1, -1}.SequenceEqual(result21),
-                "003に続いて空き番号にほかの艦隊の艦娘を配置する");
+            SniffLogFile(sniffer, "powerup_001");
+            PAssert.That(() => Abs(sniffer.Fleets[0].Ships[0].EffectiveFirepower - 30) < 0.0001);
         }
 
         /// <summary>
-        /// 編成展開を正しく反映する
+        /// 近代化改修による艦娘数と装備数の変化
         /// </summary>
         [TestMethod]
-        public void PresetSelect()
+        public void PowerUpCount()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "preset_001");
-            var result = sniffer.GetDeck(0);
-            PAssert.That(() => new[] {50510, 632, 39843, 113, 478, 47422}.SequenceEqual(result));
+            SniffLogFile(sniffer, "powerup_001");
+            PAssert.That(() => sniffer.ShipCounter.Now == 204);
+            PAssert.That(() => sniffer.ItemCounter.Now == 932);
         }
 
         /// <summary>
-        /// 拡張した編成記録枠にすぐに記録してもエラーにならない
+        /// 近代化改修が二重に行われた場合に対応する
         /// </summary>
         [TestMethod]
-        public void PresetExpand()
+        public void DuplicatedPowerUp()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "preset_002");
+            SniffLogFile(sniffer, "powerup_002");
+            PAssert.That(() => sniffer.ShipCounter.Now == 218);
         }
 
         /// <summary>
-        /// 装備の交換を正しく反映する
+        /// 装備解除後の近代化改修
         /// </summary>
         [TestMethod]
-        public void SlotExchange()
+        public void PowerUpDetachItem()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "slot_exchange_001");
-            var result = sniffer.GetShipStatuses(0)[0].Slot.Select(item => item.Id);
-            PAssert.That(() => new[] {26096, 30571, 77694, 61383, -1}.SequenceEqual(result));
+            SniffLogFile(sniffer, "powerup_003");
+            PAssert.That(() => sniffer.ShipCounter.Now == 317);
+            PAssert.That(() => sniffer.ItemCounter.Now == 1390);
         }
 
         /// <summary>
-        /// 近代化改修の結果をすぐに反映する
+        /// ship2を待たずにケッコンの結果を反映する
         /// </summary>
         [TestMethod]
-        public void PowerupResult()
+        public void MarriageResult()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "powerup_001");
-            PAssert.That(() => Math.Abs(sniffer.GetShipStatuses(0)[0].RealFirepower - 30) < 0.0001);
+            SniffLogFile(sniffer, "marriage_001");
+            PAssert.That(() => sniffer.Fleets[0].Ships[2].Level == 100);
         }
 
         /// <summary>
@@ -671,23 +544,16 @@ namespace KancolleSniffer.Test
         [TestMethod]
         public void CountItem()
         {
-            var sniffer1 = new Sniffer();
-            SniffLogFile(sniffer1, "createitem_001");
-            PAssert.That(() => sniffer1.Item.NowEquips == 900);
-            var sniffer2 = new Sniffer();
-            SniffLogFile(sniffer2, "createship_001");
-            PAssert.That(() => sniffer2.Item.NowEquips == 904);
-        }
-
-        /// <summary>
-        /// 解体された艦の装備数を全体の装備数から引く
-        /// </summary>
-        [TestMethod]
-        public void CountItemsOnDeletedShip()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "destroyship_001");
-            PAssert.That(() => sniffer.Item.NowEquips == 879, "ドロップしたばかりの艦娘を解体する場合");
+            var createItems = new Sniffer();
+            SniffLogFile(createItems, "createitem_001");
+            Assert.AreEqual(900, createItems.ItemCounter.Now);
+            PAssert.That(() => createItems.ItemCounter.Now == 900);
+            var createShips = new Sniffer();
+            SniffLogFile(createShips, "createship_001");
+            Assert.AreEqual(904, createShips.ItemCounter.Now);
+            var multiItems = new Sniffer();
+            SniffLogFile(multiItems, "createitem_002");
+            Assert.AreEqual(1307, multiItems.ItemCounter.Now);
         }
 
         /// <summary>
@@ -696,23 +562,28 @@ namespace KancolleSniffer.Test
         [TestMethod]
         public void WarnItemCount()
         {
+            Action<int> func = i => { };
             var sniffer1 = new Sniffer();
             SniffLogFile(sniffer1, "item_count_001");
-            PAssert.That(() => sniffer1.Item.RingEquips, "出撃から母港に戻ったとき");
+            func.Invoke(sniffer1.ItemCounter.Now); // Nowを読まないとAlarmが立たない
+            PAssert.That(() => sniffer1.ItemCounter.Alarm, "出撃から母港に戻ったとき");
             var sniffer2 = new Sniffer();
             SniffLogFile(sniffer2, "item_count_002");
-            PAssert.That(() => sniffer2.Item.RingEquips, "ログインしたとき");
+            func.Invoke(sniffer2.ItemCounter.Now);
+            PAssert.That(() => sniffer2.ItemCounter.Alarm, "ログインしたとき");
         }
 
         /// <summary>
-        /// ドロップ艦のいる出撃から戻ったときに、slot_itemを受信する前にItemListを取得しても例外を出さない
+        /// 装備の所持者を設定する
         /// </summary>
         [TestMethod]
-        public void GetItemListBeforeReceivingSlotItem()
+        public void SetItemHolder()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "dropship_001");
-            PAssert.That(() => sniffer.ItemList[0].Holder.Id == 250);
+            SniffLogFile(sniffer, "itemholder_001");
+            var itemIds = new HashSet<int> {75298, 76572, 82725, 90213, 5910};
+            var items = sniffer.ItemList.Where(status => itemIds.Contains(status.Id));
+            PAssert.That(() => items.All(x => x.Holder.Id == 861));
         }
 
         /// <summary>
@@ -804,7 +675,7 @@ namespace KancolleSniffer.Test
                 new[] {0, 0, 0, 0, 0, 0, 0, 0},
                 new[] {288194, 282623, 299496, 295958, 3000, 2968, 2997, 7},
                 new[] {288185, 282623, 299496, 295943, 3000, 2968, 2997, 7},
-                new[] {288161, 282623, 299496, 295903, 3000, 2968, 2997, 7},
+                new[] {288161, 282623, 299496, 295903, 3000, 2968, 2997, 7}
             };
             PAssert.That(() => SequenceOfSequenceEqual(expected3, result3), "航空機の補充");
 
@@ -828,7 +699,7 @@ namespace KancolleSniffer.Test
                 new[] {0, 0, 0, 0, 0, 0, 0, 0},
                 new[] {261012, 252252, 298492, 279622, 3000, 2842, 3000, 22},
                 new[] {261012, 252252, 298492, 279538, 3000, 2842, 3000, 22},
-                new[] {261012, 252252, 298492, 279454, 3000, 2842, 3000, 22},
+                new[] {261012, 252252, 298492, 279454, 3000, 2842, 3000, 22}
             };
             PAssert.That(() => SequenceOfSequenceEqual(expected4, result4), "航空機の配備");
         }
@@ -843,45 +714,218 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
-        /// 海域ゲージ情報を作成する
+        /// 修復時間が1分以内の艦娘が入渠する
         /// </summary>
         [TestMethod]
-        public void MapInfo()
+        public void NyukyoLessThanOrEqualTo1Min()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "mapinfo_001");
-            PAssert.That(() => sniffer.MiscText ==
-                               "[海域ゲージ]\r\n" +
-                               "1-6 : 撃破 3/7\r\n5-5 : 撃破 0/5\r\n6-3 : 撃破 0/4\r\n" +
-                               "31-1 : HP 0/750\r\n31-2 : HP 0/1050\r\n31-3 : HP 0/2100\r\n31-4 : HP 0/3500\r\n31-5 : HP 1/2450\r\n",
-                "最初の海域ゲージ情報");
-            SniffLogFile(sniffer, "mapinfo_002");
-            PAssert.That(() => sniffer.MiscText ==
-                               "[海域ゲージ情報]\r\n 海域選択画面に進むと表示します。\r\n[演習情報]\r\n 演習相手を選ぶと表示します。",
-                "戦闘から戻ったら案内を表示");
-            SniffLogFile(sniffer, "mapinfo_003");
-            PAssert.That(() => sniffer.MiscText ==
-                               "[海域ゲージ]\r\n" +
-                               "1-6 : 撃破 4/7\r\n5-5 : 撃破 0/5\r\n6-3 : 撃破 0/4\r\n" +
-                               "31-1 : HP 0/750\r\n31-2 : HP 0/1050\r\n31-3 : HP 0/2100\r\n31-4 : HP 0/3500\r\n31-5 : HP 1/2450\r\n",
-                "更新された海域ゲージ情報");
+            SniffLogFile(sniffer, "nyukyo_001");
+            PAssert.That(() => sniffer.RepairList.Length == 1);
+        }
+
+        /// <summary>
+        /// 一括解体する(装備保管なしとあり)
+        /// </summary>
+        [TestMethod]
+        public void DestroyShip()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "destroyship_001");
+            PAssert.That(() => sniffer.ShipCounter.Now == 250);
+            PAssert.That(() => sniffer.ItemCounter.Now == 1118);
+            PAssert.That(() => sniffer.Material.Current.Take(4).SequenceEqual(new[] {285615, 286250, 291010, 284744}));
+        }
+
+        /// <summary>
+        /// 第2艦隊までしか解放していなくてもエラーにならないようにする
+        /// </summary>
+        [TestMethod]
+        public void TwoFleets()
+        {
+            var sniffer = new Sniffer(true);
+            SniffLogFile(sniffer, "twofleets_001");
+            PAssert.That(() => new[]{5, 5, 0, 0}.SequenceEqual(sniffer.Fleets.Select(f => f.ChargeStatus.Fuel)));
         }
 
         /// <summary>
-        /// 演習相手の情報を作成する
+        /// ship2がリクエストで指定した艦娘のデータしか返さない
         /// </summary>
         [TestMethod]
-        public void PractiveEnemyInfo()
+        public void Ship2ReturnShipSpecifiedByRequest()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "practice_enemyinfo_001");
+            SniffLogFile(sniffer, "ship2_001");
+            PAssert.That(() => sniffer.ShipCounter.Now == 243);
+        }
+
+        /// <summary>
+        /// 出撃中にアイテムを取得する
+        /// </summary>
+        [TestMethod]
+        public void ItemGetInSortie()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "itemget_001");
             PAssert.That(() => sniffer.MiscText ==
-                               "[演習情報]\r\n敵艦隊名 : 大銀河地球連邦　第7艦隊\r\n獲得経験値 : 570\r\nS勝利 : 684",
-                "演習相手の情報");
-            SniffLogFile(sniffer, "practice_enemyinfo_002");
+                               "[獲得アイテム]\r\n" +
+                               "燃料: 1115\r\n" +
+                               "弾薬: 25\r\n" +
+                               "鋼材: 70\r\n" +
+                               "家具箱（大）: 1\r\n" +
+                               "給糧艦「間宮」: 1\r\n" +
+                               "勲章: 1\r\n" +
+                               "給糧艦「伊良湖」: 3\r\n" +
+                               "プレゼント箱: 1\r\n" +
+                               "補強増設: 2\r\n" +
+                               "戦闘詳報: 1\r\n" +
+                               "瑞雲(六三一空): 1\r\n" +
+                               "夜間作戦航空要員: 1\r\n" +
+                               "130mm B-13連装砲: 1\r\n" +
+                               "潜水空母な桐箪笥: 1\r\n" +
+                               "Gambier Bay: 1");
+        }
+
+        /// <summary>
+        /// 出撃直後に資源を獲得する
+        /// </summary>
+        [TestMethod]
+        public void ItemGetAtStart()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "itemget_002");
             PAssert.That(() => sniffer.MiscText ==
-                               "[海域ゲージ情報]\r\n 海域選択画面に進むと表示します。\r\n[演習情報]\r\n 演習相手を選ぶと表示します。",
-                "演習から戻ったら案内を表示");
+                               "[獲得アイテム]\r\n" +
+                               "燃料: 65");
+        }
+
+        /// <summary>
+        /// 航空偵察でアイテムを取得する
+        /// </summary>
+        [TestMethod]
+        public void ItemGetInAirRecon()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "airrecon_001");
+            PAssert.That(() =>
+                sniffer.MiscText ==
+                "[海域ゲージ情報]\r\n 海域選択画面に進むと表示します。\r\n" +
+                "[演習情報]\r\n 演習相手を選ぶと表示します。\r\n" +
+                "[獲得アイテム]\r\n 帰投したときに表示します。", "失敗の場合");
+
+            SniffLogFile(sniffer, "airrecon_002");
+            PAssert.That(() =>
+                sniffer.MiscText == "[獲得アイテム]\r\n弾薬: 150\r\n開発資材: 1", "成功");
+
+            SniffLogFile(sniffer, "airrecon_003");
+            PAssert.That(() =>
+                sniffer.MiscText == "[獲得アイテム]\r\n弾薬: 150\r\n開発資材: 1", "途中でリロードして再出撃");
+        }
+
+        /// <summary>
+        /// 海域ゲージの情報を生成する
+        /// </summary>
+        [TestMethod]
+        public void AreaGauge()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "mapgauge_001");
+            PAssert.That(() =>
+                sniffer.MiscText ==
+                "[海域ゲージ]\r\n" +
+                "1-6 : 残り 5/7\r\n" +
+                "2-5 : 残り 4/4\r\n" +
+                "3-5 : 残り 4/4\r\n" +
+                "4-4 : 残り 4/4\r\n");
+        }
+
+        /// <summary>
+        /// 7-2の2本目の海域ゲージを正しく表示する
+        /// </summary>
+        [TestMethod]
+        public void SecondAreaGauge()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "mapgauge_002");
+            PAssert.That(() =>
+                sniffer.MiscText ==
+                "[海域ゲージ]\r\n" +
+                "1-6 : 残り 5/7\r\n" +
+                "2-5 : 残り 2/4\r\n" +
+                "5-5 : 残り 5/5\r\n" +
+                "6-5 : 残り 6/6\r\n" +
+                "7-2 : 残り 1/4\r\n");
+        }
+
+        /// <summary>
+        /// 2019冬イベからクリア済みマップのゲージ情報がない
+        /// </summary>
+        [TestMethod]
+        public void ClearedExMapGage()
+        {
+            var miscTextInfo = new MiscTextInfo(null, null);
+            using (var stream = OpenLogFile("mapgauge_003"))
+            {
+                miscTextInfo.InspectMapInfo(JsonObject.Parse(stream.ReadToEnd()));
+            }
+            PAssert.That(() =>
+                miscTextInfo.Text ==
+                "[海域ゲージ]\r\n" +
+                "1-6 : 残り 5/7\r\n" +
+                "5-5 : 残り 5/5\r\n" +
+                "7-2 : 残り 1/4\r\n" +
+                "43-2 : HP 1050/1400\r\n");
+        }
+
+        /// <summary>
+        /// 演習の獲得経験値を計算する
+        /// </summary>
+        [TestMethod]
+        public void PracticeExpPoint()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "practice_004");
+            PAssert.That(() => sniffer.MiscText == "[演習情報]\r\n敵艦隊名 : 第一艦隊\r\n獲得経験値 : 878\r\nS勝利 : 1053");
+        }
+
+        /// <summary>
+        /// 新規のドロップ艦の初期装備数を登録する
+        /// </summary>
+        [TestMethod]
+        public void RecordNumEquipsOfNewDropShip()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "dropship_001");
+            PAssert.That(() => sniffer.AdditionalData.NumEquips(565) == 2);
+            PAssert.That(() => sniffer.ShipList.First(s => s.Spec.Id == 565).Spec.NumEquips == 2);
+        }
+
+        /// <summary>
+        /// 既知のドロップ艦とその装備をカウントする
+        /// </summary>
+        [TestMethod]
+        public void CountDropShip()
+        {
+            var sniffer = new Sniffer();
+            sniffer.AdditionalData.RecordNumEquips(11, "", 1);
+            SniffLogFile(sniffer, "dropship_002");
+            PAssert.That(() => sniffer.ShipCounter.Now == 250);
+            PAssert.That(() => sniffer.ItemCounter.Now == 1159);
+        }
+
+        /// <summary>
+        /// 艦娘数を数える
+        /// </summary>
+        [TestMethod]
+        public void CountShips()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "ship_count_001");
+            PAssert.That(() => sniffer.ShipCounter.Now == 267 && sniffer.ShipCounter.Alarm, "ログイン");
+            SniffLogFile(sniffer, "ship_count_002");
+            PAssert.That(() => sniffer.ShipCounter.Now == 266 && sniffer.ShipCounter.Alarm, "建造");
+            SniffLogFile(sniffer, "ship_count_003");
+            PAssert.That(() => sniffer.ShipCounter.Now == 266 && sniffer.ShipCounter.Alarm, "ドロップ");
         }
     }
 }
\ No newline at end of file