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

Fixed 'auto assign production' not working when changing from manual to auto assign

Browse Source
This commit is contained in:
Yair Morgenstern
2020-04-27 23:21:14 +03:00
parent ef29ea4df6
commit e11feaea2f
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/city/CityConstructions.kt
View File

@ -146,9 +146,9 @@ class CityConstructions {
internal fun getConstruction(constructionName: String): IConstruction { internal fun getConstruction(constructionName: String): IConstruction {
val gameBasics = cityInfo.getRuleset() val gameBasics = cityInfo.getRuleset()
when { when {
constructionName == "" -> return getConstruction("Nothing")
gameBasics.buildings.containsKey(constructionName) -> return gameBasics.buildings[constructionName]!! gameBasics.buildings.containsKey(constructionName) -> return gameBasics.buildings[constructionName]!!
gameBasics.units.containsKey(constructionName) -> return gameBasics.units[constructionName]!! gameBasics.units.containsKey(constructionName) -> return gameBasics.units[constructionName]!!
constructionName == "" -> return getConstruction("Nothing")
else -> { else -> {
val special = PerpetualConstruction.perpetualConstructionsMap[constructionName] val special = PerpetualConstruction.perpetualConstructionsMap[constructionName]
if (special != null) return special if (special != null) return special
@ -358,8 +358,6 @@ class CityConstructions {
private fun removeCurrentConstruction() = removeFromQueue(0,true) private fun removeCurrentConstruction() = removeFromQueue(0,true)
fun chooseNextConstruction() { fun chooseNextConstruction() {
if(currentConstructionIsUserSet) return
validateConstructionQueue() validateConstructionQueue()
if (constructionQueue.isNotEmpty()) { if (constructionQueue.isNotEmpty()) {
currentConstructionIsUserSet = true currentConstructionIsUserSet = true