#336 Fix Animal \ Escaped unit XP farming

We now cap the XP for defeating animals at 2XP and escapees at 0XP
We-the-People-civ4col-mod · Dec 31, 2019 · aad2a22 · aad2a22
1 parent 33fea6d
commit aad2a22
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/Assets/XML/GlobalDefinesAlt.xml b/Assets/XML/GlobalDefinesAlt.xml
@@ -1034,5 +1034,15 @@
 		<DefineName>CITY_DEFENSE_DAMAGE_HEAL_RATE</DefineName>
 		<iDefineIntVal>5</iDefineIntVal>
 	</Define>
-<!-- Super Forts end -->
+	<!-- Super Forts end -->
+	<!-- XP cap begin -->
+	<Define>
+		<DefineName>ANIMAL_MAX_XP_VALUE</DefineName>
+		<iDefineIntVal>2</iDefineIntVal>
+	</Define>
+	<Define>
+		<DefineName>ESCAPE_MAX_XP_VALUE</DefineName>
+		<iDefineIntVal>0</iDefineIntVal>
+	</Define>
+	<!-- XP cap end -->
 </Civ4Defines>
diff --git a/Project Files/DLLSources/CvUnit.cpp b/Project Files/DLLSources/CvUnit.cpp
@@ -8502,11 +8502,13 @@ int CvUnit::defenseXPValue() const
 
 int CvUnit::maxXPValue() const
 {
-	int iMaxValue;
-
-	iMaxValue = MAX_INT;
-
-	return iMaxValue;
+	int iMaxValue = MAX_INT;
+	if (getUnitInfo().isAnimal())
+		iMaxValue = std::min(iMaxValue, GC.getDefineINT("ANIMAL_MAX_XP_VALUE"));
+	if (getUnitInfo().LbD_canEscape())
+		iMaxValue = std::min(iMaxValue, GC.getDefineINT("ESCAPE_MAX_XP_VALUE"));
+
+	return iMaxValue;
 }
 
 bool CvUnit::isRanged() const