Add unit support costs

This isn't perfect, as we don't track whether a unit was captured (and is therefore free) but it's a start.

Author: TomWerner

C7/Game.cs

@@ -298,6 +298,9 @@ public override void _Process(double delta) {
 				if (Input.IsKeyPressed(Godot.Key.F1)) {
 					EmitSignal(SignalName.ShowSpecificAdvisor, "F1");
 				}
+				if (Input.IsKeyPressed(Godot.Key.F3)) {
+					EmitSignal(SignalName.ShowSpecificAdvisor, "F3");
+				}
 				if (Input.IsKeyPressed(Godot.Key.F6)) {
 					EmitSignal(SignalName.ShowSpecificAdvisor, "F6");
 				}

C7/UIElements/Advisors/Advisors.cs

@@ -12,6 +12,7 @@ public partial class Advisors : CenterContainer {
 	private ILogger log = LogManager.ForContext<Advisors>();
 
 	private DomesticAdvisor domesticAdvisor;
+	private MilitaryAdvisor militaryAdvisor;
 	private ScienceAdvisor scienceAdvisor;
 
 	// A list of all the non-null advisors, so we can hide them whenever we
@@ -33,10 +34,6 @@ private void ShowLatestAdvisor() {
 		this.Show();
 	}
 
-	private void _on_Advisor_hide() {
-		this.Hide();
-	}
-
 	private void OnShowSpecificAdvisor(string advisorType) {
 		// Hide any existing advisors so we can draw the requested one.
 		foreach (TextureRect tr in advisors) {
@@ -54,6 +51,17 @@ private void OnShowSpecificAdvisor(string advisorType) {
 			AddChild(domesticAdvisor);
 			this.Show();
 		}
+		if (advisorType.Equals("F3")) {
+			if (militaryAdvisor != null) {
+				RemoveChild(militaryAdvisor);
+				militaryAdvisor = null;
+			}
+
+			militaryAdvisor = new MilitaryAdvisor();
+			advisors.Add(militaryAdvisor);
+			AddChild(militaryAdvisor);
+			this.Show();
+		}
 		if (advisorType.Equals("F6")) {
 			// TODO: What's the best way to refresh the tech tree UI without
 			// adding too many children?

C7/UIElements/Advisors/MilitaryAdvisor.cs

@@ -0,0 +1,74 @@
+using C7Engine;
+using C7GameData;
+using Godot;
+using System;
+
+public partial class MilitaryAdvisor : TextureRect {
+	Label totalUnitsLabel = new();
+	Label allowedUnitsLabel = new();
+	Label unitSupportCostLabel = new();
+
+	public override void _Ready() {
+		this.CreateUI();
+	}
+
+	private void CreateUI() {
+		this.Texture = Util.LoadTextureFromPCX("Art/Advisors/military.pcx");
+
+		//TODO: Age-based background.  Only use Ancient for now.
+		ImageTexture AdvisorHappy = Util.LoadTextureFromPCX("Art/SmallHeads/popupMILITARY.pcx", 1, 40, 149, 110);
+		ImageTexture AdvisorAngry = Util.LoadTextureFromPCX("Art/SmallHeads/popupMILITARY.pcx", 151, 40, 149, 110);
+		ImageTexture AdvisorSad = Util.LoadTextureFromPCX("Art/SmallHeads/popupMILITARY.pcx", 301, 40, 149, 110);
+		ImageTexture AdvisorSurprised = Util.LoadTextureFromPCX("Art/SmallHeads/popupMILITARY.pcx", 451, 40, 149, 110);
+
+		TextureRect AdvisorHead = new TextureRect();
+		//TODO: Randomize or set logically
+		AdvisorHead.Texture = AdvisorSurprised;
+		AdvisorHead.SetPosition(new Vector2(851, 0));
+		AddChild(AdvisorHead);
+
+		ImageTexture DialogBoxTexture = Util.LoadTextureFromPCX("Art/Advisors/dialogbox.pcx");
+		TextureButton DialogBox = new TextureButton();
+		DialogBox.TextureNormal = DialogBoxTexture;
+		DialogBox.SetPosition(new Vector2(806, 110));
+		AddChild(DialogBox);
+
+		//TODO: Multi-line capabilities
+		Label DialogBoxAdvise = new Label();
+		DialogBoxAdvise.Text = "You are running C7!";
+		DialogBoxAdvise.SetPosition(new Vector2(815, 119));
+		AddChild(DialogBoxAdvise);
+
+		ImageTexture GoBackTexture = Util.LoadTextureFromPCX("Art/exitBox-backgroundStates.pcx", 0, 0, 72, 48);
+		TextureButton GoBackButton = new TextureButton();
+		GoBackButton.TextureNormal = GoBackTexture;
+		GoBackButton.SetPosition(new Vector2(952, 720));
+		AddChild(GoBackButton);
+		GoBackButton.Pressed += ReturnToMenu;
+
+		using (UIGameDataAccess gameDataAccess = new()) {
+			Player player = gameDataAccess.gameData.GetHumanPlayers()[0];
+			var (totalUnits, allowedUnits, unitSupportCost) = player.TotalUnitsAllowedUnitsAndSupportCost();
+
+			AddChild(totalUnitsLabel);
+			totalUnitsLabel.SetPosition(new Vector2(0, 90));
+			totalUnitsLabel.SetTextAndCenterLabel($"Total Units\n{totalUnits}");
+			totalUnitsLabel.Position += new Vector2(-50, 0);
+
+			AddChild(allowedUnitsLabel);
+			allowedUnitsLabel.SetPosition(new Vector2(0, 139));
+			allowedUnitsLabel.SetTextAndCenterLabel($"Allowed Units\n{allowedUnits}");
+			allowedUnitsLabel.Position += new Vector2(-50, 0);
+
+			AddChild(unitSupportCostLabel);
+			unitSupportCostLabel.SetPosition(new Vector2(0, 188));
+			unitSupportCostLabel.SetTextAndCenterLabel($"Unit Support Cost\n{unitSupportCost} gold/turn");
+			unitSupportCostLabel.Position += new Vector2(-50, 0);
+		}
+
+	}
+
+	private void ReturnToMenu() {
+		GetParent<Advisors>().Hide();
+	}
+}

C7/UIElements/GameStatus/LowerRightInfoBox.cs

@@ -178,7 +178,7 @@ public override void _Process(double delta) {
 				if (goldPerTurn >= 0) {
 					yearAndGold.Text = $"Turn {turnNumber}  {gold} Gold (+{goldPerTurn} per turn)";
 				} else {
-					yearAndGold.Text = $"Turn {turnNumber}  {gold} Gold (-{goldPerTurn} per turn)";
+					yearAndGold.Text = $"Turn {turnNumber}  {gold} Gold ({goldPerTurn} per turn)";
 				}
 			}
 

C7Engine/EntryPoints/TurnHandling.cs

@@ -45,6 +45,7 @@ internal static void AdvanceTurn() {
 				gameData.turn++;
 				foreach (Player player in gameData.players) {
 					HandleCityResults(gameData, player);
+					player.DoPerTurnFinanceUpdates(gameData);
 
 					// TODO: This isn't quite accurate. This should only be
 					// incremented if the player is actually spending money on
@@ -184,9 +185,6 @@ private static void HandleCityResults(GameData gameData, Player player) {
 
 					city.SetItemBeingProduced(CityProductionAI.GetNextItemToBeProduced(city, producedItem));
 				}
-
-				city.owner.gold += city.CurrentCommerceYield().taxes;
-				city.owner.beakers += city.CurrentCommerceYield().beakers;
 			}
 		}
 

C7GameData/Player.cs

@@ -218,6 +218,11 @@ public int CalculateGoldPerTurn() {
 			foreach (City city in cities) {
 				result += city.CurrentCommerceYield().taxes;
 			}
+			
+			// Subtract unit support costs, if any.
+			var (_, _, unitSupportCost) = TotalUnitsAllowedUnitsAndSupportCost();
+			result -= unitSupportCost;
+
 			return result;
 		}
 
@@ -282,6 +287,41 @@ public int EstimateTurnsToResearch(Tech tech) {
 			}
 			return result;
 		}
+
+		public void DoPerTurnFinanceUpdates(GameData gameData) {
+			// Process per-city contributions.
+			//
+			// TODO: consider making this return a tuple too. Or maybe return all
+			// the gold accounting stuff in a struct, for one pass over the cities.
+			foreach (City city in cities) {
+				beakers += city.CurrentCommerceYield().beakers;
+			}
+			gold += CalculateGoldPerTurn();
+		}
+
+		public (int, int, int) TotalUnitsAllowedUnitsAndSupportCost() {
+			int freeUnits = 0;
+
+			foreach (City city in cities) {
+				// TODO: Import these sizes from Rule.cs in the biq. Maybe have
+				// them live in the city class?
+				if (city.size <= 6) {
+					freeUnits += government.freeUnitsPerTown;
+				} else if (city.size <= 12) {
+					freeUnits += government.freeUnitsPerCity;
+				} else {
+					freeUnits += government.freeUnitsPerMetropolis;
+				}
+			}
+			if (government.allUnitsFree) {
+				freeUnits = units.Count;
+			}
+
+			int totalUnits = units.Count;
+			int allowedUnits = freeUnits;
+			int unitSupportCost = Math.Max(0, (totalUnits - allowedUnits) * government.unitCost);
+			return (totalUnits, allowedUnits, unitSupportCost);
+		}
 	}
 
 }