Fixed fuel usage change when sending a fleet

Author: Ivan Kravarščan

source/Stareater.Core/Controllers/PlayerController.cs

@@ -175,13 +175,9 @@ public IEnumerable<FleetInfo> FleetsMine
 			get
 			{
 				var game = this.gameInstance;
-				var orders = game.Orders[this.PlayerInstance(game)].ShipOrders;
-				var player = this.PlayerInstance(game);
 
-				return game.States.Fleets.
-					OwnedBy[player].
-					Where(x => !orders.ContainsKey(x.Position)).
-					Concat(orders.SelectMany(x => x.Value)).
+				return game.Derivates[this.PlayerInstance(game)].
+					MyFleets(game).
 					Select(
 						x => new FleetInfo(x, game.Derivates[x.Owner], game.Statics)
 					);

source/Stareater.Core/GameLogic/PlayerProcessor.cs

@@ -270,13 +270,19 @@ public void CalculateStareater(MainGame game)
 			}
 		}
 
-		public double TotalFuelUsage(MainGame game)
+		public IEnumerable<Fleet> MyFleets(MainGame game)
 		{
-			//TODO(v0.8) duplicate from PlayerController.FleetsMine
+			var orders = game.Orders[this.Player].ShipOrders;
+
 			return game.States.Fleets.
-				OwnedBy[this.Player].
-				Concat(game.Orders[this.Player].ShipOrders.SelectMany(x => x.Value)).
-				Sum(fleet => this.FuelUsage(fleet, game));
+				OwnedBy [this.Player].
+				Where(x => !orders.ContainsKey(x.Position)).
+				Concat(orders.SelectMany(x => x.Value));
+		}
+
+		public double TotalFuelUsage(MainGame game)
+		{
+			return this.MyFleets(game).Sum(fleet => this.FuelUsage(fleet, game));
 		}
 
 		public double FuelUsage(Fleet fleet, MainGame game)

source/Stareater.UI.WinForms/GameScenes/GalaxyScene.cs

@@ -338,7 +338,7 @@ private void setupFleetMovement()
 				).ToList()
 			);
 		}
-		
+
 		//TODO(v0.8) bundle with movement simulation
 		private void setupMovementEta()
 		{
@@ -352,28 +352,25 @@ private void setupMovementEta()
 
 			var waypoints = this.SelectedFleet.SimulationWaypoints();
 
-			if (waypoints.Count > 0 && this.SelectedFleet.SimulationEta > 0)
-			{
-				var destination = waypoints[waypoints.Count - 1];
-				var numVars = new Var("eta", Math.Ceiling(this.SelectedFleet.SimulationEta)).Get;
-				var textVars = new TextVar("eta", new DecimalsFormatter(0, 1).Format(this.SelectedFleet.SimulationEta, RoundingMethod.Ceil, 0)).
-					And("fuel", new ThousandsFormatter().Format(this.SelectedFleet.SimulationFuel)).Get;
+			var destination = waypoints[waypoints.Count - 1];
+			var numVars = new Var("eta", Math.Ceiling(this.SelectedFleet.SimulationEta)).Get;
+			var textVars = new TextVar("eta", new DecimalsFormatter(0, 1).Format(this.SelectedFleet.SimulationEta, RoundingMethod.Ceil, 0)).
+				And("fuel", new ThousandsFormatter().Format(this.SelectedFleet.SimulationFuel)).Get;
 
-				this.UpdateScene(
-					ref this.movementEtaText,
-					new SceneObjectBuilder().
-						StartSprite(EtaZ, TextRenderUtil.Get.TextureId, Color.White).
-						Scale(EtaTextScale / (float)Math.Pow(ZoomBase, zoomLevel)).
-						Translate(destination.X, destination.Y + 0.5).
-						AddVertices(
-							TextRenderUtil.Get.BufferText(
-								LocalizationManifest.Get.CurrentLanguage["FormMain"]["FleetEta"].Text(numVars, textVars),
-								-0.5f,
-								Matrix4.Identity
-						)).
-						Build()
-				);
-			}
+			this.UpdateScene(
+				ref this.movementEtaText,
+				new SceneObjectBuilder().
+					StartSprite(EtaZ, TextRenderUtil.Get.TextureId, Color.White).
+					Scale(EtaTextScale / (float)Math.Pow(ZoomBase, zoomLevel)).
+					Translate(destination.X, destination.Y + 0.5).
+					AddVertices(
+						TextRenderUtil.Get.BufferText(
+							LocalizationManifest.Get.CurrentLanguage["FormMain"]["FleetEta"].Text(numVars, textVars),
+							-0.5f,
+							Matrix4.Identity
+					)).
+					Build()
+			);
 		}
 
 		private void setupMovementSimulation()