Fix GPRateModifierPerMarriage column name

LoneGazebo · Dec 4, 2024 · 5a6ee3a · 5a6ee3a
1 parent 63b47c4
commit 5a6ee3a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/CvGameCoreDLL_Expansion2/CvBuildingClasses.cpp b/CvGameCoreDLL_Expansion2/CvBuildingClasses.cpp
@@ -91,7 +91,7 @@ CvBuildingEntry::CvBuildingEntry(void):
 	m_iGlobalCultureRateModifier(0),
 	m_iGreatPeopleRateModifier(0),
 	m_iGlobalGreatPeopleRateModifier(0),
-	m_iGPRateModPerMarriage(0),
+	m_iGPRateModifierPerMarriage(0),
 	m_iGPRateModifierPerLocalTheme(0),
 	m_iGPPOnCitizenBirth(0),
 	m_iGreatGeneralRateModifier(0),
@@ -690,7 +690,7 @@ bool CvBuildingEntry::CacheResults(Database::Results& kResults, CvDatabaseUtilit
 	m_iGlobalCultureRateModifier = kResults.GetInt("GlobalCultureRateModifier");
 	m_iGreatPeopleRateModifier = kResults.GetInt("GreatPeopleRateModifier");
 	m_iGlobalGreatPeopleRateModifier = kResults.GetInt("GlobalGreatPeopleRateModifier");
-	m_iGPRateModPerMarriage = kResults.GetInt("GPRateModPerMarriage");
+	m_iGPRateModifierPerMarriage = kResults.GetInt("GPRateModifierPerMarriage");
 	m_iGPRateModifierPerLocalTheme = kResults.GetInt("GPRateModifierPerLocalTheme");
 	m_iGPPOnCitizenBirth = kResults.GetInt("GPPOnCitizenBirth");
 	m_iGreatGeneralRateModifier = kResults.GetInt("GreatGeneralRateModifier");
@@ -2057,9 +2057,9 @@ int CvBuildingEntry::GetGlobalGreatPeopleRateModifier() const
 }
 
 /// Modifier to great people per active marriage with a CS
-int CvBuildingEntry::GetGPRateModPerMarriage() const
+int CvBuildingEntry::GetGPRateModifierPerMarriage() const
 {
-	return m_iGPRateModPerMarriage;
+	return m_iGPRateModifierPerMarriage;
 }
 
 /// Modifier to great people rate per active theming bonus in the city

diff --git a/CvGameCoreDLL_Expansion2/CvBuildingClasses.h b/CvGameCoreDLL_Expansion2/CvBuildingClasses.h
@@ -183,7 +183,7 @@ class CvBuildingEntry: public CvBaseInfo
 	int GetGlobalCultureRateModifier() const;
 	int GetGreatPeopleRateModifier() const;
 	int GetGlobalGreatPeopleRateModifier() const;
-	int GetGPRateModPerMarriage() const;
+	int GetGPRateModifierPerMarriage() const;
 	int GetGPRateModifierPerLocalTheme() const;
 	int GetGPPOnCitizenBirth() const;
 	int GetGreatGeneralRateModifier() const;
@@ -751,7 +751,7 @@ class CvBuildingEntry: public CvBaseInfo
 	int m_iGlobalCultureRateModifier;
 	int m_iGreatPeopleRateModifier;
 	int m_iGlobalGreatPeopleRateModifier;
-	int m_iGPRateModPerMarriage;
+	int m_iGPRateModifierPerMarriage;
 	int m_iGPRateModifierPerLocalTheme;
 	int m_iGPPOnCitizenBirth;
 	int m_iGreatGeneralRateModifier;

diff --git a/CvGameCoreDLL_Expansion2/CvBuildingProductionAI.cpp b/CvGameCoreDLL_Expansion2/CvBuildingProductionAI.cpp
@@ -909,9 +909,9 @@ int CvBuildingProductionAI::CheckBuildingBuildSanity(BuildingTypes eBuilding, in
 		}
 	}
 
