Add alignment bonus for having same master

Fix build error
LoneGazebo · Dec 16, 2024 · 3f6eca5 · 3f6eca5
1 parent ca65e5e
commit 3f6eca5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/CvGameCoreDLL_Expansion2/CvDiplomacyAI.cpp b/CvGameCoreDLL_Expansion2/CvDiplomacyAI.cpp
@@ -48132,7 +48132,7 @@ int CvDiplomacyAI::GetVassalTaxScore(PlayerTypes ePlayer)
 	int iOpinionWeight = 0;
 
 	int iGoldTaxedSinceVassalStarted = GetVassalGoldPerTurnTaxedSinceVassalStarted(ePlayer);
-	int iPercentTaxed = iGoldTaxedSinceVassalStarted * 100 / max(iGoldCollectedSinceVassalStarted, 1);
+	int iPercentTaxed = iGoldTaxedSinceVassalStarted * 100 / max(GetVassalGoldPerTurnCollectedSinceVassalStarted(ePlayer), 1);
 
 	// Opinion weight from how much % we've taxed them
 	iOpinionWeight = ((int) pow((float)iPercentTaxed, /*1.5f*/ GD_FLOAT_GET(OPINION_WEIGHT_VASSAL_TAX_EXPONENT))) / max(/*4*/ GD_INT_GET(OPINION_WEIGHT_VASSAL_TAX_DIVISOR), 1);

diff --git a/CvGameCoreDLL_Expansion2/CvVotingClasses.cpp b/CvGameCoreDLL_Expansion2/CvVotingClasses.cpp
@@ -10985,6 +10985,20 @@ CvLeagueAI::AlignmentLevels CvLeagueAI::EvaluateAlignment(PlayerTypes ePlayer, b
 		{
 			iAlignment -= 1;
 		}
+
+		// Vassals of same master?
+		TeamTypes eMyTeam = GetPlayer()->getTeam();
+		TeamTypes eTheirTeam = GET_PLAYER(ePlayer).getTeam();
+		TeamTypes eMaster = GET_TEAM(eMyTeam).GetMaster();
+		if (eMaster != NO_TEAM && GET_TEAM(eTheirTeam).GetMaster() == eMaster)
+		{
+			bool bWeAreVoluntary = GET_TEAM(eMyTeam).IsVoluntaryVassal(eMaster);
+			bool bTheyAreVoluntary = GET_TEAM(eTheirTeam).IsVoluntaryVassal(eMaster);
+			if ((bWeAreVoluntary && bTheyAreVoluntary) || (!bWeAreVoluntary && !bTheyAreVoluntary))
+				iAlignment += 4;
+			else
+				iAlignment += 2;
+		}
 	}
 
 	// Encourage bloc formation