AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 21:35:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #5265 - cannot add 2 of the same buildings to the queue visually

Browse Source
This commit is contained in:
yairm210 2021-11-20 23:27:31 +02:00
parent 73f275f4cd
commit 1a7f562bc0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -601,10 +601,13 @@ class CityConstructions {
fun addToQueue(constructionName: String) {
if (isQueueFull()) return
val construction = getConstruction(constructionName)
if (!construction.isBuildable(this)) return
if (construction is Building && isBeingConstructedOrEnqueued(constructionName)) return
if (currentConstructionFromQueue == "" || currentConstructionFromQueue == "Nothing") {
currentConstructionFromQueue = constructionName
} else if (getConstruction(constructionQueue.last()) is PerpetualConstruction) {
if (getConstruction(constructionName) is PerpetualConstruction) { // perpetual constructions will replace each other
if (construction is PerpetualConstruction) { // perpetual constructions will replace each other
constructionQueue.removeAt(constructionQueue.size - 1)
constructionQueue.add(constructionName)
} else

4
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -343,10 +343,10 @@ class CivilizationInfo {
fun hasResource(resourceName: String): Boolean = getCivResourcesByName()[resourceName]!! > 0
// This function should be removed and replaced by marking where uniques originate from, hopefully.
fun getCivWideBuildingUniques(cityItIsFor: CityInfo?): Sequence<Unique> =
fun getCivWideBuildingUniques(cityItIsFor: CityInfo): Sequence<Unique> =
cities.asSequence().flatMap {
city ->
if (cityItIsFor != null && city == cityItIsFor)
if (city == cityItIsFor)
city.getAllUniquesWithNonLocalEffects().filter { !it.isAntiLocalEffect }
else city.getAllUniquesWithNonLocalEffects()
}