Keep track of player gold and display it in the lower right

This doesn't yet accurately display gold per turn, but tracking gold is needed for research. #392
C7-Game · Jan 26, 2025 · 0b49693 · 0b49693
1 parent 1630c5a
commit 0b49693
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 16 deletions.
diff --git a/C7/Game.cs b/C7/Game.cs
@@ -338,11 +338,13 @@ private void _onEndTurnButtonPressed() {
 
 	private void OnPlayerStartTurn() {
 		log.Information("Starting player turn");
-		int turnNumber = TurnHandling.GetTurnNumber();
-		EmitSignal(SignalName.TurnStarted, turnNumber);
-		CurrentState = GameState.PlayerTurn;
-
 		using (var gameDataAccess = new UIGameDataAccess()) {
+			int turnNumber = TurnHandling.GetTurnNumber();
+			Player player = gameDataAccess.gameData.GetHumanPlayers()[0];
+
+			EmitSignal(SignalName.TurnStarted, turnNumber, player.gold, /*goldPerTurn=*/0);
+			CurrentState = GameState.PlayerTurn;
+
 			GetNextAutoselectedUnit(gameDataAccess.gameData);
 		}
 	}

diff --git a/C7/Text/c7-static-map-save.json b/C7/Text/c7-static-map-save.json
@@ -61524,7 +61524,8 @@
       "hasPlayedCurrentTurn": false,
       "civilization": "A Barbarian Chiefdom",
       "cityNameIndex": 0,
-      "turnsUntilPriorityReevaluation": 0
+      "turnsUntilPriorityReevaluation": 0,
+      "gold": 10
     },
     {
       "id": "player-2",
@@ -61593,7 +61594,8 @@
         "tech-2"
       ],
       "eraCivilopediaName": "ERAS_Ancient_Times",
-      "turnsUntilPriorityReevaluation": 0
+      "turnsUntilPriorityReevaluation": 0,
+      "gold": 10
     },
     {
       "id": "player-3",
@@ -61662,7 +61664,8 @@
         "tech-2"
       ],
       "eraCivilopediaName": "ERAS_Ancient_Times",
-      "turnsUntilPriorityReevaluation": 0
+      "turnsUntilPriorityReevaluation": 0,
+      "gold": 10
     },
     {
       "id": "player-4",
@@ -61727,7 +61730,8 @@
         "tech-4"
       ],
       "eraCivilopediaName": "ERAS_Ancient_Times",
-      "turnsUntilPriorityReevaluation": 0
+      "turnsUntilPriorityReevaluation": 0,
+      "gold": 10
     },
     {
       "id": "player-5",
@@ -61796,7 +61800,8 @@
         "tech-2"
       ],
       "eraCivilopediaName": "ERAS_Ancient_Times",
-      "turnsUntilPriorityReevaluation": 0
+      "turnsUntilPriorityReevaluation": 0,
+      "gold": 10
     },
     {
       "id": "player-6",
@@ -61869,7 +61874,8 @@
         "tech-2"
       ],
       "eraCivilopediaName": "ERAS_Ancient_Times",
-      "turnsUntilPriorityReevaluation": 0
+      "turnsUntilPriorityReevaluation": 0,
+      "gold": 10
     },
     {
       "id": "player-7",
@@ -61938,7 +61944,8 @@
         "tech-4"
       ],
       "eraCivilopediaName": "ERAS_Ancient_Times",
-      "turnsUntilPriorityReevaluation": 0
+      "turnsUntilPriorityReevaluation": 0,
+      "gold": 10
     },
     {
       "id": "player-8",
@@ -62003,7 +62010,8 @@
         "tech-3"
       ],
       "eraCivilopediaName": "ERAS_Ancient_Times",
