OSDN Git Service

空襲戦で女神で復活すると勝利判定がくるうのを直す
[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / BattleInfo.cs
index c1f893b..8f9d53f 100644 (file)
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and\r
 // limitations under the License.\r
 \r
+using System;\r
 using System.Collections.Generic;\r
 using System.Linq;\r
 using static System.Math;\r
@@ -26,7 +27,24 @@ namespace KancolleSniffer
         B,\r
         C,\r
         D,\r
-        E,\r
+        E\r
+    }\r
+\r
+    public enum BattleState\r
+    {\r
+        None,\r
+        Day,\r
+        Night,\r
+        Result,\r
+        Unknown\r
+    }\r
+\r
+    public class EnemyFighterPower\r
+    {\r
+        public bool HasUnknown { get; set; }\r
+        public string UnknownMark => HasUnknown ? "+" : "";\r
+        public int AirCombat { get; set; }\r
+        public int Interception { get; set; }\r
     }\r
 \r
     public class BattleInfo\r
@@ -36,17 +54,40 @@ namespace KancolleSniffer
         private int _fleet;\r
         private Record[] _friend;\r
         private Record[] _guard;\r
-        private int[] _enemyHp;\r
-        private int[] _enemyStartHp;\r
+        private Record[] _enemy;\r
+        private Record[] _enemyGuard;\r
         private readonly List<int> _escapingShips = new List<int>();\r
-        private int _flagshipRecoveryType;\r
+        private bool _lastCell;\r
 \r
-        public bool InBattle { get; set; }\r
-        public string Formation { get; private set; }\r
-        public string EnemyFighterPower { get; private set; }\r
+        public BattleState BattleState { get; set; }\r
+        public int[] Formation { get; private set; }\r
+        public int[] FighterPower { get; private set; }\r
+        public EnemyFighterPower EnemyFighterPower { get; private set; }\r
         public int AirControlLevel { get; private set; }\r
         public BattleResultRank ResultRank { get; private set; }\r
-        public ShipStatus[] EnemyResultStatus { get; private set; }\r
+        public RankPair DisplayedResultRank { get; } = new RankPair();\r
+        public BattleResult Result { get; set; }\r
+        public bool EnemyIsCombined => _enemyGuard.Length > 0;\r
+        public List<AirBattleResult> AirBattleResults { get; } = new List<AirBattleResult>();\r
+\r
+        public class RankPair\r
+        {\r
+            public char Assumed { get; set; }\r
+            public char Actual { get; set; }\r
+            public bool IsError => Assumed != Actual;\r
+        }\r
+\r
+        public class BattleResult\r
+        {\r
+            public class Combined\r
+            {\r
+                public ShipStatus[] Main { get; set; }\r
+                public ShipStatus[] Guard { get; set; }\r
+            }\r
+\r
+            public Combined Friend { get; set; }\r
+            public Combined Enemy { get; set; }\r
+        }\r
 \r
         public BattleInfo(ShipInfo shipInfo, ItemInfo itemInfo)\r
         {\r
@@ -54,94 +95,78 @@ namespace KancolleSniffer
             _itemInfo = itemInfo;\r
         }\r
 \r
-        public void InspectBattle(dynamic json, string url)\r
+        public void InspectBattle(string url, string request, dynamic json)\r
         {\r
-            InBattle = true;\r
-            Formation = FormationName(json);\r
-            EnemyFighterPower = CalcEnemyFighterPower(json);\r
+            if (json.api_formation())\r
+                Formation = ((dynamic[])json.api_formation).Select(f => f is string ? (int)int.Parse(f) : (int)f)\r
+                    .ToArray();\r
             AirControlLevel = CheckAirControlLevel(json);\r
             ShowResult(false); // 昼戦の結果を夜戦のときに表示する\r
-            SetupResult(json);\r
-            if (IsNightBattle(json))\r
-                CalcHougekiDamage(json.api_hougeki, _friend, _enemyHp);\r
-            else\r
-                CalcDamage(json);\r
-            ClearOverKill(_enemyHp);\r
+            SetupResult(request, json, url.Contains("practice"));\r
+            FighterPower = CalcFighterPower();\r
+            EnemyFighterPower = CalcEnemyFighterPower(json);\r
+            BattleState = IsNightBattle(json) ? BattleState.Night : BattleState.Day;\r
+            CalcDamage(json);\r
             ResultRank = url.EndsWith("ld_airbattle") ? CalcLdAirBattleRank() : CalcResultRank();\r
+            SetResult();\r
         }\r
 \r
-        public void InspectMapNext(string request)\r
-        {\r
-            var type = HttpUtility.ParseQueryString(request)["api_recovery_type"];\r
-            if (type == null)\r
-                return;\r
-            _flagshipRecoveryType = int.Parse(type);\r
-        }\r
+        private bool IsNightBattle(dynamic json) => json.api_hougeki();\r
 \r
-        private int DeckId(dynamic json)\r
+        public static int DeckId(dynamic json)\r
         {\r
             if (json.api_dock_id()) // 昼戦はtypoしている\r
                 return (int)json.api_dock_id - 1;\r
-            if (json.api_deck_id is string) // 通常の夜戦では文字列\r
+            if (json.api_deck_id is string) // é\80\9a常ã\81®å¤\9cæ\88¦ã\81¨é\80£å\90\88è\89¦é\9a\8a\91³æ\96¹ã\81®ã\81¿)ã\81§ã\81¯æ\96\87å­\97å\88\97\r
                 return int.Parse(json.api_deck_id) - 1;\r
             return (int)json.api_deck_id - 1;\r
         }\r
 \r
