Merge pull request #367 from C7-Game/241-Remove-Citizens-From-Destroyed-Cities

Author: QuintillusCFC

C7Engine/EntryPoints/CityInteractions.cs

@@ -21,5 +21,14 @@ public static void BuildCity(int x, int y, string playerGuid, string name)
 			tileWithNewCity.cityAtTile = newCity;
 			tileWithNewCity.overlays.road = true;
 		}
+
+		public static void DestroyCity(int x, int y) {
+			Tile tile = EngineStorage.gameData.map.tileAt(x, y);
+			tile.DisbandNonDefendingUnits();
+			tile.cityAtTile.RemoveAllCitizens();
+			tile.cityAtTile.owner.cities.Remove(tile.cityAtTile);
+			EngineStorage.gameData.cities.Remove(tile.cityAtTile);
+			tile.cityAtTile = null;
+		}
 	}
 }

C7Engine/EntryPoints/TurnHandling.cs

@@ -115,9 +115,7 @@ internal static void AdvanceTurn()
 						if (newSize <= 0) {
 							log.Error($"Attempting to remove the last resident from {city}");
 						} else {
-							for (int i = 0; i < diff; i++) {
-								city.removeCitizen();
-							}
+							city.RemoveCitizens(diff);
 						}
 					}
 
@@ -137,9 +135,7 @@ internal static void AdvanceTurn()
 							city.owner.AddUnit(newUnit);
 
 							if (newUnit.unitType.populationCost > 0) {
-								for (int i = 0; i < newUnit.unitType.populationCost; i++) {
-									city.removeCitizen();
-								}
+								city.RemoveCitizens(newUnit.unitType.populationCost);
 							}
 						}
 						city.SetItemBeingProduced(CityProductionAI.GetNextItemToBeProduced(city, producedItem));

C7Engine/MapUnitExtensions.cs

@@ -300,10 +300,7 @@ public static void OnEnterTile(this MapUnit unit, Tile tile)
 
 		// Destroy enemy city on tile
 		if (tile.HasCity && !unit.owner.IsAtPeaceWith(tile.cityAtTile.owner)) {
-			tile.DisbandNonDefendingUnits();
-			tile.cityAtTile.owner.cities.Remove(tile.cityAtTile);
-			EngineStorage.gameData.cities.Remove(tile.cityAtTile);
-			tile.cityAtTile = null;
+			CityInteractions.DestroyCity(tile.xCoordinate, tile.yCoordinate);
 		}
 	}
 

C7GameData/City.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Serilog;
 
 namespace C7GameData
 {
@@ -135,11 +136,28 @@ private int FoodGrowthPerTurn()
 			return CurrentFoodYield() - size * 2;
 		}
 
-		public void removeCitizen() {
+		private void RemoveCitizen() {
 			residents[residents.Count - 1].tileWorked.personWorkingTile = null;
 			residents.RemoveAt(residents.Count - 1);
 		}
 
+		public void RemoveCitizens(int number) {
+			for (int i = 0; i < number; i++) {
+				if (residents.Count > 0) {
+					RemoveCitizen();
+				} else {
+					Log.Warning("Trying to remove last citizen from " + name);
+					break;
+				}
+			}
+		}
+
+		public void RemoveAllCitizens() {
+			while (residents.Count > 0) {
+				RemoveCitizen();
+			}
+		}
+
 		public override string ToString() {
 			return $"{name} ({size})";
 		}