From 14b99aa01094a6c0042bd790b6413f516d6abbf8 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sat, 16 May 2020 21:40:43 +0300
Subject: [PATCH] City-states no longer accumulate points towards Great
 Generals

---
 core/src/com/unciv/logic/battle/Battle.kt | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt
index 5562fb10f5..874f2e418e 100644
--- a/core/src/com/unciv/logic/battle/Battle.kt
+++ b/core/src/com/unciv/logic/battle/Battle.kt
@@ -242,14 +242,16 @@ object Battle {
         thisCombatant.unit.promotions.XP += XPGained
 
 
-        var greatGeneralPointsModifier = 1f
-        if(thisCombatant.getCivInfo().nation.unique == UniqueAbility.ART_OF_WAR)
-            greatGeneralPointsModifier += 0.5f
-        if(thisCombatant.unit.hasUnique("Combat very likely to create Great Generals"))
-            greatGeneralPointsModifier += 1f
+        if(thisCombatant.getCivInfo().isMajorCiv()) {
+            var greatGeneralPointsModifier = 1f
+            if (thisCombatant.getCivInfo().nation.unique == UniqueAbility.ART_OF_WAR)
+                greatGeneralPointsModifier += 0.5f
+            if (thisCombatant.unit.hasUnique("Combat very likely to create Great Generals"))
+                greatGeneralPointsModifier += 1f
 
-        val greatGeneralPointsGained = (XPGained * greatGeneralPointsModifier).toInt()
-        thisCombatant.getCivInfo().greatPeople.greatGeneralPoints += greatGeneralPointsGained
+            val greatGeneralPointsGained = (XPGained * greatGeneralPointsModifier).toInt()
+            thisCombatant.getCivInfo().greatPeople.greatGeneralPoints += greatGeneralPointsGained
+        }
     }
 
     private fun conquerCity(city: CityInfo, attacker: ICombatant) {