var subm = s.RealAntiSubmarine;\r
var torp = s.RealTorpedo;\r
var night = s.NightBattlePower;\r
- ships.Add(new EquipColumn\r
+ var ship = new EquipColumn\r
{\r
Ship = (s.Escaped ? "[避]" : "") + s.Name + " Lv" + s.Level,\r
Id = s.Id,\r
Spec = (fire == 0 ? "" : $"砲{fire:f1}") + (subm == 0 ? "" : $" 潜{subm:f1}"),\r
Spec2 = (torp == 0 ? "" : $"雷{torp:f1}") + (night == 0 ? "" : $" 夜{night:f1}")\r
// ReSharper restore CompareOfFloatsByEqualityOperator\r
- });\r
+ };\r
+ if (ship.Spec == "")\r
+ {\r
+ ship.Spec = ship.Spec2;\r
+ ship.Spec2 = "";\r
+ }\r
+ ships.Add(ship);\r
ships.AddRange(equips);\r
}\r
list.Add(new EquipColumn\r