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

Resolved #856 - Cities created in your own territory get their own land and are no longer "ghost cities"

Browse Source
This commit is contained in:
Yair Morgenstern
2019-06-09 23:15:03 +03:00
parent 6dc2e0dc8a
commit 5ed9a5912b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,7 +239,7 @@ class Battle(val gameInfo:GameInfo) {
defender.takeDamage(100) defender.takeDamage(100)
return return
} // barbarians don't capture civilians! } // barbarians don't capture civilians!
if (defender.getCivInfo().isDefeated()) {//Last settler captured if (defender.getCivInfo().isDefeated()) {//Last settler captured
defender.getCivInfo().destroy() defender.getCivInfo().destroy()
attacker.getCivInfo().popupAlerts.add(PopupAlert(AlertType.Defeated,defender.getCivInfo().civName)) attacker.getCivInfo().popupAlerts.add(PopupAlert(AlertType.Defeated,defender.getCivInfo().civName))

2
core/src/com/unciv/logic/city/CityExpansionManager.kt
View File

@ -77,7 +77,7 @@ class CityExpansionManager {
relinquishOwnership(tile) relinquishOwnership(tile)
cityInfo.getCenterTile().getTilesInDistance(1) cityInfo.getCenterTile().getTilesInDistance(1)
.filter { it.getCity()==null } // can't take ownership of owned tiles .filter { it.getCity()==null || it.getCity()!!.civInfo==cityInfo.civInfo } // can't take ownership of owned tiles
.forEach { takeOwnership(it) } .forEach { takeOwnership(it) }
} }