wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

City-states no longer accumulate points towards Great Generals

Browse source
This commit is contained in:
Yair Morgenstern 2020-05-16 21:40:43 +03:00
parent 8639fc6e1c
commit 14b99aa010
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/src/com/unciv/logic/battle/Battle.kt
View file

@ -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) {