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

Fixed archaeological dig being built by workers in Civ V expansion mod

Browse Source
This commit is contained in:
Yair Morgenstern
2020-11-11 23:48:07 +02:00
parent 977d5b8a72
commit d3aabfb669
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,12 +186,14 @@ class WorkerAutomation(val unit: MapUnit) {
else -> tile.getTileResource().improvement
}
val uniqueImprovement = civInfo.gameInfo.ruleSet.tileImprovements.values
val tileImprovements = civInfo.gameInfo.ruleSet.tileImprovements
val uniqueImprovement = tileImprovements.values
.firstOrNull { it.uniqueTo==civInfo.civName}
val improvementString = when {
tile.improvementInProgress != null -> tile.improvementInProgress
improvementStringForResource != null -> improvementStringForResource
improvementStringForResource != null && tileImprovements.containsKey(improvementStringForResource)
&& tileImprovements[improvementStringForResource]!!.turnsToBuild!=0 -> improvementStringForResource
tile.containsGreatImprovement() -> null
tile.containsUnfinishedGreatImprovement() -> null

6
core/src/com/unciv/ui/mapeditor/MapEditorMenuPopup.kt
View File

@ -33,10 +33,8 @@ class MapEditorMenuPopup(var mapEditorScreen: MapEditorScreen): Popup(mapEditorS
addSaveMapButton()
addCopyMapAsTextButton()
addLoadMapButton()
addUploadMapButton()
if (UncivGame.Current.settings.extendedMapEditor) {
addScenarioButton()
}
// addUploadMapButton()
if (UncivGame.Current.settings.extendedMapEditor) addScenarioButton()
addExitMapEditorButton()
addCloseOptionsButton()
}