From e0e701058deab9ad51397d4d4414c3c317bb34b3 Mon Sep 17 00:00:00 2001 From: SimonCeder <63475501+SimonCeder@users.noreply.github.com> Date: Mon, 27 Sep 2021 12:38:42 +0200 Subject: [PATCH] Proper great general points (#5329) --- core/src/com/unciv/logic/battle/Battle.kt | 2 +- core/src/com/unciv/logic/civilization/GreatPersonManager.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index 7297e925a6..2c2381580e 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -395,7 +395,7 @@ object Battle { thisCombatant.unit.promotions.XP += xpGained - if (thisCombatant.getCivInfo().isMajorCiv()) { + if (thisCombatant.getCivInfo().isMajorCiv() && !otherCombatant.getCivInfo().isBarbarian()) { // Can't get great generals from Barbarians var greatGeneralPointsModifier = 1f for (unique in thisCombatant.getMatchingUniques("[] is earned []% faster")) { val unitName = unique.params[0] diff --git a/core/src/com/unciv/logic/civilization/GreatPersonManager.kt b/core/src/com/unciv/logic/civilization/GreatPersonManager.kt index b7804feda7..ca9c38121c 100644 --- a/core/src/com/unciv/logic/civilization/GreatPersonManager.kt +++ b/core/src/com/unciv/logic/civilization/GreatPersonManager.kt @@ -6,7 +6,7 @@ import com.unciv.models.stats.Stats class GreatPersonManager { var pointsForNextGreatPerson = 100 - var pointsForNextGreatGeneral = 30 + var pointsForNextGreatGeneral = 200 var greatPersonPointsCounter = Counter() var greatGeneralPoints = 0