New Improvement Restriction - NoAdjacentCity: (#11232)

- forbids an improvement from being built next to a city
LoneGazebo · Aug 25, 2024 · 10f41c7 · 10f41c7
1 parent 80d157f
commit 10f41c7
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/(1) Community Patch/Core Files/Core Tables/CoreTableEntries.sql b/(1) Community Patch/Core Files/Core Tables/CoreTableEntries.sql
@@ -1101,12 +1101,15 @@ ALTER TABLE Builds ADD COLUMN 'KillOnlyCivilian' BOOLEAN DEFAULT 0;
 -- Grants obsoletion tech to improvement (tie to build above for AI)
 ALTER TABLE Improvements ADD COLUMN 'ObsoleteTech' TEXT DEFAULT NULL;
 
--- Improvements can be made valid by being adjacent to a lake
-ALTER TABLE Improvements ADD COLUMN 'Lakeside' BOOLEAN DEFAULT 0;
+-- Improvement can not be built adjacent to a city
+ALTER TABLE Improvements ADD COLUMN 'NoAdjacentCity' BOOLEAN DEFAULT 0;
 
 -- Improvements can be made valid by being adjacent to a city
 ALTER TABLE Improvements ADD COLUMN 'Cityside' BOOLEAN DEFAULT 0;
 
+-- Improvements can be made valid by being adjacent to a lake
+ALTER TABLE Improvements ADD COLUMN 'Lakeside' BOOLEAN DEFAULT 0;
+
 -- Improvements can be made valid by being adjacent to X of the same improvement
 ALTER TABLE Improvements ADD COLUMN 'XSameAdjacentMakesValid' INTEGER DEFAULT 0;
 

diff --git a/CvGameCoreDLL_Expansion2/CvImprovementClasses.cpp b/CvGameCoreDLL_Expansion2/CvImprovementClasses.cpp
@@ -141,8 +141,9 @@ CvImprovementEntry::CvImprovementEntry(void):
 	m_bIsEmbassy(false),
 #if defined(MOD_BALANCE_CORE)
 	m_iGetObsoleteTech(NO_TECH),
-	m_bAdjacentLake(false),
+	m_bNoAdjacentCity(false),
 	m_bAdjacentCity(false),
+	m_bAdjacentLake(false),
 	m_iGrantsVision(0),
 	m_iMovesChange(0),
 	m_bRestoreMoves(false),
@@ -329,8 +330,9 @@ bool CvImprovementEntry::CacheResults(Database::Results& kResults, CvDatabaseUti
 #if defined(MOD_BALANCE_CORE)
 	const char* szObsoleteTech = kResults.GetText("ObsoleteTech");
 	m_iGetObsoleteTech = GC.getInfoTypeForString(szObsoleteTech, true);
-	m_bAdjacentLake = kResults.GetBool("Lakeside");
+	m_bNoAdjacentCity = kResults.GetBool("NoAdjacentCity");
 	m_bAdjacentCity = kResults.GetBool("Cityside");
+	m_bAdjacentLake = kResults.GetBool("Lakeside");
 	m_iGrantsVision = kResults.GetInt("GrantsVisionXTiles");
 	m_iUnitPlotExperience = kResults.GetInt("UnitPlotExperience");
 	m_iGAUnitPlotExperience = kResults.GetInt("GAUnitPlotExperience");
@@ -1174,14 +1176,18 @@ int CvImprovementEntry::GetObsoleteTech() const
 {
 	return m_iGetObsoleteTech;
 }
-bool CvImprovementEntry::IsAdjacentLake() const
+bool CvImprovementEntry::IsNoAdjacentCity() const
 {
-	return m_bAdjacentLake;
+	return m_bNoAdjacentCity;
 }
 bool CvImprovementEntry::IsAdjacentCity() const
 {
 	return m_bAdjacentCity;
 }
+bool CvImprovementEntry::IsAdjacentLake() const
+{
+	return m_bAdjacentLake;
+}
 int CvImprovementEntry::GetGrantsVision() const
 {
 	return m_iGrantsVision;

diff --git a/CvGameCoreDLL_Expansion2/CvImprovementClasses.h b/CvGameCoreDLL_Expansion2/CvImprovementClasses.h
@@ -142,8 +142,9 @@ class CvImprovementEntry: public CvBaseInfo
 	bool IsEmbassy() const;
 #if defined(MOD_BALANCE_CORE)
 	int GetObsoleteTech() const;
-	bool IsAdjacentLake() const;
+	bool IsNoAdjacentCity() const;
 	bool IsAdjacentCity() const;
+	bool IsAdjacentLake() const;
 	int GetGrantsVision() const;
 #endif
 	bool IsNoTwoAdjacent() const;
@@ -318,8 +319,9 @@ class CvImprovementEntry: public CvBaseInfo
 	bool m_bIsEmbassy;
 #if defined(MOD_BALANCE_CORE)
 	int m_iGetObsoleteTech;
-	bool m_bAdjacentLake;
+	bool m_bNoAdjacentCity;
 	bool m_bAdjacentCity;
+	bool m_bAdjacentLake;
 	int m_iGrantsVision;
 #endif
 	bool m_bNoTwoAdjacent;

diff --git a/CvGameCoreDLL_Expansion2/CvPlot.cpp b/CvGameCoreDLL_Expansion2/CvPlot.cpp
@@ -2546,6 +2546,11 @@ bool CvPlot::canHaveImprovement(ImprovementTypes eImprovement, PlayerTypes ePlay
 		}
 	}
 
+	if(pkImprovementInfo->IsNoAdjacentCity() && IsAdjacentCity())
+	{
+		return false;
+	}
+
 	if(pkImprovementInfo->IsNoFreshWater() && isFreshWater())
 	{
 		return false;