-        private string FormationName(dynamic json)\r
-        {\r
-            if (!json.api_formation()) // 演習の夜戦\r
-                return "";\r
-            switch ((int)json.api_formation[2])\r
-            {\r
-                case 1:\r
-                    return "同航戦";\r
-                case 2:\r
-                    return "反航戦";\r
-                case 3:\r
-                    return "T字有利";\r
-                case 4:\r
-                    return "T字不利";\r
-            }\r
-            return "";\r
-        }\r
-\r
-        private void SetupResult(dynamic json)\r
+        private void SetupResult(string request, dynamic json, bool practice)\r
         {\r
             if (_friend != null)\r
                 return;\r
-            var combined = json.api_nowhps_combined();\r
-            var nowhps = (int[])json.api_nowhps;\r
-            _fleet = combined ? 0 : DeckId(json);\r
+            _shipInfo.SaveBattleStartStatus();\r
+            _fleet = DeckId(json);\r
             var fstats = _shipInfo.GetShipStatuses(_fleet);\r
-            FlagshipRecovery(fstats[0]);\r
-            _friend = Record.Setup(\r
-                nowhps, (int[])json.api_maxhps,\r
-                fstats.Select(s => s.Slot).ToArray(),\r
-                fstats.Select(s => s.SlotEx).ToArray());\r
-            _enemyHp = nowhps.Skip(7).TakeWhile(hp => hp != -1).ToArray();\r
-            _enemyStartHp = (int[])_enemyHp.Clone();\r
-            EnemyResultStatus =\r
-                (from id in ((int[])json.api_ship_ke).Skip(1)\r
-                    where id != -1\r
-                    select new ShipStatus {Id = id, Spec = _shipInfo.GetSpec(id)}).ToArray();\r
-            if (combined)\r
-            {\r
-                var gstats = _shipInfo.GetShipStatuses(1);\r
-                _guard = Record.Setup(\r
-                    (int[])json.api_nowhps_combined,\r
-                    (int[])json.api_maxhps_combined,\r
-                    gstats.Select(s => s.Slot).ToArray(),\r
-                    gstats.Select(s => s.SlotEx).ToArray());\r
-            }\r
-            else\r
+            FlagshipRecovery(request, fstats[0]);\r
+            _friend = Record.Setup(fstats, practice);\r
+            _guard = json.api_f_nowhps_combined()\r
+                ? Record.Setup(_shipInfo.GetShipStatuses(1), practice)\r
+                : new Record[0];\r
+            _enemy = Record.Setup((int[])json.api_e_nowhps,\r
+                ((int[])json.api_ship_ke).Select(_shipInfo.GetSpec).ToArray(),\r
+                ((int[][])json.api_eSlot).Select(slot => slot.Select(_itemInfo.GetSpecByItemId).ToArray()).ToArray(),\r
+                practice);\r
+            _enemyGuard = json.api_ship_ke_combined()\r
+                ? Record.Setup((int[])json.api_e_nowhps_combined,\r
+                    ((int[])json.api_ship_ke_combined).Select(_shipInfo.GetSpec).ToArray(),\r
+                    ((int[][])json.api_eSlot).Select(slot => slot.Select(_itemInfo.GetSpecByItemId).ToArray())\r
+                    .ToArray(), practice)\r
+                : new Record[0];\r
+        }\r
+\r
+        private void SetResult()\r
+        {\r
+            Result = new BattleResult\r
             {\r
-                _guard = new Record[0];\r
-            }\r
+                Friend = new BattleResult.Combined\r
+                {\r
+                    Main = _friend.Select(r => r.SnapShot).ToArray(),\r
+                    Guard = _guard.Select(r => r.SnapShot).ToArray()\r
+                },\r
+                Enemy = new BattleResult.Combined\r
+                {\r
+                    Main = _enemy.Select(r => r.SnapShot).ToArray(),\r
+                    Guard = _enemyGuard.Select(r => r.SnapShot).ToArray()\r
+                }\r
+            };\r
         }\r
 \r
-        private void FlagshipRecovery(ShipStatus flagship)\r
+        private void FlagshipRecovery(string request, ShipStatus flagship)\r
         {\r
-            switch (_flagshipRecoveryType)\r
+            var type = int.Parse(HttpUtility.ParseQueryString(request)["api_recovery_type"] ?? "0");\r
+            switch (type)\r
             {\r
                 case 0:\r
                     return;\r
@@ -154,7 +179,8 @@ namespace KancolleSniffer
                     ConsumeSlotItem(flagship, 43); // 女神\r
                     break;\r
             }\r
-            _flagshipRecoveryType = 0;\r
+            if (type != 0)\r
+                _shipInfo.SetBadlyDamagedShips();\r
         }\r
 \r
         private static void ConsumeSlotItem(ShipStatus ship, int id)\r
@@ -177,6 +203,7 @@ namespace KancolleSniffer
         public void CleanupResult()\r
         {\r
             _friend = null;\r
+            _lastCell = false;\r
         }\r
 \r
         private int CheckAirControlLevel(dynamic json)\r
@@ -191,145 +218,300 @@ namespace KancolleSniffer
             return (int)stage1.api_disp_seiku;\r
         }\r
 \r
