Small fixes

LoneGazebo · Dec 16, 2024 · ca65e5e · ca65e5e
1 parent d7d4827
commit ca65e5e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/CvGameCoreDLL_Expansion2/CvDiplomacyAI.cpp b/CvGameCoreDLL_Expansion2/CvDiplomacyAI.cpp
@@ -48131,12 +48131,8 @@ int CvDiplomacyAI::GetVassalTaxScore(PlayerTypes ePlayer)
 
 	int iOpinionWeight = 0;
 
-	int iGoldCollectedSinceVassalStarted = GetVassalGoldPerTurnCollectedSinceVassalStarted(ePlayer); 
-	if (iGoldCollectedSinceVassalStarted == 0)
-		return 0;
-
 	int iGoldTaxedSinceVassalStarted = GetVassalGoldPerTurnTaxedSinceVassalStarted(ePlayer);
-	int iPercentTaxed = iGoldTaxedSinceVassalStarted * 100 / iGoldCollectedSinceVassalStarted;
+	int iPercentTaxed = iGoldTaxedSinceVassalStarted * 100 / max(iGoldCollectedSinceVassalStarted, 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
@@ -10763,10 +10763,13 @@ CvLeagueAI::AlignmentLevels CvLeagueAI::EvaluateAlignment(PlayerTypes ePlayer, b
 			iReligionMod *= 2;
 		}
 
-		// Don't care at all if we're a vassal, this is covered in CvDiplomacyAI::GetVassalTreatedScore().
+		// Don't care at all under most circumstances if we're a vassal, this is covered in CvDiplomacyAI::GetVassalTreatedScore().
+		// There is one circumstance where we should still care: if the master has adopted our religion - then they get the bonus.
 		if (bWeAreVassal)
 		{
-			iReligionMod = 0;
+			ReligionTypes eOwnedReligion = GetPlayer()->GetReligions()->GetOwnedReligion();
+			if (eOwnedReligion == NO_RELIGION || eOwnedReligion != eTheirReligion)
+				iReligionMod = 0;
 		}
 
 		iAlignment += iReligionMod;