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

Better AI choice for annexing and razing cities. (#1132)

Browse Source
This commit is contained in:
Duan Tao
2019-09-29 16:54:43 +08:00
committed by Yair Morgenstern
parent 3ce1c7ee9d
commit 1607d0b17c
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -429,6 +429,11 @@ class NextTurnAutomation{
private fun reassignWorkedTiles(civInfo: CivilizationInfo) { private fun reassignWorkedTiles(civInfo: CivilizationInfo) {
for (city in civInfo.cities) { for (city in civInfo.cities) {
if (city.isPuppet && city.population.population > 9
&& city.resistanceCounter == 0) {
city.annexCity()
}
city.reassignWorkers() city.reassignWorkers()
city.cityConstructions.chooseNextConstruction() city.cityConstructions.chooseNextConstruction()

8
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -230,7 +230,13 @@ class Battle(val gameInfo:GameInfo) {
if (attacker.getCivInfo().isPlayerCivilization()) if (attacker.getCivInfo().isPlayerCivilization())
attackerCiv.popupAlerts.add(PopupAlert(AlertType.CityConquered, city.name)) attackerCiv.popupAlerts.add(PopupAlert(AlertType.CityConquered, city.name))
else city.puppetCity(attacker.getCivInfo()) else {
city.puppetCity(attacker.getCivInfo())
if (city.population.population < 4) {
city.annexCity()
city.isBeingRazed = true
}
}
} }
fun getMapCombatantOfTile(tile:TileInfo): ICombatant? { fun getMapCombatantOfTile(tile:TileInfo): ICombatant? {