-        private string CalcEnemyFighterPower(dynamic json)\r
+        private int[] CalcFighterPower()\r
         {\r
-            var missing = "";\r
-            var maxEq = ((int[])json.api_ship_ke).Skip(1).SelectMany(id =>\r
+            if (_guard.Length > 0 && _enemyGuard.Length > 0)\r
+                return _shipInfo.GetFighterPower(0).Zip(_shipInfo.GetFighterPower(1), (a, b) => a + b).ToArray();\r
+            return _shipInfo.GetFighterPower(_fleet);\r
+        }\r
+\r
+        private EnemyFighterPower CalcEnemyFighterPower(dynamic json)\r
+        {\r
+            var result = new EnemyFighterPower();\r
+            var ships = (int[])json.api_ship_ke;\r
+            if (json.api_ship_ke_combined() && _guard.Length > 0)\r
+                ships = ships.Concat((int[])json.api_ship_ke_combined).ToArray();\r
+            var maxEq = ships.SelectMany(id =>\r
             {\r
                 var r = _shipInfo.GetSpec(id).MaxEq;\r
                 if (r != null)\r
                     return r;\r
-                missing = "+";\r
+                result.HasUnknown = true;\r
                 return new int[5];\r
-            }).ToArray();\r
+            });\r
             var equips = ((int[][])json.api_eSlot).SelectMany(x => x);\r
-            return (from slot in equips.Zip(maxEq, (id, max) => new {id, max})\r
+            if (json.api_eSlot_combined() && _guard.Length > 0)\r
+                equips = equips.Concat(((int[][])json.api_eSlot_combined).SelectMany(x => x));\r
+            foreach (var entry in from slot in equips.Zip(maxEq, (id, max) => new {id, max})\r
                 let spec = _itemInfo.GetSpecByItemId(slot.id)\r
-                where spec.CanAirCombat\r
-                select (int)Floor(spec.AntiAir * Sqrt(slot.max))).DefaultIfEmpty().Sum() + missing;\r
+                let perSlot = (int)Floor(spec.AntiAir * Sqrt(slot.max))\r
+                select new {spec, perSlot})\r
+            {\r
+                if (entry.spec.CanAirCombat)\r
+                    result.AirCombat += entry.perSlot;\r
+                if (entry.spec.IsAircraft)\r
+                    result.Interception += entry.perSlot;\r
+            }\r
+            return result;\r
         }\r
 \r
