Track each player's beakers and turns researched

#392

C7/Text/c7-static-map-save.json

@@ -61528,7 +61528,9 @@
       "luxuryRate": 0,
       "scienceRate": 5,
       "taxRate": 5,
-      "gold": 10
+      "gold": 10,
+      "beakers": 0,
+      "turnsResearched": 0
     },
     {
       "id": "player-2",
@@ -61601,7 +61603,9 @@
       "luxuryRate": 0,
       "scienceRate": 5,
       "taxRate": 5,
-      "gold": 10
+      "gold": 10,
+      "beakers": 0,
+      "turnsResearched": 0
     },
     {
       "id": "player-3",
@@ -61674,7 +61678,9 @@
       "luxuryRate": 0,
       "scienceRate": 5,
       "taxRate": 5,
-      "gold": 10
+      "gold": 10,
+      "beakers": 0,
+      "turnsResearched": 0
     },
     {
       "id": "player-4",
@@ -61743,7 +61749,9 @@
       "luxuryRate": 0,
       "scienceRate": 5,
       "taxRate": 5,
-      "gold": 10
+      "gold": 10,
+      "beakers": 0,
+      "turnsResearched": 0
     },
     {
       "id": "player-5",
@@ -61816,7 +61824,9 @@
       "luxuryRate": 0,
       "scienceRate": 5,
       "taxRate": 5,
-      "gold": 10
+      "gold": 10,
+      "beakers": 0,
+      "turnsResearched": 0
     },
     {
       "id": "player-6",
@@ -61893,7 +61903,9 @@
       "luxuryRate": 0,
       "scienceRate": 5,
       "taxRate": 5,
-      "gold": 10
+      "gold": 10,
+      "beakers": 0,
+      "turnsResearched": 0
     },
     {
       "id": "player-7",
@@ -61966,7 +61978,9 @@
       "luxuryRate": 0,
       "scienceRate": 5,
       "taxRate": 5,
-      "gold": 10
+      "gold": 10,
+      "beakers": 0,
+      "turnsResearched": 0
     },
     {
       "id": "player-8",
@@ -62035,7 +62049,9 @@
       "luxuryRate": 0,
       "scienceRate": 5,
       "taxRate": 5,
-      "gold": 10
+      "gold": 10,
+      "beakers": 0,
+      "turnsResearched": 0
     }
   ],
   "barbarianInfo": {

C7Engine/EntryPoints/MessageToEngine.cs

@@ -149,7 +149,7 @@ public override void process() {
 			}
 
 			// Start researching this tech and update the UI.
-			player.currentlyResearchedTech = requestedTech.id;
+			player.SetCurrentlyResearchedTech(requestedTech.id);
 			new MsgUpdateUiAfterTechSelection().send();
 		}
 	}

C7Engine/EntryPoints/TurnHandling.cs

@@ -3,6 +3,7 @@
 using Serilog;
 
 namespace C7Engine {
+	using System;
 	using C7GameData;
 
 	public class TurnHandling {
@@ -44,6 +45,9 @@ internal static void AdvanceTurn() {
 				gameData.UpdateTileOwners();
 
 				gameData.turn++;
+				foreach (Player player in gameData.players) {
+					player.turnsResearched++;
+				}
 				OnBeginTurn();
 			}
 		}
@@ -160,7 +164,8 @@ private static void HandleCityResults(GameData gameData) {
 					city.SetItemBeingProduced(CityProductionAI.GetNextItemToBeProduced(city, producedItem));
 				}
 
-				city.owner.gold += city.CurrentCommerceYield();
+				city.owner.gold += (int)Math.Floor(city.CurrentCommerceYield() * city.owner.taxRate / 10.0);
+				city.owner.beakers += (int)Math.Floor(city.CurrentCommerceYield() * city.owner.scienceRate / 10.0);
 			}
 		}
 

C7GameData/ImportCiv3.cs

@@ -422,6 +422,8 @@ private void ImportSavLeaders() {
 				}
 
 				player.gold = leader.Gold;
+				player.beakers = leader.Beakers;
+				player.turnsResearched = leader.TurnsResearched;
 				player.scienceRate = leader.ScienceRate;
 				player.luxuryRate = leader.LuxuryRate;
 				player.taxRate = leader.TaxRate;

C7GameData/Player.cs

@@ -27,7 +27,7 @@ public class Player {
 		public HashSet<ID> knownTechs = new();
 
 		// The tech the player is currently researching.
-		public ID currentlyResearchedTech;
+		public ID currentlyResearchedTech { get; private set; }
 
 		// The civilopedia name of the era this player is in.
 		//
@@ -48,10 +48,25 @@ public class Player {
 		// The amount of gold this player has.
 		public int gold = 0;
 
+		// The number of "beakers" (gold) spent on the currently researched
+		// tech.
+		public int beakers = 0;
+
+		// The number of turns the player has been researching the current tech.
+		public int turnsResearched = 0;
+
 		public void AddUnit(MapUnit unit) {
 			this.units.Add(unit);
 		}
 
+		public void SetCurrentlyResearchedTech(ID id) {
+			currentlyResearchedTech = id;
+
+			// Clear out previous progress.
+			beakers = 0;
+			turnsResearched = 0;
+		}
+
 		public string GetNextCityName() {
 			string name = civilization.cityNames[cityNameIndex % civilization.cityNames.Count];
 			int bonusLoops = cityNameIndex / civilization.cityNames.Count;

C7GameData/Save/SavePlayer.cs

@@ -39,6 +39,13 @@ public class SavePlayer {
 		// The amount of gold this player has.
 		public int gold = 0;
 
+		// The number of "beakers" (gold) spent on the currently researched
+		// tech.
+		public int beakers = 0;
+
+		// The number of turns the player has been researching the current tech.
+		public int turnsResearched = 0;
+
 		public Player ToPlayer(GameMap map, List<Civilization> civilizations) {
 			Player player = new Player{
 				id = id,
@@ -50,7 +57,6 @@ public Player ToPlayer(GameMap map, List<Civilization> civilizations) {
 				cityNameIndex = cityNameIndex,
 				tileKnowledge = new TileKnowledge(),
 				knownTechs = knownTechs,
-				currentlyResearchedTech = currentlyResearchedTech,
 				eraCivilopediaName = eraCivilopediaName,
 				luxuryRate = luxuryRate,
 				scienceRate = scienceRate,
@@ -65,6 +71,14 @@ public Player ToPlayer(GameMap map, List<Civilization> civilizations) {
 					player.knownTechs.Add(techId);
 				}
 			}
+
+			// Because of the custom setter we need to set the researched tech
+			// and then set the beakers and turns researched - otherwise they'd
+			// be reset by the setter.
+			player.SetCurrentlyResearchedTech(currentlyResearchedTech);
+			player.beakers = beakers;
+			player.turnsResearched = turnsResearched;
+
 			return player;
 		}
 
@@ -89,6 +103,8 @@ public SavePlayer(Player player) {
 			scienceRate = player.scienceRate;
 			taxRate = player.taxRate;
 			gold = player.gold;
+			beakers = player.beakers;
+			turnsResearched = player.turnsResearched;
 		}
 	}
 }