提交: fc61c6082feceddd4e23ab85fb3cfcbddb909b59 - KancolleSniffer (git)

Commit MetaInfo

• 修訂: fc61c6082feceddd4e23ab85fb3cfcbddb909b59 (tree)
• 時間: 2019-12-09 21:13:15
• 作者: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Log Message

ShipInfoから出撃中の艦隊番号を取れるようにする

Change Summary

• modified: KancolleSniffer/MainForm.cs
• modified: KancolleSniffer/Model/ShipInfo.cs
• modified: KancolleSniffer/Sniffer.cs

差異

--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -673,15 +673,14 @@ namespace KancolleSniffer
 
         private void SetCurrentFleet()
         {
-            var states = Sniffer.Fleets.Select(fleet => fleet.State).ToArray();
-            var inSortie = states.Any(state => state >= FleetState.Sortie);
-            if (_inSortie || !inSortie)
+            var inSortie = Sniffer.InSortie;
+            if (_inSortie || inSortie == -1)
             {
-                _inSortie = inSortie;
+                _inSortie = inSortie == -1;
                 return;
             }
             _inSortie = true;
-            if (states[0] == FleetState.Sortie && states[1] == FleetState.Sortie)
+            if (inSortie == 10)
             {
                 _combinedFleet = true;
                 _currentFleet = 0;
@@ -689,7 +688,7 @@ namespace KancolleSniffer
             else
             {
                 _combinedFleet = false;
-                _currentFleet = Array.FindIndex(states, state => state >= FleetState.Sortie);
+                _currentFleet = inSortie;
             }
         }
 

--- a/KancolleSniffer/Model/ShipInfo.cs
+++ b/KancolleSniffer/Model/ShipInfo.cs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using KancolleSniffer.Util;
@@ -383,6 +384,18 @@ namespace KancolleSniffer.Model
 
         public IReadOnlyList<Fleet> Fleets => _fleets;
 
+        public int InSortie
+        {
+            get
+            {
+                var sorties = _fleets.Select(f => f.State >= FleetState.Sortie).ToArray();
+                if (sorties[0] && sorties[1])
+                    return 10;
+                var idx = Array.FindIndex(sorties, s => s);
+                return idx;
+            }
+        }
+
         public ShipStatus GetShip(int id) => _shipInventory[id];
 
         public void SetItemHolder()

--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -634,6 +634,8 @@ namespace KancolleSniffer
 
         public IReadOnlyList<Fleet> Fleets => _shipInfo.Fleets;
 
+        public int InSortie => _shipInfo.InSortie;
+
         public ShipInfo.ShipStatusPair[] BattleResultStatusDiff => _shipInfo.BattleResultDiff;
 
         public bool IsBattleResultError => _shipInfo.IsBattleResultError || _battleInfo.DisplayedResultRank.IsError;