-        private void CalcDamage(dynamic json, bool surfaceFleet = false)\r
+        private enum CombatType\r
         {\r
-            var combined = json.api_nowhps_combined();\r
-            if (json.api_air_base_attack())\r
-                CalcAirBaseAttackDamage(json.api_air_base_attack);\r
-            if (json.api_kouku.api_stage3 != null)\r
-                CalcSimpleDamage(json.api_kouku.api_stage3, _friend, _enemyHp);\r
-            if (json.api_kouku.api_stage3_combined() && json.api_kouku.api_stage3_combined != null)\r
-                CalcSimpleDamage(json.api_kouku.api_stage3_combined.api_fdam, _guard);\r
-            if (json.api_kouku2()) // 航空戦2回目\r
-            {\r
-                if (json.api_kouku2.api_stage3 != null)\r
-                    CalcSimpleDamage(json.api_kouku2.api_stage3, _friend, _enemyHp);\r
-                if (json.api_kouku2.api_stage3_combined() && json.api_kouku2.api_stage3_combined != null)\r
-                    CalcSimpleDamage(json.api_kouku2.api_stage3_combined.api_fdam, _guard);\r
-            }\r
-            if (!json.api_opening_atack()) // 航空戦のみ\r
-                return;\r
-            if (json.api_support_info() && json.api_support_info != null)\r
-                CalcSupportDamage(json.api_support_info);\r
-            if (json.api_opening_atack != null)\r
-            {\r
-                var friend = combined ? _guard : _friend; // 雷撃の対象は護衛\r
-                CalcSimpleDamage(json.api_opening_atack, friend, _enemyHp);\r
-            }\r
-            if (json.api_hougeki1() && json.api_hougeki1 != null)\r
-            {\r
-                var friend = combined && !surfaceFleet ? _guard : _friend; // 空母機動部隊は一巡目が護衛\r
-                CalcHougekiDamage(json.api_hougeki1, friend, _enemyHp);\r
-            }\r
-            if (json.api_hougeki2() && json.api_hougeki2 != null)\r
+            AtOnce,\r
+            ByTurn,\r
+            Support,\r
+            Aircraft,\r
+            AirBase,\r
+            Friend\r
+        }\r
+\r
+        private class Phase\r
+        {\r
+            public string Api { get; }\r
+            public CombatType Type { get; }\r
+            public string Name { get; }\r
+\r
+            public Phase(string api, CombatType type, string name = "")\r
             {\r
-                CalcHougekiDamage(json.api_hougeki2, _friend, _enemyHp);\r
+                Api = api;\r
+                Type = type;\r
+                Name = name;\r
             }\r
-            if (json.api_hougeki3() && json.api_hougeki3 != null)\r
+        }\r
+\r
+        private void CalcDamage(dynamic json)\r
+        {\r
+            AirBattleResults.Clear();\r
+            var phases = new[]\r
             {\r
-                var friend = combined && surfaceFleet ? _guard : _friend; // 水上打撃部隊は三順目が護衛\r
-                CalcHougekiDamage(json.api_hougeki3, friend, _enemyHp);\r
-            }\r
-            if (json.api_raigeki() && json.api_raigeki != null)\r
+                new Phase("air_base_injection", CombatType.Aircraft, "AB噴式"),\r
+                new Phase("injection_kouku", CombatType.Aircraft, "噴式"),\r
+                new Phase("air_base_attack", CombatType.AirBase),\r
+                new Phase("n_support_info", CombatType.Support),\r
+                new Phase("n_hougeki1", CombatType.ByTurn),\r
+                new Phase("n_hougeki2", CombatType.ByTurn),\r
+                new Phase("kouku", CombatType.Aircraft, "航空戦"),\r
+                new Phase("kouku2", CombatType.Aircraft, "航空戦2"),\r
+                new Phase("support_info", CombatType.Support),\r
+                new Phase("opening_taisen", CombatType.ByTurn),\r
+                new Phase("opening_atack", CombatType.AtOnce),\r
+                new Phase("friendly_battle", CombatType.Friend),\r
+                new Phase("hougeki", CombatType.ByTurn),\r
+                new Phase("hougeki1", CombatType.ByTurn),\r
+                new Phase("hougeki2", CombatType.ByTurn),\r
+                new Phase("hougeki3", CombatType.ByTurn),\r
+                new Phase("raigeki", CombatType.AtOnce)\r
+            };\r
+            foreach (var phase in phases)\r
+                CalcDamageByType(json, phase);\r
+        }\r
+\r
+        private void CalcDamageByType(dynamic json, Phase phase)\r
+        {\r
+            var api = "api_" + phase.Api;\r
+            if (!json.IsDefined(api) || json[api] == null)\r
+                return;\r
+            switch (phase.Type)\r
             {\r
-                var friend = combined ? _guard : _friend;\r
-                CalcSimpleDamage(json.api_raigeki, friend, _enemyHp);\r
+                case CombatType.AtOnce:\r
+                    CalcDamageAtOnce(json[api]);\r
+                    break;\r
+                case CombatType.ByTurn:\r
+                    CalcDamageByTurn(json[api]);\r
+                    break;\r
+                case CombatType.Support:\r
+                    CalcSupportDamage(json[api]);\r
+                    break;\r
+                case CombatType.Aircraft:\r
+                    AddAirBattleResult(json[api], phase.Name);\r
+                    CalcKoukuDamage(json[api]);\r
+                    break;\r
+                case CombatType.AirBase:\r
+                    CalcAirBaseAttackDamage(json[api]);\r
+                    break;\r
+                case CombatType.Friend:\r
+                    CalcFriendAttackDamage(json[api]);\r
+                    break;\r
             }\r
         }\r
 \r
         private void CalcSupportDamage(dynamic json)\r
         {\r
             if (json.api_support_hourai != null)\r
-                CalcSimpleDamage(json.api_support_hourai.api_damage, _enemyHp);\r
+            {\r
+                CalcRawDamageAtOnce(json.api_support_hourai.api_damage, _enemy, _enemyGuard);\r
+            }\r
             else if (json.api_support_airatack != null)\r
             {\r
-                var stage3 = json.api_support_airatack.api_stage3;\r
-                if (stage3 != null)\r
-                    CalcSimpleDamage(stage3.api_edam, _enemyHp);\r
+                CalcRawDamageAtOnce(json.api_support_airatack.api_stage3.api_edam, _enemy, _enemyGuard);\r
             }\r
         }\r
 \r
         private void CalcAirBaseAttackDamage(dynamic json)\r
         {\r
+            var i = 1;\r
             foreach (var entry in json)\r
             {\r
-                if (!entry.api_stage3() || entry.api_stage3 == null)\r
-                    continue;\r
-                CalcSimpleDamage(entry.api_stage3.api_edam, _enemyHp);\r
+                AddAirBattleResult(entry, "基地" + i++);\r
+                CalcKoukuDamage(entry);\r
             }\r
         }\r
 \r
-        private bool IsNightBattle(dynamic json) => json.api_hougeki();\r
+        private void CalcFriendAttackDamage(dynamic json)\r
+        {\r
+            CalcDamageByTurn(json.api_hougeki, true);\r
+        }\r
+\r
+        private void AddAirBattleResult(dynamic json, string phaseName)\r
+        {\r
+            var stage1 = json.api_stage1;\r
+            if (stage1 == null || (stage1.api_f_count == 0 && stage1.api_e_count == 0))\r
+                return;\r
+            var result = new AirBattleResult\r
+            {\r
+                PhaseName = phaseName,\r
+                AirControlLevel = json.api_stage1.api_disp_seiku() ? (int)json.api_stage1.api_disp_seiku : 0,\r
+                Stage1 = new AirBattleResult.StageResult\r
+                {\r
+                    FriendCount = (int)json.api_stage1.api_f_count,\r
+                    FriendLost = (int)json.api_stage1.api_f_lostcount,\r
+                    EnemyCount = (int)json.api_stage1.api_e_count,\r
+                    EnemyLost = (int)json.api_stage1.api_e_lostcount\r
+                },\r
+                Stage2 = json.api_stage2 == null\r
+                    ? new AirBattleResult.StageResult\r
+                    {\r
+                        FriendCount = 0,\r
+                        FriendLost = 0,\r
+                        EnemyCount = 0,\r
+                        EnemyLost = 0\r
+                    }\r
+                    : new AirBattleResult.StageResult\r
+                    {\r
+                        FriendCount = (int)json.api_stage2.api_f_count,\r
+                        FriendLost = (int)json.api_stage2.api_f_lostcount,\r
+                        EnemyCount = (int)json.api_stage2.api_e_count,\r
+                        EnemyLost = (int)json.api_stage2.api_e_lostcount\r
+                    }\r
+            };\r
+            if (json.api_stage2 != null && json.api_stage2.api_air_fire())\r
+            {\r
+                var airfire = json.api_stage2.api_air_fire;\r
+                var idx = (int)airfire.api_idx;\r
+                result.AirFire = new AirBattleResult.AirFireResult\r
+                {\r
+                    ShipName = idx < _friend.Length ? _friend[idx].Name : _guard[idx - 6].Name,\r
+                    Kind = (int)airfire.api_kind,\r
+                    Items = ((int[])airfire.api_use_items).Select(id => _itemInfo.GetSpecByItemId(id).Name).ToArray()\r
+                };\r
+            }\r
+            AirBattleResults.Add(result);\r
+        }\r
 \r