-      "turnsUntilPriorityReevaluation": 0
+      "turnsUntilPriorityReevaluation": 0,
+      "gold": 10
     }
   ],
   "barbarianInfo": {

diff --git a/C7/UIElements/GameStatus/GameStatus.cs b/C7/UIElements/GameStatus/GameStatus.cs
@@ -29,9 +29,9 @@ private void OnTurnEnded() {
 		LowerRightInfoBox.StopToggling();
 	}
 
-	private void OnTurnStarted(int turnNumber) {
+	private void OnTurnStarted(int turnNumber, int gold, int goldPerTurn) {
 		//Oh hai, we do need this handler here!
-		LowerRightInfoBox.SetTurn(turnNumber);
+		LowerRightInfoBox.SetTurnAndGold(turnNumber, gold, goldPerTurn);
 	}
 
 	private void OnNoMoreAutoselectableUnits() {

diff --git a/C7/UIElements/GameStatus/LowerRightInfoBox.cs b/C7/UIElements/GameStatus/LowerRightInfoBox.cs
@@ -143,8 +143,12 @@ public void UpdateUnitInfo(MapUnit NewUnit, TerrainType terrain) {
 
 	///This is going to evolve a lot over time.  Probably this info box will need to keep some local state.
 	///But for now it'll show the changing turn number, providing some interactivity
-	public void SetTurn(int turnNumber) {
-		yearAndGold.Text = $"Turn {turnNumber}  10 Gold (+0 per turn)";
+	public void SetTurnAndGold(int turnNumber, int gold, int goldPerTurn) {
+		if (goldPerTurn >= 0) {
+		yearAndGold.Text = $"Turn {turnNumber}  {gold} Gold (+{goldPerTurn} per turn)";
+		} else {
+		yearAndGold.Text = $"Turn {turnNumber}  {gold} Gold (-{goldPerTurn} per turn)";
+		}
 	}
 
 	public void UpdateTechProgress(string techName, int turnsRemaining) {

diff --git a/C7Engine/EntryPoints/TurnHandling.cs b/C7Engine/EntryPoints/TurnHandling.cs
@@ -159,6 +159,8 @@ private static void HandleCityResults(GameData gameData) {
 					}
 					city.SetItemBeingProduced(CityProductionAI.GetNextItemToBeProduced(city, producedItem));
 				}
+
+				city.owner.gold += city.CurrentCommerceYield();
 			}
 		}
 

diff --git a/C7GameData/City.cs b/C7GameData/City.cs
@@ -118,6 +118,8 @@ public int CurrentProductionYield() {
 			return yield;
 		}
 		public int CurrentCommerceYield() {
+			// TODO: Split this into science, entertainment, etc.
+
 			int yield = 3;  //city center min yield
 			foreach (CityResident r in residents) {
 				yield += r.tileWorked.commerceYield(owner);

diff --git a/C7GameData/ImportCiv3.cs b/C7GameData/ImportCiv3.cs
@@ -369,6 +369,9 @@ private void ImportBicLeaders() {
 				// Put the player in the correct starting era.
 				player.eraCivilopediaName = theBiq.Eras[lead.InitialEra].CivilopediaEntry;
 
+				// Give the correct amount of starting gold.
+				player.gold = lead.StartCash;
+
 				// Add the starting techs for scenarios.
 				if (theBiq.LeadTech != null) {
 					for (int j = 0; j < theBiq.LeadTech[leadIndex].Length; ++j) {
@@ -412,6 +415,8 @@ private void ImportSavLeaders() {
 					}
 				}
 
+				player.gold = leader.Gold;
+
 				save.Players.Add(player);
 				i++;
 			}

diff --git a/C7GameData/Player.cs b/C7GameData/Player.cs
@@ -37,6 +37,9 @@ public class Player {
 
 		public int turnsUntilPriorityReevaluation = 0;
 
+		// The amount of gold this player has.
+		public int gold = 0;
+
 		public void AddUnit(MapUnit unit) {
 			this.units.Add(unit);
 		}

diff --git a/C7GameData/Save/SavePlayer.cs b/C7GameData/Save/SavePlayer.cs
@@ -28,6 +28,9 @@ public class SavePlayer {
 
 		public int turnsUntilPriorityReevaluation = 0;
 
+		// The amount of gold this player has.
+		public int gold = 0;
+
 		public Player ToPlayer(GameMap map, List<Civilization> civilizations) {
 			Player player = new Player{
 				id = id,
@@ -41,6 +44,7 @@ public Player ToPlayer(GameMap map, List<Civilization> civilizations) {
 				knownTechs = knownTechs,
 				currentlyResearchedTech = currentlyResearchedTech,
 				eraCivilopediaName = eraCivilopediaName,
+				gold = gold,
 			};
 			foreach (TileLocation tile in tileKnowledge) {
 				player.tileKnowledge.AddTileToKnown(map.tileAt(tile.x, tile.y));
@@ -70,6 +74,7 @@ public SavePlayer(Player player) {
 			knownTechs = player.knownTechs;
 			currentlyResearchedTech = player.currentlyResearchedTech;
 			eraCivilopediaName = player.eraCivilopediaName;
+			gold = gold;
 		}
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -159,6 +159,8 @@ private static void HandleCityResults(GameData gameData) { @@
     					}
     					city.SetItemBeingProduced(CityProductionAI.GetNextItemToBeProduced(city, producedItem));
     				}
+    				city.owner.gold += city.CurrentCommerceYield();
     			}
     		}
@@ Expand Down @@