AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 22:06:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #412 from ninjatao/auto_fix_pillage

Browse Source 
Avoid pillaged great improvement from being replaced by resource impr…
This commit is contained in:
Yair Morgenstern 2019-01-09 07:53:24 +02:00 committed by GitHub
commit c7dbad1085
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,7 @@ class WorkerAutomation(val unit: MapUnit) {
&& (it.improvement == null || (it.hasViewableResource(unit.civInfo) && !it.containsGreatImprovement() && it.getTileResource().improvement != it.improvement)) && (it.improvement == null || (it.hasViewableResource(unit.civInfo) && !it.containsGreatImprovement() && it.getTileResource().improvement != it.improvement))
&& it.isLand() && it.isLand()
&& !it.getBaseTerrain().impassable && !it.getBaseTerrain().impassable
&& it.canBuildImprovement(chooseImprovement(it, unit.civInfo), unit.civInfo) && (it.containsUnfinishedGreatImprovement() || it.canBuildImprovement(chooseImprovement(it, unit.civInfo), unit.civInfo))
&& {val city=it.getCity(); city==null || it.getCity()?.civInfo == unit.civInfo}() // don't work tiles belonging to another civ && {val city=it.getCity(); city==null || it.getCity()?.civInfo == unit.civInfo}() // don't work tiles belonging to another civ
}.sortedByDescending { getPriority(it, unit.civInfo) }.toMutableList() }.sortedByDescending { getPriority(it, unit.civInfo) }.toMutableList()
@ -145,6 +145,7 @@ class WorkerAutomation(val unit: MapUnit) {
tile.improvementInProgress != null -> tile.improvementInProgress tile.improvementInProgress != null -> tile.improvementInProgress
improvementStringForResource != null -> improvementStringForResource improvementStringForResource != null -> improvementStringForResource
tile.containsGreatImprovement() -> null tile.containsGreatImprovement() -> null
tile.containsUnfinishedGreatImprovement() -> null
tile.terrainFeature == "Jungle" -> "Trading post" tile.terrainFeature == "Jungle" -> "Trading post"
tile.terrainFeature == "Marsh" -> "Remove Marsh" tile.terrainFeature == "Marsh" -> "Remove Marsh"
tile.terrainFeature == "Forest" -> "Lumber mill" tile.terrainFeature == "Forest" -> "Lumber mill"

9
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -45,8 +45,13 @@ open class TileInfo {
} }
fun containsGreatImprovement(): Boolean { fun containsGreatImprovement(): Boolean {
if (getTileImprovement() == null) return false if (improvement in listOf("Academy", "Landmark", "Manufactory", "Customs house")) return true
return getTileImprovement()!!.name in listOf("Academy", "Landmark", "Manufactory", "Customs house") return false
}
fun containsUnfinishedGreatImprovement(): Boolean {
if (improvementInProgress in listOf("Academy", "Landmark", "Manufactory", "Customs house")) return true
return false
} }
//region pure functions //region pure functions