-        private void CalcSimpleDamage(dynamic json, Record[] friend, int[] enemy)\r
+        private void CalcKoukuDamage(dynamic json)\r
         {\r
-            CalcSimpleDamage(json.api_fdam, friend);\r
-            CalcSimpleDamage(json.api_edam, enemy);\r
+            if (json.api_stage3() && json.api_stage3 != null)\r
+                CalcDamageAtOnce(json.api_stage3, _friend, _enemy);\r
+            if (json.api_stage3_combined() && json.api_stage3_combined != null)\r
+                CalcDamageAtOnce(json.api_stage3_combined, _guard, _enemyGuard);\r
         }\r
 \r
-        private void CalcSimpleDamage(dynamic rawDamage, Record[] result)\r
+        private void CalcDamageAtOnce(dynamic json)\r
         {\r
-            var damage = (int[])rawDamage;\r
-            for (var i = 0; i < result.Length; i++)\r
-                result[i].ApplyDamage(damage[i + 1]);\r
+            CalcDamageAtOnce(json, _friend, _guard, _enemy, _enemyGuard);\r
         }\r
 \r
-        private void CalcSimpleDamage(dynamic rawDamage, int[] result)\r
+        private void CalcDamageAtOnce(dynamic json, Record[] friend, Record[] enemy)\r
+        {\r
+            CalcDamageAtOnce(json, friend, null, enemy, null);\r
+        }\r
+\r
+        private void CalcDamageAtOnce(dynamic json,\r
+            Record[] friend, Record[] guard, Record[] enemy, Record[] enemyGuard)\r
+        {\r
+            if (json.api_fdam() && json.api_fdam != null)\r
+                CalcRawDamageAtOnce(json.api_fdam, friend, guard);\r
+            if (json.api_edam() && json.api_edam != null)\r
+                CalcRawDamageAtOnce(json.api_edam, enemy, enemyGuard);\r
+        }\r
+\r
+        private void CalcRawDamageAtOnce(dynamic rawDamage, Record[] friend, Record[] guard = null)\r
         {\r
             var damage = (int[])rawDamage;\r
-            for (var i = 0; i < result.Length; i++)\r
-                result[i] -= damage[i + 1];\r
+            for (var i = 0; i < friend.Length; i++)\r
+                friend[i].ApplyDamage(damage[i]);\r
+            if (guard == null)\r
+                return;\r
+            for (var i = 0; i < guard.Length; i++)\r
+                guard[i].ApplyDamage(damage[i + 6]);\r
         }\r
 \r
-        private void CalcHougekiDamage(dynamic hougeki, Record[] friend, int[] enemy)\r
+        private void CalcDamageByTurn(dynamic json, bool ignoreFriendDamage = false)\r
         {\r
-            var targets = ((dynamic[])hougeki.api_df_list).Skip(1).SelectMany(x => (int[])x);\r
-            var damages = ((dynamic[])hougeki.api_damage).Skip(1).SelectMany(x => (double[])x);\r
-            foreach (var hit in targets.Zip(damages, (t, d) => new {t, d}))\r
+            if (!(json.api_df_list() && json.api_df_list != null &&\r
+                  json.api_damage() && json.api_damage != null &&\r
+                  json.api_at_eflag() && json.api_at_eflag != null))\r
+                return;\r
+\r
+            var targets = (int[][])json.api_df_list;\r
+            var damages = (int[][])json.api_damage;\r
+            var eflags = (int[])json.api_at_eflag;\r
+            var records = new[] {new Record[12], new Record[12]};\r
+            Array.Copy(_friend, records[1], _friend.Length);\r
+            Array.Copy(_guard, 0, records[1], 6, _guard.Length);\r
+            Array.Copy(_enemy, records[0], _enemy.Length);\r
+            Array.Copy(_enemyGuard, 0, records[0], 6, _enemyGuard.Length);\r
+            for (var i = 0; i < eflags.Length; i++)\r
             {\r
+                // 一度に複数の目標を狙う攻撃はないものと仮定する\r
+                var hit = new {t = targets[i][0], d = damages[i].Sum(d => d >= 0 ? d : 0)};\r
                 if (hit.t == -1)\r
                     continue;\r
-                if (hit.t <= 6)\r
-                    friend[hit.t - 1].ApplyDamage((int)hit.d);\r
-                else\r
-                    enemy[(hit.t - 1) % 6] -= (int)hit.d;\r
+                if (ignoreFriendDamage && eflags[i] == 1)\r
+                    continue;\r
+                records[eflags[i]][hit.t].ApplyDamage(hit.d);\r
             }\r
         }\r
 \r
