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

Allow to buy buildings from the queue (#2032)

Browse Source 
* Allow to buy buildings from the queue

* Minor refactoring
This commit is contained in:
JackRainy
2020-02-29 20:10:24 +02:00
committed by GitHub
parent f081f02006
commit 9fbd569e1f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/com/unciv/models/ruleset/Building.kt
View File

@ -223,8 +223,10 @@ class Building : NamedStats(), IConstruction{
} }
override fun shouldBeDisplayed(construction: CityConstructions): Boolean { override fun shouldBeDisplayed(cityConstructions: CityConstructions): Boolean {
val rejectionReason = getRejectionReason(construction) if (cityConstructions.isBeingConstructedOrEnqueued(name))
return false
val rejectionReason = getRejectionReason(cityConstructions)
return rejectionReason=="" return rejectionReason==""
|| rejectionReason.startsWith("Requires") || rejectionReason.startsWith("Requires")
|| rejectionReason == "Wonder is being built elsewhere" || rejectionReason == "Wonder is being built elsewhere"
@ -232,8 +234,6 @@ class Building : NamedStats(), IConstruction{
fun getRejectionReason(construction: CityConstructions):String{ fun getRejectionReason(construction: CityConstructions):String{
if (construction.isBuilt(name)) return "Already built" if (construction.isBuilt(name)) return "Already built"
if (construction.isBeingConstructed(name)) return "Is being built"
if (construction.isEnqueued(name)) return "Already enqueued"
val cityCenter = construction.cityInfo.getCenterTile() val cityCenter = construction.cityInfo.getCenterTile()
if ("Must be next to desert" in uniques if ("Must be next to desert" in uniques