エラーログに戦闘前の装備を出力する

diff --git a/KancolleSniffer.Test/BattleTest.cs b/KancolleSniffer.Test/BattleTest.cs
index 218b3ff..280a6e7 100644 (file)
--- a/KancolleSniffer.Test/BattleTest.cs
+++ b/KancolleSniffer.Test/BattleTest.cs
@@ -43,14 +43,13 @@ namespace KancolleSniffer.Test
         public void Damecon()\r
         {\r
             var logs = ReadAllLines("damecon_001");\r
-            var items = _itemInfo.InjectItems(new[]{43});\r
+            var items = JsonParser.Parse("[[[],[],[],[],[43]]]");\r
             dynamic battle = JsonParser.Parse(logs[2]);\r
-            _shipInfo.InjectShips(battle);\r
-            _shipInfo.GetStatus(5).Slot = new []{items[0]};\r
+            _shipInfo.InjectShips(battle, items);\r
             _battleInfo.InspectBattle(battle, logs[0]);\r
             dynamic result = JsonParser.Parse(logs[5]);\r
             _battleInfo.InspectBattleResult(result);\r
-            PAssert.That(() => _shipInfo.GetStatus(5).NowHp == 31);\r
+            PAssert.That(() => _shipInfo.GetShipStatuses(2)[4].NowHp == 31);\r
         }\r
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer/BattleInfo.cs b/KancolleSniffer/BattleInfo.cs
index e5ccba3..d38feba 100644 (file)
--- a/KancolleSniffer/BattleInfo.cs
+++ b/KancolleSniffer/BattleInfo.cs
@@ -145,6 +145,7 @@ namespace KancolleSniffer
         {\r
             if (_friend != null)\r
                 return;\r
+            _shipInfo.SaveBattleStartStatus();\r
             _fleet = DeckId(json);\r
             var fstats = _shipInfo.GetShipStatuses(_fleet);\r
             FlagshipRecovery(fstats[0]);\r

diff --git a/KancolleSniffer/ErrorLog.cs b/KancolleSniffer/ErrorLog.cs
index 494b36e..0fc952a 100644 (file)
--- a/KancolleSniffer/ErrorLog.cs
+++ b/KancolleSniffer/ErrorLog.cs
@@ -69,7 +69,8 @@ namespace KancolleSniffer
             foreach (var logs in _battleApiLog)\r
                 RemoveUnwantedInformation(ref logs[1], ref logs[2]);\r
             var version = string.Join(".", Application.ProductVersion.Split('.').Take(2));\r
-            var api = CompressApi(string.Join("\r\n", _battleApiLog.Select(logs => string.Join("\r\n", logs))));\r
+            var api = CompressApi(string.Join("\r\n",\r
+                new[] {BattleStartSlots()}.Concat(_battleApiLog.SelectMany(logs => logs))));\r
             var rank = _sniffer.Battle.DisplayedResultRank;\r
             var status = string.Join("\r\n", new[]\r
             {\r
@@ -81,6 +82,18 @@ namespace KancolleSniffer
             return result;\r
         }\r
 \r
+        private string BattleStartSlots()\r
+        {\r
+            return JsonObject.CreateJsonObject((from ship in _sniffer.BattleStartStatus\r
+                group ship by ship.Fleet\r
+                into fleet\r
+                select\r
+                (from s in fleet\r
+                    select (from item in s.AllSlot select item.Spec.Id).ToArray()\r
+                ).ToArray()\r
+            ).ToArray()).ToString();\r
+        }\r
+\r
         private string HpDiffLog() => string.Join(" ",\r
             from pair in _sniffer.BattleResultStatusDiff\r
             let assumed = pair.Assumed\r

diff --git a/KancolleSniffer/ItemInfo.cs b/KancolleSniffer/ItemInfo.cs
index 5abf5d5..fd931e6 100644 (file)
--- a/KancolleSniffer/ItemInfo.cs
+++ b/KancolleSniffer/ItemInfo.cs
@@ -705,7 +705,7 @@ namespace KancolleSniffer
 \r
         public string GetUseItemName(int id) => _useItemName[id];\r
 \r
-        public ItemStatus[] InjectItems(int[] itemIds)\r
+        public IEnumerable<ItemStatus> InjectItems(IEnumerable<int> itemIds)\r
         {\r
             var id = _itemInfo.Keys.Count + 1;\r
             return itemIds.Select(itemId =>\r
@@ -718,7 +718,7 @@ namespace KancolleSniffer
                 var item = new ItemStatus {Id = id++, Spec = spec};\r
                 _itemInfo.Add(item.Id, item);\r
                 return item;\r
-            }).ToArray();\r
+            });\r
         }\r
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs
index afde1f7..e0865f5 100644 (file)
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -68,6 +68,7 @@ namespace KancolleSniffer
         private ShipStatus[] _battleResult = new ShipStatus[0];\r
         public ShipStatusPair[] BattleResultDiff { get; private set; } = new ShipStatusPair[0];\r
         public bool IsBattleResultError => BattleResultDiff.Length > 0;\r