-        private void ClearOverKill(int[] result)\r
+        public void InspectMapStart(dynamic json)\r
         {\r
-            for (var i = 0; i < result.Length; i++)\r
-                if (result[i] < 0)\r
-                    result[i] = 0;\r
+            InspectMapNext(json);\r
+        }\r
+\r
+        public void InspectMapNext(dynamic json)\r
+        {\r
+            _lastCell = (int)json.api_next == 0;\r
         }\r
 \r
         public void InspectBattleResult(dynamic json)\r
         {\r
-            ShowResult();\r
+            BattleState = BattleState.Result;\r
+            ShowResult(!_lastCell);\r
+            _shipInfo.SaveBattleResult();\r
+            VerifyResultRank(json);\r
             CleanupResult();\r
+            SetEscapeShips(json);\r
+        }\r
+\r
+        private void VerifyResultRank(dynamic json)\r
+        {\r
+            if (_friend == null)\r
+                return;\r
+            if (!json.api_win_rank())\r
+                return;\r
+            var assumed = "PSABCDE"[(int)ResultRank];\r
+            if (assumed == 'P')\r
+                assumed = 'S';\r
+            var actual = ((string)json.api_win_rank)[0];\r
+            DisplayedResultRank.Assumed = assumed;\r
+            DisplayedResultRank.Actual = actual;\r
         }\r
 \r
         public void InspectPracticeResult(dynamic json)\r
         {\r
+            BattleState = BattleState.Result;\r
             ShowResult(false);\r
+            VerifyResultRank(json);\r
             CleanupResult();\r
         }\r
 \r
@@ -337,66 +519,36 @@ namespace KancolleSniffer
         {\r
             if (_friend == null)\r
                 return;\r
-            var ships = _shipInfo.GetShipStatuses(_fleet);\r
-            foreach (var e in ships.Zip(_friend, (ship, now) => new {ship, now}))\r
-                e.now.UpdateShipStatus(e.ship);\r
+            var ships = _guard.Length > 0\r
+                ? _shipInfo.GetShipStatuses(0).Concat(_shipInfo.GetShipStatuses(1)).ToArray()\r
+                : _shipInfo.GetShipStatuses(_fleet);\r
+            foreach (var entry in ships.Zip(_friend.Concat(_guard), (ship, now) => new {ship, now}))\r
+                entry.now.UpdateShipStatus(entry.ship);\r
             if (warnDamagedShip)\r
                 _shipInfo.SetBadlyDamagedShips();\r
-            SetEnemyResultStatus();\r
-        }\r
-\r
-        private void SetEnemyResultStatus()\r
-        {\r
-            for (var i = 0; i < EnemyResultStatus.Length; i++)\r
-            {\r
-                EnemyResultStatus[i].MaxHp = _enemyStartHp[i];\r
-                EnemyResultStatus[i].NowHp = _enemyHp[i];\r
-            }\r
-        }\r
-\r
-        public void InspectCombinedBattle(dynamic json, string url)\r
-        {\r
-            InBattle = true;\r
-            Formation = FormationName(json);\r
-            EnemyFighterPower = CalcEnemyFighterPower(json);\r
-            AirControlLevel = CheckAirControlLevel(json);\r
-            _fleet = 10;\r
-            ShowResultCombined(false);\r
-            SetupResult(json);\r
-            if (IsNightBattle(json))\r
-                CalcHougekiDamage(json.api_hougeki, _guard, _enemyHp);\r
             else\r
-                CalcDamage(json, url.EndsWith("battle_water"));\r
-            ClearOverKill(_enemyHp);\r
-            ResultRank = url.EndsWith("ld_airbattle") ? CalcLdAirBattleRank() : CalcResultRank();\r
+                _shipInfo.ClearBadlyDamagedShips();\r
         }\r
 \r
-        public void InspectCombinedBattleResult(dynamic json)\r
+        public void SetEscapeShips(dynamic json)\r
         {\r
             _escapingShips.Clear();\r
-            ShowResultCombined();\r
-            CleanupResult();\r
-            if ((int)json.api_escape_flag == 0)\r
+            if (!json.api_escape_flag() || (int)json.api_escape_flag == 0)\r
                 return;\r
             var damaged = (int)json.api_escape.api_escape_idx[0] - 1;\r
-            _escapingShips.Add(_shipInfo.GetDeck(damaged / 6)[damaged % 6]);\r
-            var escort = (int)json.api_escape.api_tow_idx[0] - 1;\r
-            _escapingShips.Add(_shipInfo.GetDeck(escort / 6)[escort % 6]);\r
-        }\r
-\r
-        private void ShowResultCombined(bool warnDamagedShip = true)\r
-        {\r
-            if (_friend == null)\r
-                return;\r
-            var ships = _shipInfo.GetShipStatuses(0).Concat(_shipInfo.GetShipStatuses(1)).ToArray();\r
-            foreach (var e in ships.Zip(_friend.Concat(_guard), (ship, now) => new {ship, now}))\r
-                e.now.UpdateShipStatus(e.ship);\r
-            if (warnDamagedShip)\r
-                _shipInfo.SetBadlyDamagedShips();\r
-            SetEnemyResultStatus();\r
+            if (json.api_escape.api_tow_idx())\r
+            {\r
+                _escapingShips.Add(_shipInfo.GetDeck(damaged / 6)[damaged % 6]);\r
+                var escort = (int)json.api_escape.api_tow_idx[0] - 1;\r
+                _escapingShips.Add(_shipInfo.GetDeck(escort / 6)[escort % 6]);\r
+            }\r
+            else\r
+            {\r
+                _escapingShips.Add(_shipInfo.GetDeck(2)[damaged]);\r
+            }\r
         }\r
 \r
