mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-25 22:59:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in inquisitor automation

Browse Source
This commit is contained in:
yairm210 2021-12-28 23:10:44 +02:00
parent f90b22ad60
commit bd70500685
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/com/unciv/logic/automation/SpecificUnitAutomation.kt
View File

@ -287,7 +287,7 @@ object SpecificUnitAutomation {
}
}
fun automateMissionary(unit: MapUnit){
fun automateMissionary(unit: MapUnit) {
if (unit.religion != unit.civInfo.religionManager.religion?.name)
return unit.destroy()
@ -301,12 +301,9 @@ object SpecificUnitAutomation {
.filterNot { unit.getTile().owningCity == it.owningCity } // to prevent the ai from moving around randomly
.filter { unit.movement.canMoveTo(it) }
.sortedBy { it.aerialDistanceTo(unit.currentTile) }
.firstOrNull { unit.movement.canReach(it) }
.firstOrNull { unit.movement.canReach(it) } ?: return
if (destination != null) {
unit.movement.headTowards(destination)
}
unit.movement.headTowards(destination)
if (unit.currentTile.owningCity?.religion?.getMajorityReligion()?.name != unit.religion)
doReligiousAction(unit, unit.getTile())
@ -341,8 +338,9 @@ object SpecificUnitAutomation {
.firstOrNull { unit.movement.canReach(it) }
}
if (destination != null)
unit.movement.headTowards(destination)
if (destination == null) return
unit.movement.headTowards(destination)
if (cityToConvert != null && unit.currentTile.getCity() == destination!!.getCity()) {