From 0f1790b318d1c75de57f275e1f2c10d62100344d Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Wed, 1 Aug 2018 21:52:00 +0900
Subject: [PATCH] =?utf8?q?ShipStatus=E3=81=AEEscaped=E3=83=95=E3=83=A9?=
 =?utf8?q?=E3=82=B0=E3=82=92FillUp=E3=82=92=E4=BB=8B=E3=81=95=E3=81=9A?=
 =?utf8?q?=E3=81=AB=E7=9B=B4=E6=8E=A5=E7=AB=8B=E3=81=A6=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer/Model/ShipInfo.cs | 16 +++++++---------
 KancolleSniffer/Sniffer.cs        |  1 -
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/KancolleSniffer/Model/ShipInfo.cs b/KancolleSniffer/Model/ShipInfo.cs
index 2aaae71..15c5ed2 100644
--- a/KancolleSniffer/Model/ShipInfo.cs
+++ b/KancolleSniffer/Model/ShipInfo.cs
@@ -84,6 +84,7 @@ namespace KancolleSniffer.Model
             if (json.api_deck_port()) // port
             {
                 _shipInventry.Clear();
+                _escapedShips.Clear();
                 for (var i = 0; i < FleetCount; i++)
                     _fleets[i].State = FleetState.Port;
                 InspectDeck(json.api_deck_port);
@@ -180,7 +181,8 @@ namespace KancolleSniffer.Model
                     AntiSubmarine = (int)entry.api_taisen[0],
                     AntiAir = (int)entry.api_taiku[0],
                     Lucky = (int)entry.api_lucky[0],
-                    Locked = entry.api_locked() && entry.api_locked == 1
+                    Locked = entry.api_locked() && entry.api_locked == 1,
+                    Escaped = _escapedShips.Contains(id)
                 };
                 _shipInventry.Add(ship);
                 _numEquipsChecker.Check(ship);
@@ -342,7 +344,6 @@ namespace KancolleSniffer.Model
         {
             if (ship.Empty)
                 return ship;
-            ship.Escaped = _escapedShips.Contains(ship.Id);
             ship.Fleet = FindFleet(ship.Id, out var idx);
             ship.DeckIndex = idx;
             return ship;
@@ -385,14 +386,11 @@ namespace KancolleSniffer.Model
             BadlyDamagedShips = new string[0];
         }
 
-        public void SetEscapedShips(List<int> ships)
+        public void SetEscapedShips(List<int> ids)
         {
-            _escapedShips.AddRange(ships);
-        }
-
-        public void ClearEscapedShips()
-        {
-            _escapedShips.Clear();
+            _escapedShips.AddRange(ids);
+            foreach (var id in ids)
+                _shipInventry[id].Escaped = true;
         }
     }
 }
\ No newline at end of file
diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index e781363..adb170b 100644
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -186,7 +186,6 @@ namespace KancolleSniffer
                 _baseAirCoprs.InspectPlaneInfo(data.api_plane_info);
             _battleInfo.CleanupResult();
             _battleInfo.BattleState = BattleState.None;
-            _shipInfo.ClearEscapedShips();
             _miscTextInfo.Port();
             _cellInfo.Port();
             SaveState();
-- 
2.11.0