艦隊に関する責務をShipInfoからFleetクラスに移す

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

diff --git a/KancolleSniffer/FleetPanel.cs b/KancolleSniffer/FleetPanel.cs
index 4558ad2..76d692b 100644 (file)
--- a/KancolleSniffer/FleetPanel.cs
+++ b/KancolleSniffer/FleetPanel.cs
@@ -89,12 +89,14 @@ namespace KancolleSniffer
         private void CreateTable(Sniffer sniffer)\r
         {\r
             var list = new List<Record>();\r
+            var fleets = sniffer.Fleets;\r
             var fn = new[] {"第一", "第二", "第三", "第四"};\r
             for (var f = 0; f < fn.Length; f++)\r
             {\r
                 var total = new Total();\r
                 var ships = new List<Record>();\r
-                foreach (var s in sniffer.GetShipStatuses(f))\r
+                var fleet = fleets[f];\r
+                foreach (var s in fleet.Ships)\r
                 {\r
                     var equips = new List<Record>();\r
                     for (var i = 0; i < s.Slot.Length; i++)\r
@@ -150,10 +152,10 @@ namespace KancolleSniffer
                     ships.Add(ship);\r
                     ships.AddRange(equips);\r
                 }\r
-                var daihatsu = sniffer.GetDaihatsuBonus(f);\r
-                var tp = sniffer.GetTransportPoint(f);\r
+                var daihatsu = fleet.DaihatsuBonus;\r
+                var tp = fleet.TransportPoint;\r
                 if (sniffer.CombinedFleetType != 0 && f == 0)\r
-                    tp += sniffer.GetTransportPoint(1);\r
+                    tp += fleets[1].TransportPoint;\r
                 list.Add(new Record\r
                 {\r
                     Fleet = fn[f] + HideIfZero(" Lv", total.Level) +\r