-        public void CauseCombinedBattleEscape()\r
+        public void CauseEscape()\r
         {\r
             _shipInfo.SetEscapedShips(_escapingShips);\r
             _shipInfo.SetBadlyDamagedShips();\r
@@ -405,30 +557,35 @@ namespace KancolleSniffer
         private class Record\r
         {\r
             private ShipStatus _status;\r
+            private bool _practice;\r
+            public ShipStatus SnapShot => (ShipStatus)_status.Clone();\r
             public int NowHp => _status.NowHp;\r
-            public int StartHp;\r
+            public bool Escaped => _status.Escaped;\r
+            public ShipStatus.Damage DamageLevel => _status.DamageLevel;\r
+            public string Name => _status.Name;\r
+            public int StartHp { get; private set; }\r
+\r
+            public static Record[] Setup(ShipStatus[] ships, bool practice) =>\r
+            (from s in ships\r
+                select new Record {_status = (ShipStatus)s.Clone(), _practice = practice, StartHp = s.NowHp}).ToArray();\r
 \r
-            public static Record[] Setup(int[] rawHp, int[] rawMax, ItemStatus[][] slots, ItemStatus[] slotEx)\r
+            public static Record[] Setup(int[] nowhps, ShipSpec[] ships, ItemSpec[][] slots, bool practice)\r
             {\r
-                var hp = rawHp.Skip(1).Take(6).TakeWhile(h => h != -1).ToArray();\r
-                var max = rawMax.Skip(1).Take(6).TakeWhile(h => h != -1).ToArray();\r
-                var r = new Record[hp.Length];\r
-                for (var i = 0; i < hp.Length; i++)\r
-                {\r
-                    var s = new ShipStatus\r
+                return Enumerable.Range(0, nowhps.Length).Select(i =>\r
+                    new Record\r
                     {\r
-                        NowHp = hp[i],\r
-                        MaxHp = max[i],\r
-                        SlotEx = slotEx[i],\r
-                        Slot = slots[i].ToArray()\r
-                    };\r
-                    r[i] = new Record\r
-                    {\r
-                        _status = s,\r
-                        StartHp = hp[i],\r
-                    };\r
-                }\r
-                return r;\r
+                        StartHp = nowhps[i],\r
+                        _status = new ShipStatus\r
+                        {\r
+                            Id = ships[i].Id,\r
+                            NowHp = nowhps[i],\r
+                            MaxHp = nowhps[i],\r
+                            Spec = ships[i],\r
+                            Slot = slots[i].Select(spec => new ItemStatus {Id = spec.Id, Spec = spec}).ToArray(),\r
+                            SlotEx = new ItemStatus(0)\r
+                        },\r
+                        _practice = practice\r
+                    }).ToArray();\r
             }\r
 \r
             public void ApplyDamage(int damage)\r
@@ -439,6 +596,8 @@ namespace KancolleSniffer
                     return;\r
                 }\r
                 _status.NowHp = 0;\r
