Merge pull request #758 from C7-Game/twrner/simplify-tile

Tile.cs: Remove some superfluous fields

Author: TomWerner

C7Engine/C7GameData/City.cs

@@ -674,7 +674,7 @@ private List<Tile> GetTilesOfRank(int rank) {
 			List<Tile> result = new();
 			foreach (Tile t in location.GetTilesWithinRankDistance(rank)) {
 				// Ocean tiles may only hold claims of rank 2.
-				if (t.baseTerrainTypeKey == "ocean" && rank > 2) {
+				if (t.baseTerrainType.Key == "ocean" && rank > 2) {
 					continue;
 				}
 				result.Add(t);

C7Engine/C7GameData/Save/SaveTile.cs

@@ -16,8 +16,8 @@ public SaveTile(Tile tile) {
 			Y = tile.YCoordinate;
 			continent = tile.continent;
 			isFreshWater = tile.isFreshWater;
-			baseTerrain = tile.baseTerrainTypeKey;
-			overlayTerrain = tile.overlayTerrainTypeKey;
+			baseTerrain = tile.baseTerrainType.Key;
+			overlayTerrain = tile.overlayTerrainType.Key;
 			if (tile.Resource != Resource.NONE) {
 				resource = tile.ResourceKey;
 			}
@@ -50,9 +50,7 @@ public Tile ToTile(List<TerrainType> terrainTypes, List<Resource> resources) {
 				YCoordinate = Y,
 				continent = continent,
 				isFreshWater = isFreshWater,
-				baseTerrainTypeKey = baseTerrain,
 				baseTerrainType = terrainTypes.Find(tt => tt.Key == baseTerrain),
-				overlayTerrainTypeKey = overlayTerrain,
 				overlayTerrainType = terrainTypes.Find(tt => tt.Key == overlayTerrain),
 				hasBarbarianCamp = features.Contains("barbarianCamp"),
 				// TODO: load working tile

C7Engine/C7GameData/Tile.cs

@@ -70,9 +70,7 @@ private Yield ApplyCityModifiers(City city) {
 		public int biomeRegion = -1;
 
 		public City owningCity; // The city whose border contains this tile
-		public string baseTerrainTypeKey { get; set; }
 		public TerrainType baseTerrainType = TerrainType.NONE;
-		public string overlayTerrainTypeKey { get; set; }
 		public TerrainType overlayTerrainType = TerrainType.NONE;
 
 		private City _cityAtTile;
@@ -659,7 +657,6 @@ public void Animate(AnimatedEffect effect, bool wait) {
 
 		public void ClearTerrainOverlay() {
 			overlayTerrainType = baseTerrainType;
-			overlayTerrainTypeKey = baseTerrainTypeKey;
 		}
 
 		public Tile Copy() {

C7Engine/TerrainTextureFiles.cs

@@ -28,8 +28,6 @@ private enum TextureFile {
 		public static void AssignTextureDetails(Random rand, List<TerrainType> terrainTypes, GameMap m) {
 			foreach (Tile t in m.tiles) {
 				t.ExtraInfo = new();
-				t.overlayTerrainTypeKey = t.overlayTerrainType.Key;
-				t.baseTerrainTypeKey = t.baseTerrainType.Key;
 
 				Dictionary<string, int> terrainCounts = new();
 				foreach (TerrainType tt in terrainTypes) {