CSV形式に素対潜を追加する

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / Sniffer.cs

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index dc55231..54360ef 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -33,7 +33,7 @@ namespace KancolleSniffer
         private readonly BattleInfo _battleInfo;\r
         private readonly Logger _logger;\r
         private readonly ExMapInfo _exMapInfo = new ExMapInfo();\r
-        private readonly MiscTextInfo _miscTextInfo = new MiscTextInfo();\r
+        private readonly MiscTextInfo _miscTextInfo;\r
         private readonly BaseAirCoprs _baseAirCoprs;\r
         private readonly PresetDeck _presetDeck = new PresetDeck();\r
         private readonly Status _status = new Status();\r
@@ -77,6 +77,7 @@ namespace KancolleSniffer
             _logger = new Logger(_shipInfo, _itemInfo, _battleInfo);\r
             _questInfo = new QuestInfo(_itemInfo, _battleInfo);\r
             _baseAirCoprs = new BaseAirCoprs(_itemInfo);\r
+            _miscTextInfo = new MiscTextInfo(_shipInfo, _itemInfo);\r
             _haveState = new List<IHaveState> {_achievement, _materialInfo, _conditionTimer, _exMapInfo, _questInfo};\r
         }\r
 \r
@@ -131,6 +132,7 @@ namespace KancolleSniffer
             _missionInfo.InspectMaster(data.api_mst_mission);\r
             _itemInfo.InspectMaster(data);\r
             _exMapInfo.ResetIfNeeded();\r
+            _miscTextInfo.InspectMaster(data);\r
             _start = true;\r
             return Update.Start;\r
         }\r
@@ -158,7 +160,7 @@ namespace KancolleSniffer
             _battleInfo.CleanupResult();\r
             _battleInfo.BattleState = BattleState.None;\r
             _shipInfo.ClearEscapedShips();\r
-            _miscTextInfo.ClearIfNeeded();\r
+            _miscTextInfo.Port();\r
             SaveState();\r
             RepeatingTimerController?.Resume();\r
             foreach (var s in new[] {"遠征終了", "入渠終了", "疲労回復", "泊地修理"})\r
@@ -339,7 +341,6 @@ namespace KancolleSniffer
                 {\r
                     _shipInfo.InspectMapStart(request); // 演習を出撃中とみなす\r
                     _conditionTimer.InvalidateCond();\r
-                    _miscTextInfo.ClearFlag = true;\r
                     RepeatingTimerController?.Suspend();\r
                 }\r
                 _battleInfo.InspectBattle(url, request, data);\r
@@ -351,6 +352,7 @@ namespace KancolleSniffer
                 _exMapInfo.InspectBattleResult(data);\r
                 _logger.InspectBattleResult(data);\r
                 _questInfo.InspectBattleResult(data);\r
+                _miscTextInfo.InspectBattleResult(data);\r
                 return Update.Ship | Update.QuestList;\r
             }\r
             if (url.EndsWith("api_req_practice/battle_result"))\r
@@ -470,7 +472,7 @@ namespace KancolleSniffer
                 _exMapInfo.InspectMapStart(data);\r
                 _battleInfo.InspectMapStart(data);\r
                 _logger.InspectMapStart(data);\r
-                _miscTextInfo.ClearFlag = true;\r
+                _miscTextInfo.InspectMapStart(data);\r
                 _questInfo.InspectMapStart(data);\r
                 RepeatingTimerController?.Suspend();\r
                 return Update.Timer | Update.Ship;\r
@@ -481,6 +483,7 @@ namespace KancolleSniffer
                 _battleInfo.InspectMapNext(data);\r
                 _logger.InspectMapNext(data);\r
                 _questInfo.InspectMapNext(data);\r
+                _miscTextInfo.InspectMapNext(data);\r
                 return Update.None;\r
             }\r
             if (url.EndsWith("api_req_mission/start"))\r
@@ -555,6 +558,8 @@ namespace KancolleSniffer
 \r
         public int[] GetDeck(int fleet) => _shipInfo.GetDeck(fleet);\r
 \r
+        public bool[] InSortie => _shipInfo.InSortie;\r
+\r
         public ShipInfo.ShipStatusPair[] BattleResultStatusDiff => _shipInfo.BattleResultDiff;\r
 \r
         public bool IsBattleResultStatusError => _shipInfo.IsBattleResultError;\r
@@ -604,11 +609,6 @@ namespace KancolleSniffer
 \r
         public BaseAirCoprs.BaseInfo[] BaseAirCorps => _baseAirCoprs.AllAirCorps;\r
 \r
-        public bool UseOldEnemyId\r
-        {\r
-            set => _shipInfo.UseOldEnemyId = value;\r
-        }\r
-\r
         public void SetLogWriter(Action<string, string, string> writer, Func<DateTime> nowFunc)\r
         {\r
             _logger.SetWriter(writer, nowFunc);\r