From 17faac08b5324b3dd489b4d67ef662348b07eeb0 Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sat, 21 Apr 2018 20:51:50 +0900
Subject: [PATCH] =?utf8?q?=E7=8D=B2=E5=BE=97=E3=82=A2=E3=82=A4=E3=83=86?=
 =?utf8?q?=E3=83=A0=E3=81=AB=E5=87=BA=E6=92=83=E7=9B=B4=E5=BE=8C=E3=81=AB?=
 =?utf8?q?=E7=8D=B2=E5=BE=97=E3=81=97=E3=81=9F=E5=88=86=E3=81=8C=E8=A8=88?=
 =?utf8?q?=E4=B8=8A=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=81=AE=E3=82=92?=
 =?utf8?q?=E7=9B=B4=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer.Test/SnifferTest.cs | 13 +++++++++++++
 KancolleSniffer.Test/logs           |  2 +-
 KancolleSniffer/MiscTextInfo.cs     |  7 ++++---
 KancolleSniffer/Sniffer.cs          |  2 +-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index c538584..2082f11 100644
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -785,6 +785,19 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
+        /// 出撃直後に資源を獲得する
+        /// </summary>
+        [TestMethod]
+        public void ItemGetAtStart()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "itemget_002");
+            PAssert.That(() => sniffer.MiscText ==
+                               "[獲得アイテム]\r\n" +
+                               "燃料: 65");
+        }
+
+        /// <summary>
         /// 航空偵察でアイテムを取得する
         /// </summary>
         [TestMethod]
diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index 1089470..eae3174 160000
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit 108947024b87b128ee3136cf1ab10cb6f5db428d
+Subproject commit eae3174d768fe515a8c04f8a65954efe5b70aacd
diff --git a/KancolleSniffer/MiscTextInfo.cs b/KancolleSniffer/MiscTextInfo.cs
index 7233d30..f01852b 100644
--- a/KancolleSniffer/MiscTextInfo.cs
+++ b/KancolleSniffer/MiscTextInfo.cs
@@ -22,12 +22,12 @@ namespace KancolleSniffer
     {
         private readonly ShipInfo _shipInfo;
         private readonly ItemInfo _itemInfo;
+        private bool _inSortie;
 
         private const string GuideText =
             "[海域ゲージ情報]\r\n 海域選択画面に進むと表示します。\r\n[演習情報]\r\n 演習相手を選ぶと表示します。\r\n[獲得アイテム]\r\n 帰投したときに表示します。";
 
         public string Text { get; private set; } = GuideText;
-        public bool SortieStarted { private get; set; }
 
         public MiscTextInfo(ShipInfo shipInfo, ItemInfo itemInfo)
         {
@@ -37,9 +37,9 @@ namespace KancolleSniffer
 
         public void Port()
         {
-            if (SortieStarted)
+            if (_inSortie)
             {
-                SortieStarted = false;
+                _inSortie = false;
                 var text = GenerateItemGetText();
                 Text = text == "" ? GuideText : "[獲得アイテム]\r\n" + text;
             }
@@ -153,6 +153,7 @@ namespace KancolleSniffer
 
         public void InspectMapStart(dynamic json)
         {
+            _inSortie = true;
             InspectMapNext(json);
         }
 
diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index 32ca509..54360ef 100644
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -472,7 +472,7 @@ namespace KancolleSniffer
                 _exMapInfo.InspectMapStart(data);
                 _battleInfo.InspectMapStart(data);
                 _logger.InspectMapStart(data);
-                _miscTextInfo.SortieStarted = true;
+                _miscTextInfo.InspectMapStart(data);
                 _questInfo.InspectMapStart(data);
                 RepeatingTimerController?.Suspend();
                 return Update.Timer | Update.Ship;
-- 
2.11.0