mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-31 18:04:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

Captured Khans now automate properly

Browse Source
This commit is contained in:
Yair Morgenstern 2020-02-12 20:34:32 +02:00
parent d9d6f4eeb8
commit 3402065e3c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/automation/NextTurnAutomation.kt
View File

@ -447,7 +447,8 @@ class NextTurnAutomation{
when {
unit.type.isRanged() -> rangedUnits.add(unit)
unit.type.isMelee() -> meleeUnits.add(unit)
unit.name == civInfo.getEquivalentUnit(Constants.greatGeneral).name -> generals.add(unit) //generals move after military units
unit.name == Constants.greatGeneral || unit.baseUnit.replaces == Constants.greatGeneral
-> generals.add(unit) //generals move after military units
else -> civilianUnits.add(unit)
}
}

2
core/src/com/unciv/logic/automation/UnitAutomation.kt
View File

@ -44,7 +44,7 @@ class UnitAutomation {
return SpecificUnitAutomation().automateWorkBoats(unit)
}
if (unit.name == unit.civInfo.getEquivalentUnit(Constants.greatGeneral).name)
if (unit.name == Constants.greatGeneral || unit.baseUnit.replaces == Constants.greatGeneral)
return SpecificUnitAutomation().automateGreatGeneral(unit)
if (unit.type == UnitType.Fighter)