+        public ShipStatus[] BattleStartStatus { get; private set; } = new ShipStatus[0];\r
 \r
         public class ShipStatusPair\r
         {\r
@@ -145,6 +146,12 @@ namespace KancolleSniffer
             _battleResult = new ShipStatus[0];\r
         }\r
 \r
+        public void SaveBattleStartStatus()\r
+        {\r
+            BattleStartStatus = _decks.Where((deck, i) => _inSortie[i])\r
+                .SelectMany(deck => deck.Select(id => (ShipStatus)GetStatus(id).Clone())).ToArray();\r
+        }\r
+\r
         private void ClearShipInfo()\r
         {\r
             _shipInfo.Clear();\r
@@ -512,23 +519,12 @@ namespace KancolleSniffer
             set => _shipMaster.UseOldEnemyId = value;\r
         }\r
 \r
-        public void InjectShips(dynamic battle)\r
+        public void InjectShips(dynamic battle, dynamic item)\r
         {\r
-            var deck = (int)battle.api_deck_id;\r
-            var id = 1;\r
-            var ships = ((int[])battle.api_f_nowhps).Zip((int[])battle.api_f_maxhps,\r
-                (now, max) => new ShipStatus {Id = id++, NowHp = now, MaxHp = max}).ToArray();\r
-            _decks[deck - 1] = (from ship in ships select ship.Id).ToArray();\r
-            foreach (var ship in ships)\r
-                _shipInfo[ship.Id] = ship;\r
+            var deck = (int)battle.api_deck_id - 1;\r
+            InjectShips(deck, (int[])battle.api_f_nowhps, (int[])battle.api_f_maxhps, (int[][])item[0]);\r
             if (battle.api_f_nowhps_combined())\r
-            {\r
-                var guards = ((int[])battle.api_f_nowhps_combined).Zip((int[])battle.api_f_maxhps_combined,\r
-                    (now, max) => new ShipStatus {Id = id++, NowHp = now, MaxHp = max}).ToArray();\r
-                _decks[1] = (from ship in guards select ship.Id).ToArray();\r
-                foreach (var ship in guards)\r
-                    _shipInfo[ship.Id] = ship;\r
-            }\r
+                InjectShips(1, (int[])battle.api_f_nowhps_combined, (int[])battle.api_f_maxhps_combined, (int[][])item[1]);\r
             foreach (var enemy in (int[])battle.api_ship_ke)\r
                 _shipMaster[enemy] = new ShipSpec {Id = enemy};\r
             if (battle.api_ship_ke_combined())\r
@@ -537,5 +533,21 @@ namespace KancolleSniffer
                     _shipMaster[enemy] = new ShipSpec {Id = enemy};\r
             }\r
         }\r
+\r
+        private void InjectShips(int deck, int[] nowhps, int[] maxhps, int[][] slots)\r
+        {\r
+            var id = _shipInfo.Keys.Count + 1;\r
+            var ships = nowhps.Zip(maxhps,\r
+                (now, max) => new ShipStatus {Id = id++, NowHp = now, MaxHp = max}).ToArray();\r
+            _decks[deck] = (from ship in ships select ship.Id).ToArray();\r
+            foreach (var ship in ships)\r
+                _shipInfo[ship.Id] = ship;\r
+            foreach (var entry in ships.Zip(slots, (ship, slot) =>new {ship, slot}))\r
+            {\r
+                entry.ship.Slot = _itemInfo.InjectItems(entry.slot.Take(5)).ToArray();\r
+                if (entry.slot.Length >= 6)\r
+                    entry.ship.SlotEx = _itemInfo.InjectItems(entry.slot.Skip(5)).First();\r
+            }\r
+        }\r
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index e4e0f5f..d61cc0e 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -513,6 +513,8 @@ namespace KancolleSniffer
 \r
         public bool IsBattleResultStatusError => _shipInfo.IsBattleResultError;\r
 \r
+        public ShipStatus[] BattleStartStatus => _shipInfo.BattleStartStatus;\r
+\r
         public int CombinedFleetType => _shipInfo.CombinedFleetType;\r
 \r
         public ChargeStatus[] ChargeStatuses => _shipInfo.ChargeStatuses;\r