Merge pull request #836 from stavrosfa/improvement/tech-research-improvements

Research improvements

Author: stavrosfa

C7/Game.cs

@@ -322,10 +322,14 @@ private void OnPlayerStartTurn() {
 			// once they have a city.
 			if (controller.cities.Count > 0
 					&& controller.currentlyResearchedTech == null
-					&& controller.GetAvailableTechsToResearch(gameData).Count > 0) {
+					&& controller.GetAvailableTechsToResearch(gameData.techs).Count > 0) {
 				popupOverlay.ShowPopup(
 						new ScienceSelection(controller),
 						PopupOverlay.PopupCategory.Info);
+
+				if (controller.currentlyResearchedTech == null && controller.GetAvailableTechsToResearch(gameData.techs).Count > 0) {
+					PlayerAI.MaybePickTechToResearch(controller, gameData.techs);
+				}
 			}
 
 			// Allow fast forwarding in observer mode.

C7/UIElements/Advisors/ScienceAdvisor.cs

@@ -38,10 +38,10 @@ public override void _Ready() {
 		this.CreateUI();
 
 		EngineStorage.ReadGameData((GameData gameData) => {
-			List<Tech> techs = gameData.techs;
+			List<Tech> allTechs = gameData.techs;
 			Player player = gameData.GetFirstHumanPlayer();
 			eraName = string.IsNullOrEmpty(lastOpenedEra) ? player.eraCivilopediaName : lastOpenedEra;
-			this.DrawTechTree(eraName, player, techs, player.GetAvailableTechsToResearch(gameData));
+			this.DrawTechTree(eraName, player, allTechs, player.GetAvailableTechsToResearch(allTechs));
 		});
 	}
 
@@ -205,12 +205,12 @@ private void ChangeEraAndDrawTree(int delta) {
 		techBoxes.Clear();
 
 		EngineStorage.ReadGameData((GameData gameData) => {
-			List<Tech> techs = gameData.techs;
+			List<Tech> allTechs = gameData.techs;
 			Player player = gameData.GetFirstHumanPlayer();
 			eraName = string.IsNullOrEmpty(lastOpenedEra)
 				? EraIndexToEra(GetEraIndex(eraName) + delta)
 				: EraIndexToEra(GetEraIndex(lastOpenedEra) + delta);
-			DrawTechTree(eraName, player, techs, player.GetAvailableTechsToResearch(gameData));
+			DrawTechTree(eraName, player, allTechs, player.GetAvailableTechsToResearch(allTechs));
 		});
 	}
 

C7/UIElements/Popups/ScienceSelection.cs

@@ -79,7 +79,7 @@ private OptionButton MakeStyledOptionButton() {
 				AddItem(gameData, player.ResearchQueue.Peek(), optionButton);
 			}
 			// then the rest
-			foreach (Tech tech in player.GetAvailableTechsToResearch(gameData)) {
+			foreach (Tech tech in player.GetAvailableTechsToResearch(gameData.techs)) {
 				if (!options.Contains(tech)) {
 					AddItem(gameData, tech, optionButton);
 				}

C7Engine/AI/PlayerAI.cs

@@ -68,17 +68,20 @@ private static void MaybeDoPriorityReevaluation(Player player) {
 			}
 		}
 
-		private static void MaybePickTechToResearch(Player player, List<Tech> techs) {
-			while (player.currentlyResearchedTech == null) {
-				Tech toResearch = PickTechToResearch(player, techs);
+		public static void MaybePickTechToResearch(Player player, List<Tech> techs) {
+			while (player.currentlyResearchedTech == null || player.knownTechs.Contains(player.currentlyResearchedTech)) {
+				Tech toResearch = player.GetAvailableTechsToResearch(techs).FirstOrDefault();
 				if (toResearch == null) {
 					log.Information($"Player {player.civilization.name} has no techs available to research.");
 					player.SetCurrentlyResearchedTech(null);
 					break;
-				} else {
-					log.Information($"Player {player.civilization.name} is researching {toResearch.Name}.");
-					player.SetCurrentlyResearchedTech(toResearch.id);
 				}
+
+				if (player.ResearchQueue.Count <= 0) {
+					player.AddTechItemToResearchQueue(toResearch);
+				}
+				player.SetCurrentlyResearchedTech(player.ResearchQueue.Peek().id);
+				log.Information($"Player {player.civilization.name} is researching {player.ResearchQueue.Peek().Name}.");
 			}
 		}
 
@@ -268,39 +271,6 @@ private static UnitAI GetCombatAIIfUnitCanAttackNearbyBarbCamp(MapUnit unit, Pla
 			return null;
 		}
 
-		private static Tech PickTechToResearch(Player player, List<Tech> techs) {
-			List<Tech> possibleTechs = new();
-
-			// Figure out what techs we're allowed to research.
-			foreach (Tech tech in techs) {
-				if (tech.EraCivilopediaName != player.eraCivilopediaName) {
-					continue;
-				}
-				if (player.knownTechs.Contains(tech.id)) {
-					continue;
-				}
-
-				bool prereqsKnown = true;
-				foreach (Tech prereq in tech.Prerequisites) {
-					if (!player.knownTechs.Contains(prereq.id)) {
-						prereqsKnown = false;
-						break;
-					}
-				}
-				if (!prereqsKnown) {
-					continue;
-				}
-				possibleTechs.Add(tech);
-			}
-
-			if (possibleTechs.Count == 0) {
-				return null;
-			}
-
-			// Details on how Civ3 does it: https://forums.civfanatics.com/threads/what-will-the-ai-research-next.45559/
-			return possibleTechs[(int)GameData.rng.NextInt64(possibleTechs.Count)];
-		}
-
 		private static async Task AttemptTrading(Player us) {
 			GameData gD = EngineStorage.gameData;
 

C7Engine/C7GameData/GameData.cs

@@ -106,6 +106,10 @@ public Player GetPlayer(ID id) {
 			return players.Find(p => p.id == id);
 		}
 
+		public Tech GetTech(ID id) {
+			return techs.Find(p => p.id == id);
+		}
+
 		public ExperienceLevel GetExperienceLevelAfter(ExperienceLevel experienceLevel) {
 			int n = experienceLevels.IndexOf(experienceLevel);
 			if (n + 1 < experienceLevels.Count)

C7Engine/C7GameData/Player.cs

@@ -142,7 +142,7 @@ public void SetCurrentlyResearchedTech(ID id) {
 
 				Tech tech = EngineStorage.gameData.techs.Find(x => x.id == id);
 				log.Information($"Awarding {tech.Name} to player {this}");
-				CompleteResearchingTech(EngineStorage.gameData, tech);
+				CompleteResearchAndBeginNew(EngineStorage.gameData, tech);
 				return;
 			}
 
@@ -363,13 +363,8 @@ public void ExecuteDeal(GameData gameData, Player other, TradeOffer theirOffer,
 				other.gold -= theirOffer.gold.Value;
 			}
 
-			foreach (Tech t in ourOffer.techs) {
-				other.knownTechs.Add(t.id);
-			}
-
-			foreach (Tech t in theirOffer.techs) {
-				this.knownTechs.Add(t.id);
-			}
+			other.CompleteResearchAndBeginNew(gameData, ourOffer.techs);
+			this.CompleteResearchAndBeginNew(gameData, theirOffer.techs);
 		}
 
 		public int EstimateTurnsToResearch(GameData gameData, Tech tech) {
@@ -444,9 +439,7 @@ private Queue<Tech> GetResearchQueueFor(Tech tech, Queue<Tech> tempQueue) {
 				return new Queue<Tech>();
 			}
 
-			// TODO: maybe sort these on some other score, perhaps the order the AI would have picked them
-			// Right now the tech with the highest cost comes first
-			List<Tech> requiredTechs = tech.Prerequisites.OrderBy(t => t.Cost).ToList();
+			List<Tech> requiredTechs = OrderTechs(tech.Prerequisites).ToList();
 
 			// first, add the tech the user clicked
 			if (!tempQueue.Contains(tech)) {
@@ -473,9 +466,14 @@ private Queue<Tech> GetResearchQueueFor(Tech tech, Queue<Tech> tempQueue) {
 			return tempQueue;
 		}
 
-		public HashSet<Tech> GetAvailableTechsToResearch(GameData gameData) {
+		/// <summary>
+		/// Takes all the techs in the game and keeps only what could be researched next at a particular point in the game.
+		/// </summary>
+		/// <param name="allTechs"></param>
+		/// <returns></returns>
+		public HashSet<Tech> GetAvailableTechsToResearch(List<Tech> allTechs) {
 			HashSet<Tech> result = new();
-			foreach (Tech tech in gameData.techs) {
+			foreach (Tech tech in allTechs) {
 				if (knownTechs.Contains(tech.id)) {
 					continue;
 				}
@@ -494,7 +492,17 @@ public HashSet<Tech> GetAvailableTechsToResearch(GameData gameData) {
 					result.Add(tech);
 				}
 			}
-			return result;
+			return OrderTechs(result.ToList());
+		}
+
+		// Placeholder ordering of techs
+		private HashSet<Tech> OrderTechs(List<Tech> techs) {
+			if (techs == null || techs.Count == 0) {
+				return new HashSet<Tech>();
+			}
+			// TODO: We would want to eventually order them based on how the AI would do it
+			// Details on how Civ3 does it: https://forums.civfanatics.com/threads/what-will-the-ai-research-next.45559/
+			return techs.OrderBy(t => t.Cost).ToHashSet();
 		}
 
 		public List<Government> GetAvailableGovernments(GameData gameData) {
@@ -679,7 +687,18 @@ public void DoPerTurnScienceUpdates(GameData gameData) {
 				return;
 			}
 
+			CompleteResearchAndBeginNew(gameData, tech);
+		}
+
+		private void CompleteResearchAndBeginNew(GameData gameData, IEnumerable<Tech> techs) {
+			foreach (Tech tech in techs) {
+				CompleteResearchingTech(gameData, tech);
+			}
+			PlayerAI.MaybePickTechToResearch(this, gameData.techs);
+		}
+		private void CompleteResearchAndBeginNew(GameData gameData, Tech tech) {
 			CompleteResearchingTech(gameData, tech);
+			PlayerAI.MaybePickTechToResearch(this, gameData.techs);
 		}
 
 		private void CompleteResearchingTech(GameData gameData, Tech tech) {