+                if (_practice)\r
+                    return;\r
                 foreach (var item in new[] {_status.SlotEx}.Concat(_status.Slot))\r
                 {\r
                     if (item.Spec.Id == 42)\r
@@ -466,110 +625,80 @@ namespace KancolleSniffer
 \r
         private BattleResultRank CalcLdAirBattleRank()\r
         {\r
-            var combined = _friend.Concat(_guard).ToArray();\r
-            var friendNowShips = combined.Count(r => r.NowHp > 0);\r
+            var combined = _friend.Concat(_guard).Where(r => !r.Escaped).ToArray();\r
             var friendGauge = combined.Sum(r => r.StartHp - r.NowHp);\r
-            var friendSunk = combined.Count(r => r.NowHp == 0);\r
             var friendGaugeRate = Floor((double)friendGauge / combined.Sum(r => r.StartHp) * 100);\r
 \r
-            if (friendSunk == 0)\r
-            {\r
-                if (friendGauge == 0)\r
-                    return BattleResultRank.P;\r
-                if (friendGaugeRate < 10)\r
-                    return BattleResultRank.A;\r
-                if (friendGaugeRate < 20)\r
-                    return BattleResultRank.B;\r
-                if (friendGaugeRate < 50)\r
-                    return BattleResultRank.C;\r
-                return BattleResultRank.D;\r
-            }\r
-            if (friendSunk < friendNowShips)\r
+            if (friendGauge <= 0)\r
+                return BattleResultRank.P;\r
+            if (friendGaugeRate < 10)\r
+                return BattleResultRank.A;\r
+            if (friendGaugeRate < 20)\r
+                return BattleResultRank.B;\r
+            if (friendGaugeRate < 50)\r
+                return BattleResultRank.C;\r
+            if (friendGaugeRate < 80)\r
                 return BattleResultRank.D;\r
             return BattleResultRank.E;\r
         }\r
 \r
-        // 以下のコードは航海日誌拡張版の以下のファイルのcalcResultRankを移植したもの\r
-        // https://github.com/nekopanda/logbook/blob/94ceca4be6d4ce79a8759d1ee747fb9827c08edc/main/logbook/dto/BattleExDto.java\r
-        //\r
-        // The MIT License (MIT)\r
-        //\r
-        // Copyright (c) 2014-2015 航海日誌拡張版開発者\r
-        //\r
-        // Permission is hereby granted, free of charge, to any person obtaining a copy\r
-        // of this software and associated documentation files (the "Software"), to deal\r
-        // in the Software without restriction, including without limitation the rights\r
-        // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
-        // copies of the Software, and to permit persons to whom the Software is\r
-        // furnished to do so, subject to the following conditions:\r
-        //\r
-        // The above copyright notice and this permission notice shall be included in\r
-        // all copies or substantial portions of the Software.\r
-        //\r
-        // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
-        // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
-        // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
-        // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
-        // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
-        // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
-        // THE SOFTWARE.\r
-        //\r
         private BattleResultRank CalcResultRank()\r
         {\r
-            var combined = _friend.Concat(_guard).ToArray();\r
-            // 戦闘後に残っている艦数\r
-            var friendNowShips = combined.Count(r => r.NowHp > 0);\r
-            var enemyNowShips = _enemyHp.Count(hp => hp > 0);\r
-            // 総ダメージ\r
-            var friendGauge = Max(combined.Sum(r => r.StartHp - r.NowHp), 0); // ダメコン・女神発動で負になりうる\r
-            var enemyGauge = _enemyStartHp.Sum() - _enemyHp.Sum();\r
-            // 轟沈・撃沈数\r
-            var friendSunk = combined.Count(r => r.NowHp == 0);\r
-            var enemySunk = _enemyHp.Count(hp => hp == 0);\r
-\r
-            var friendGaugeRate = Floor((double)friendGauge / combined.Sum(r => r.StartHp) * 100);\r
-            var enemyGaugeRate = Floor((double)enemyGauge / _enemyStartHp.Sum() * 100);\r
-            var equalOrMore = enemyGaugeRate > (0.9 * friendGaugeRate);\r
-            var superior = enemyGaugeRate > 0 && enemyGaugeRate > (2.5 * friendGaugeRate);\r
-\r
-            if (friendSunk == 0)\r
+            var friend = _friend.Concat(_guard).ToArray();\r
+            var enemy = _enemy.Concat(_enemyGuard).ToArray();\r
+\r
+            var friendCount = friend.Length;\r
+            var friendStartHpTotal = 0;\r
+            var friendNowHpTotal = 0;\r
+            var friendSunk = 0;\r
+            foreach (var ship in friend)\r
             {\r
-                if (enemyNowShips == 0)\r
-                {\r
-                    if (friendGauge == 0)\r
-                        return BattleResultRank.P;\r
-                    return BattleResultRank.S;\r
-                }\r
-                if (_enemyHp.Length == 6)\r
-                {\r
-                    if (enemySunk >= 4)\r
-                        return BattleResultRank.A;\r
-                }\r
-                else if (enemySunk * 2 >= _enemyHp.Length)\r
-                {\r
-                    return BattleResultRank.A;\r
-                }\r
-                if (_enemyHp[0] == 0)\r
-                    return BattleResultRank.B;\r
-                if (superior)\r
-                    return BattleResultRank.B;\r
+                if (ship.Escaped)\r
+                    continue;\r
+                friendStartHpTotal += ship.StartHp;\r
+                friendNowHpTotal += ship.NowHp;\r
+                if (ship.NowHp == 0)\r
+                    friendSunk++;\r
             }\r
-            else\r
+            var friendGaugeRate = (int)((double)(friendStartHpTotal - friendNowHpTotal) / friendStartHpTotal * 100);\r
+\r
+            var enemyCount = enemy.Length;\r
+            var enemyStartHpTotal = enemy.Sum(r => r.StartHp);\r
+            var enemyNowHpTotal = enemy.Sum(r => r.NowHp);\r
+            var enemySunk = enemy.Count(r => r.NowHp == 0);\r
+            var enemyGaugeRate = (int)((double)(enemyStartHpTotal - enemyNowHpTotal) / enemyStartHpTotal * 100);\r
+\r
+            if (friendSunk == 0 && enemySunk == enemyCount)\r
             {\r
-                if (enemyNowShips == 0)\r
-                    return BattleResultRank.B;\r
-                if (_enemyHp[0] == 0 && friendSunk < enemySunk)\r
-                    return BattleResultRank.B;\r
-                if (superior)\r
-                    return BattleResultRank.B;\r
-                if (_enemyHp[0] == 0)\r
-                    return BattleResultRank.C;\r
+                if (friendNowHpTotal >= friendStartHpTotal)\r
+                    return BattleResultRank.P;\r
+                return BattleResultRank.S;\r
             }\r
-            if (enemyGauge > 0 && equalOrMore)\r
+            if (friendSunk == 0 && enemySunk >= (int)(enemyCount * 0.7) && enemyCount > 1)\r
+                return BattleResultRank.A;\r
+            if (friendSunk < enemySunk && enemy[0].NowHp == 0)\r
+                return BattleResultRank.B;\r
+            if (friendCount == 1 && friend[0].DamageLevel == ShipStatus.Damage.Badly)\r
+                return BattleResultRank.D;\r
+            if (enemyGaugeRate > friendGaugeRate * 2.5)\r
+                return BattleResultRank.B;\r
+            if (enemyGaugeRate > friendGaugeRate * 0.9)\r
                 return BattleResultRank.C;\r
-            if (friendSunk > 0 && friendNowShips == 1)\r
+            if (friendCount > 1 && friendCount - 1 == friendSunk)\r
                 return BattleResultRank.E;\r
             return BattleResultRank.D;\r
         }\r
+\r
+        /// <summary>\r
+        /// テスト専用\r
+        /// </summary>\r
+        public void InjectResultStatus(ShipStatus[] main, ShipStatus[] guard, ShipStatus[] enemy, ShipStatus[] enemyGuard)\r
+        {\r
+            Result = new BattleResult\r
+            {\r
+                Friend = new BattleResult.Combined { Main = main, Guard = guard},\r
+                Enemy = new BattleResult.Combined {Main = enemy, Guard = enemyGuard}\r
+            };\r
+        }\r
     }\r
 }
\ No newline at end of file