-	if (pkBuildingInfo->GetGPRateModPerMarriage() > 0)
+	if (pkBuildingInfo->GetGPRateModifierPerMarriage() > 0)
 	{
-		iBonus += pkBuildingInfo->GetGPRateModPerMarriage() * GET_PLAYER(m_pCity->getOwner()).GetNumMarriedCityStatesNotAtWar();
+		iBonus += pkBuildingInfo->GetGPRateModifierPerMarriage() * GET_PLAYER(m_pCity->getOwner()).GetNumMarriedCityStatesNotAtWar();
 	}
 
 	if (pkBuildingInfo->GetGPRateModifierPerLocalTheme() > 0)

diff --git a/CvGameCoreDLL_Expansion2/CvCity.cpp b/CvGameCoreDLL_Expansion2/CvCity.cpp
@@ -185,7 +185,7 @@ CvCity::CvCity() :
 	, m_iExtraHitPoints()
 	, m_iBaseGreatPeopleRate()
 	, m_iGreatPeopleRateModifier()
-	, m_iGPRateModPerMarriage()
+	, m_iGPRateModifierPerMarriage()
 	, m_iGPRateModifierPerLocalTheme()
 	, m_iGPPOnCitizenBirth()
 	, m_iJONSCultureStored()
@@ -1183,7 +1183,7 @@ void CvCity::reset(int iID, PlayerTypes eOwner, int iX, int iY, bool bConstructo
 	m_iExtraHitPoints = 0;
 	m_iBaseGreatPeopleRate = 0;
 	m_iGreatPeopleRateModifier = 0;
-	m_iGPRateModPerMarriage = 0;
+	m_iGPRateModifierPerMarriage = 0;
 	m_iGPRateModifierPerLocalTheme = 0;
 	m_iGPPOnCitizenBirth = 0;
 	m_iJONSCultureStored = 0;
@@ -14235,7 +14235,7 @@ void CvCity::processBuilding(BuildingTypes eBuilding, int iChange, bool bFirst,
 		}
 
 		changeGreatPeopleRateModifier(pBuildingInfo->GetGreatPeopleRateModifier() * iChange);
-		changeGPRateModPerMarriage(pBuildingInfo->GetGPRateModPerMarriage() * iChange);
+		changeGPRateModifierPerMarriage(pBuildingInfo->GetGPRateModifierPerMarriage() * iChange);
 		changeGPRateModifierPerLocalTheme(pBuildingInfo->GetGPRateModifierPerLocalTheme() * iChange);
 		ChangeGPPOnCitizenBirth(pBuildingInfo->GetGPPOnCitizenBirth() * iChange);
 
@@ -17332,7 +17332,7 @@ int CvCity::getGreatPeopleRateModifier() const
 	int iNumMarried = GET_PLAYER(getOwner()).GetNumMarriedCityStatesNotAtWar();
 	if (iNumMarried > 0)
 	{
-		iValue += (iNumMarried * getGPRateModPerMarriage());
+		iValue += (iNumMarried * getGPRateModifierPerMarriage());
 		if (isCapital())
 		{
 			iValue += (iNumMarried * /*15*/ GD_INT_GET(BALANCE_GPP_RATE_IN_CAPITAL_PER_MARRIAGE));
@@ -17443,17 +17443,17 @@ int CvCity::GetReligionGreatPersonRateModifier(GreatPersonTypes eGreatPerson) co
 }
 
 //	--------------------------------------------------------------------------------
-int CvCity::getGPRateModPerMarriage() const
+int CvCity::getGPRateModifierPerMarriage() const
 {
 	VALIDATE_OBJECT
-	return m_iGPRateModPerMarriage;
+	return m_iGPRateModifierPerMarriage;
 }
 
 //	--------------------------------------------------------------------------------
-void CvCity::changeGPRateModPerMarriage(int iChange)
+void CvCity::changeGPRateModifierPerMarriage(int iChange)
 {
 	VALIDATE_OBJECT
-	m_iGPRateModPerMarriage = (m_iGPRateModPerMarriage + iChange);
+	m_iGPRateModifierPerMarriage = (m_iGPRateModifierPerMarriage + iChange);
 }
 
 //	--------------------------------------------------------------------------------
@@ -28039,7 +28039,7 @@ void CvCity::BuyPlot(int iPlotX, int iPlotY, bool bAutomaticPurchaseFromBuilding
 				if (bStoleHighValueTile)
 				{
 					iWarProgress *= /*200*/ GD_INT_GET(WAR_PROGRESS_HIGH_VALUE_PILLAGE_MULTIPLIER);
-					iWarProgress /= 200;
+					iWarProgress /= 200; // not a typo
 				}
 				else
 					iWarProgress /= 4;
@@ -28052,7 +28052,7 @@ void CvCity::BuyPlot(int iPlotX, int iPlotY, bool bAutomaticPurchaseFromBuilding
 				if (bStoleHighValueTile)
 				{
 					iWarProgress *= /*200*/ GD_INT_GET(WAR_PROGRESS_HIGH_VALUE_PILLAGE_MULTIPLIER);
-					iWarProgress /= 200;
+					iWarProgress /= 200; // not a typo
 				}
 				else
 					iWarProgress /= 4;
@@ -31516,7 +31516,7 @@ void CvCity::Serialize(City& city, Visitor& visitor)
 	visitor(city.m_iExtraHitPoints);
 	visitor(city.m_iBaseGreatPeopleRate);
 	visitor(city.m_iGreatPeopleRateModifier);
-	visitor(city.m_iGPRateModPerMarriage);
+	visitor(city.m_iGPRateModifierPerMarriage);
 	visitor(city.m_iGPRateModifierPerLocalTheme);
 	visitor(city.m_iGPPOnCitizenBirth);
 	visitor(city.m_iJONSCultureStored);

diff --git a/CvGameCoreDLL_Expansion2/CvCity.h b/CvGameCoreDLL_Expansion2/CvCity.h
@@ -620,8 +620,8 @@ class CvCity
 	void changeBaseGreatPeopleRate(int iChange);
 	int getGreatPeopleRateModifier() const;
 	void changeGreatPeopleRateModifier(int iChange);
-	int getGPRateModPerMarriage() const;
-	void changeGPRateModPerMarriage(int iChange);
+	int getGPRateModifierPerMarriage() const;
+	void changeGPRateModifierPerMarriage(int iChange);
 	int getGPRateModifierPerLocalTheme() const;
 	void changeGPRateModifierPerLocalTheme(int iChange);
 
@@ -1837,7 +1837,7 @@ class CvCity
 
 	int m_iBaseGreatPeopleRate;
 	int m_iGreatPeopleRateModifier;
-	int m_iGPRateModPerMarriage;
+	int m_iGPRateModifierPerMarriage;
 	int m_iGPRateModifierPerLocalTheme;
 	int m_iGPPOnCitizenBirth;
 	int m_iJONSCultureStored;
@@ -2255,7 +2255,7 @@ SYNC_ARCHIVE_VAR(int, m_iHighestPopulation)
 SYNC_ARCHIVE_VAR(int, m_iExtraHitPoints)
 SYNC_ARCHIVE_VAR(int, m_iBaseGreatPeopleRate)
 SYNC_ARCHIVE_VAR(int, m_iGreatPeopleRateModifier)
-SYNC_ARCHIVE_VAR(int, m_iGPRateModPerMarriage)
+SYNC_ARCHIVE_VAR(int, m_iGPRateModifierPerMarriage)
 SYNC_ARCHIVE_VAR(int, m_iGPRateModifierPerLocalTheme)
 SYNC_ARCHIVE_VAR(int, m_iGPPOnCitizenBirth)
 SYNC_ARCHIVE_VAR(int, m_iJONSCultureStored)