mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-06 08:21:36 +07:00
Code Issues Packages Projects Releases Wiki Activity

AI always uses great prophets if it has one & fixes them standing around in enemy land tiles (#7040)

Browse Source
This commit is contained in:
OptimizedForDensity
2022-06-04 09:12:24 -04:00
committed by GitHub
parent 22c8b033c9
commit 14f85e7c33
3 changed files with 51 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,7 +239,11 @@ object SpecificUnitAutomation {
}
fun automateImprovementPlacer(unit: MapUnit) {
val improvementName = unit.getMatchingUniques(UniqueType.ConstructImprovementConsumingUnit).first().params[0]
var improvementBuildingUniques = unit.getMatchingUniques(UniqueType.ConstructImprovementConsumingUnit)
if (unit.religiousActionsUnitCanDo().all { unit.abilityUsesLeft[it] == unit.maxAbilityUses[it] })
improvementBuildingUniques += unit.getMatchingUniques(UniqueType.CanConstructIfNoOtherActions)
val improvementName = improvementBuildingUniques.first().params[0]
val improvement = unit.civInfo.gameInfo.ruleSet.tileImprovements[improvementName]
?: return
val relatedStat = improvement.maxByOrNull { it.value }?.key ?: Stat.Culture
@ -293,22 +297,22 @@ object SpecificUnitAutomation {
if (unit.religion != unit.civInfo.religionManager.religion?.name)
return unit.destroy()
val cities = unit.civInfo.gameInfo.getCities().asSequence()
val city = unit.civInfo.gameInfo.getCities().asSequence()
.filter { it.religion.getMajorityReligion()?.name != unit.getReligionDisplayName() }
.filterNot { it.civInfo.isAtWarWith(unit.civInfo) }
.minByOrNull { it.getCenterTile().aerialDistanceTo(unit.currentTile) } ?: return
val destination = cities.getTiles().asSequence()
.filterNot { unit.getTile().owningCity == it.owningCity } // to prevent the ai from moving around randomly
.filter { unit.movement.canMoveTo(it) }
val destination = city.getTiles().asSequence()
.filter { unit.movement.canMoveTo(it) || it == unit.getTile() }
.sortedBy { it.aerialDistanceTo(unit.currentTile) }
.firstOrNull { unit.movement.canReach(it) } ?: return
unit.movement.headTowards(destination)
if (unit.currentTile.owningCity?.religion?.getMajorityReligion()?.name != unit.religion)
if (unit.civInfo.religionManager.maySpreadReligionNow(unit)) {
doReligiousAction(unit, unit.getTile())
}
}
fun automateInquisitor(unit: MapUnit) {
@ -326,16 +330,14 @@ object SpecificUnitAutomation {
if (cityToProtect != null) {
destination = cityToProtect.getCenterTile().neighbors.asSequence()
.filterNot { unit.getTile().owningCity == it.owningCity } // to prevent the ai from moving around randomly
.filter { unit.movement.canMoveTo(it) }
.filter { unit.movement.canMoveTo(it) || it == unit.getTile() }
.sortedBy { it.aerialDistanceTo(unit.currentTile) }
.firstOrNull { unit.movement.canReach(it) }
}
if (destination == null) {
if (cityToConvert == null) return
destination = cityToConvert.getCenterTile().neighbors.asSequence()
.filterNot { unit.getTile().owningCity == it.owningCity } // to prevent the ai from moving around randomly
.filter { unit.movement.canMoveTo(it) }
.filter { unit.movement.canMoveTo(it) || it == unit.getTile() }
.sortedBy { it.aerialDistanceTo(unit.currentTile) }
.firstOrNull { unit.movement.canReach(it) }
}

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

@ -167,15 +167,18 @@ object UnitAutomation {
if (unit.hasCitadelPlacementUnique || unit.hasStrengthBonusInRadiusUnique)
return SpecificUnitAutomation.automateGreatGeneralFallback(unit)
if (unit.hasUnique(UniqueType.ConstructImprovementConsumingUnit))
return SpecificUnitAutomation.automateImprovementPlacer(unit) // includes great people plus moddable units
if (unit.getMatchingUniques(UniqueType.CanActionSeveralTimes).any{ it.params[0] == "Spread Religion" })
if (unit.getMatchingUniques(UniqueType.CanActionSeveralTimes).any{ it.params[0] == "Spread Religion" }
&& unit.civInfo.religionManager.maySpreadReligionAtAll(unit))
return SpecificUnitAutomation.automateMissionary(unit)
if (unit.hasUnique(UniqueType.PreventSpreadingReligion))
return SpecificUnitAutomation.automateInquisitor(unit)
if (unit.hasUnique(UniqueType.ConstructImprovementConsumingUnit)
|| (unit.hasUnique(UniqueType.CanConstructIfNoOtherActions)
&& unit.religiousActionsUnitCanDo().all { unit.abilityUsesLeft[it] == unit.maxAbilityUses[it] }))
// catch great prophet for civs who can't found/enhance/spread religion
return SpecificUnitAutomation.automateImprovementPlacer(unit) // includes great people plus moddable units
// ToDo: automation of great people skills (may speed up construction, provides a science boost, etc.)

17
core/src/com/unciv/logic/civilization/ReligionManager.kt
View File

@ -319,6 +319,23 @@ class ReligionManager {
religionState = ReligionState.EnhancedReligion
}
fun maySpreadReligionAtAll(missionary: MapUnit): Boolean {
if (!civInfo.gameInfo.isReligionEnabled()) return false // No religion, no spreading
if (religion == null) return false // need a religion
if (religionState < ReligionState.Religion) return false // First found an actual religion
if (!civInfo.isMajorCiv()) return false // Only major civs
return true
}
fun maySpreadReligionNow(missionary: MapUnit): Boolean {
if (!maySpreadReligionAtAll(missionary)) return false
if (missionary.getTile().getOwner() == null) return false
if (missionary.currentTile.owningCity?.religion?.getMajorityReligion()?.name == missionary.religion)
return false
return true
}
fun numberOfCitiesFollowingThisReligion(): Int {
if (religion == null) return 0
return civInfo.gameInfo.getCities()