BaseAirCorpsをAirBaseにリネームする

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

diff --git a/KancolleSniffer/View/FleetPanel.cs b/KancolleSniffer/View/FleetPanel.cs
index 3b9a4b9..19cb9fa 100644 (file)
--- a/KancolleSniffer/View/FleetPanel.cs
+++ b/KancolleSniffer/View/FleetPanel.cs
@@ -182,10 +182,10 @@ namespace KancolleSniffer.View
                 });\r
                 list.AddRange(shipRecords);\r
             }\r
-            if (sniffer.BaseAirCorps != null)\r
+            if (sniffer.AirBase != null)\r
             {\r
                 var name = new[] {"第一", "第二", "第三"};\r
-                foreach (var baseInfo in sniffer.BaseAirCorps)\r
+                foreach (var baseInfo in sniffer.AirBase)\r
                 {\r
                     list.Add(new Record {Fleet = baseInfo.AreaName + " 基地航空隊"});\r
                     var i = 0;\r
@@ -193,37 +193,43 @@ namespace KancolleSniffer.View
                     {\r
                         if (i >= name.Length)\r
                             break;\r
-                        var corpsFp = airCorps.FighterPower;\r
+                        var corpsFp = airCorps.CalcFighterPower();\r
+                        var airCombat = new[] { (int)corpsFp[0].AirCombat, (int)corpsFp[1].AirCombat };\r
+                        var interception = new[] { (int)corpsFp[0].Interception, (int)corpsFp[1].Interception };\r
+                        var different = interception[0] != airCombat[0];\r
                         string spec;\r
                         string spec2;\r
                         if (airCorps.Action == 2)\r
                         {\r
-                            spec = "制空:" + RangeString(corpsFp.Interception);\r
-                            spec2 = corpsFp.IsInterceptor ? "制空(出撃):" + RangeString(corpsFp.AirCombat) : "";\r
+                            spec = "制空:" + RangeString(interception);\r
+                            spec2 = different ? "制空(出撃):" + RangeString(airCombat) : "";\r
                         }\r
                         else\r
                         {\r
-                            spec = "制空:" + RangeString(corpsFp.AirCombat);\r
-                            spec2 = corpsFp.IsInterceptor ? "制空(防空):" + RangeString(corpsFp.Interception) : "";\r
+                            spec = "制空:" + RangeString(airCombat);\r
+                            spec2 = different ? "制空(防空):" + RangeString(interception) : "";\r
                         }\r
                         var cost = airCorps.CostForSortie;\r
                         list.Add(new Record\r
                         {\r
                             Ship = name[i++] + " " + airCorps.ActionName,\r
                             Ship2 = $"出撃コスト:燃{cost[0]}弾{cost[1]}",\r
-                            Spec = spec + " 距離:" + airCorps.Distance,\r
+                            Spec = spec + $" 距離:{airCorps.Distance}",\r
                             Spec2 = spec2\r
                         });\r
                         list.AddRange(airCorps.Planes.Select(plane =>\r
                         {\r
                             var planeFp = plane.FighterPower;\r
+                            airCombat = new[] {(int)planeFp[0].AirCombat, (int)planeFp[1].AirCombat};\r
+                            interception = new[] {(int) planeFp[0].Interception, (int)planeFp[1].Interception };\r
+                            different = interception[0] != airCombat[0];\r
                             return new Record\r
                             {\r
                                 Equip = plane.State != 1 ? plane.StateName : GenEquipString(plane.Slot),\r
                                 Spec = plane.State != 1 ? "" : $"+{plane.Slot.Alv} {plane.Count}/{plane.MaxCount}",\r
                                 AircraftSpec =\r
-                                    $"距離:{plane.Slot.Spec.Distance} 制空:{RangeString(planeFp.AirCombat)}" +\r
-                                    (planeFp.IsInterceptor ? $" 防空:{RangeString(planeFp.Interception)}" : ""),\r
+                                    $"距離:{plane.Slot.Spec.Distance} 制空:{RangeString(airCombat)}" +\r
+                                    (different ? $" 防空:{RangeString(interception)}" : ""),\r
                                 Color = plane.Slot.Spec.Color\r
                             };\r
                         }));\r