Merge remote-tracking branch 'origin/develop' into develop

Author: Grabacr07

source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs

@@ -23,7 +23,7 @@ public class FleetStateViewModel : ViewModel
 
 		public string MaxAirSuperiorityPotential => this.Source.MaxAirSuperiorityPotential.ToString("##0");
 
-		public string ViewRange => this.Source.ViewRange.ToString("##0.##");
+		public string ViewRange => (Math.Floor(this.Source.ViewRange * 100) / 100).ToString("##0.##");
 
 		public string Speed
 		{

source/Grabacr07.KanColleWrapper/Models/ViewRange.cs

@@ -221,7 +221,7 @@ public override double Calc(Fleet[] fleets)
 			var itemScore = ships
 				.SelectMany(x => x.EquippedItems)
 				.Select(x => x.Item)
-				.Sum(x => (x.Info.ViewRange + GetAdeptCoefficient(x)) * GetTypeCoefficient(x.Info.Type));
+				.Sum(x => (x.Info.ViewRange + GetLevelCoefficient(x)) * GetTypeCoefficient(x.Info.Type));
 
 			var shipScore = ships
 				.Select(x => x.ViewRange - x.EquippedItems.Sum(s => s.Item.Info.RawData.api_saku))
@@ -255,17 +255,17 @@ private Ship[] GetTargetShips(Fleet[] fleets)
 			return new Ship[0];
 		}
 
-		private static double GetAdeptCoefficient(SlotItem item)
+		private static double GetLevelCoefficient(SlotItem item)
 		{
 			switch (item.Info.Type)
 			{
 				case SlotItemType.水上偵察機:
-					return Math.Sqrt(item.Adept) * 1.2;
+					return Math.Sqrt(item.Level) * 1.2;
 
 				case SlotItemType.小型電探:
 				case SlotItemType.大型電探:
 				case SlotItemType.大型電探_II:
-					return Math.Sqrt(item.Adept) * 1.25;
+					return Math.Sqrt(item.Level) * 1.25;
 
 				default:
 					return 0;