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

Buildings not displayed in civilopedia are not show to be obsoleted in tech tree either

Browse Source
This commit is contained in:
Yair Morgenstern 2021-01-13 15:50:08 +02:00
parent 575ad9fe78
commit 73c5811297
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/GameInfo.kt
View File

@ -355,7 +355,7 @@ class GameInfo {
if (isInvalidConstruction(construction)) if (isInvalidConstruction(construction))
city.cityConstructions.constructionQueue.remove(construction) city.cityConstructions.constructionQueue.remove(construction)
} }
// And from being in progess // And from being in progress
for (construction in city.cityConstructions.inProgressConstructions.keys.toList()) for (construction in city.cityConstructions.inProgressConstructions.keys.toList())
if (isInvalidConstruction(construction)) if (isInvalidConstruction(construction))
city.cityConstructions.inProgressConstructions.remove(construction) city.cityConstructions.inProgressConstructions.remove(construction)

22
core/src/com/unciv/ui/pickerscreens/TechButton.kt
View File

@ -8,7 +8,7 @@ import com.unciv.logic.civilization.TechManager
import com.unciv.ui.utils.* import com.unciv.ui.utils.*
class TechButton(techName:String, private val techManager: TechManager, isWorldScreen: Boolean = true) : Table(CameraStageBaseScreen.skin) { class TechButton(techName:String, private val techManager: TechManager, isWorldScreen: Boolean = true) : Table(CameraStageBaseScreen.skin) {
val text= "".toLabel().apply { setAlignment(Align.center) } val text = "".toLabel().apply { setAlignment(Align.center) }
init { init {
touchable = Touchable.enabled touchable = Touchable.enabled
@ -26,8 +26,7 @@ class TechButton(techName:String, private val techManager: TechManager, isWorldS
val percentComplete = (techCost - remainingTech) / techCost.toFloat() val percentComplete = (techCost - remainingTech) / techCost.toFloat()
add(ImageGetter.getProgressBarVertical(2f, 50f, percentComplete, Color.BLUE, Color.WHITE)).pad(10f) add(ImageGetter.getProgressBarVertical(2f, 50f, percentComplete, Color.BLUE, Color.WHITE)).pad(10f)
rightSide.add(text).padBottom(5f).row() rightSide.add(text).padBottom(5f).row()
} } else rightSide.add(text).height(25f).padBottom(5f).row()
else rightSide.add(text).height(25f).padBottom(5f).row()
addTechEnabledIcons(techName, isWorldScreen, rightSide) addTechEnabledIcons(techName, isWorldScreen, rightSide)
@ -46,26 +45,29 @@ class TechButton(techName:String, private val techManager: TechManager, isWorldS
val tech = ruleset.technologies[techName]!! val tech = ruleset.technologies[techName]!!
for (unit in tech.getEnabledUnits(techManager.civInfo) for (unit in tech.getEnabledUnits(techManager.civInfo)
.filter { "Will not be displayed in Civilopedia" !in it.uniques}) .filter { "Will not be displayed in Civilopedia" !in it.uniques })
techEnabledIcons.add(ImageGetter.getConstructionImage(unit.name).surroundWithCircle(techIconSize)) techEnabledIcons.add(ImageGetter.getConstructionImage(unit.name).surroundWithCircle(techIconSize))
for (building in tech.getEnabledBuildings(techManager.civInfo) for (building in tech.getEnabledBuildings(techManager.civInfo)
.filter { "Will not be displayed in Civilopedia" !in it.uniques}) .filter { "Will not be displayed in Civilopedia" !in it.uniques })
techEnabledIcons.add(ImageGetter.getConstructionImage(building.name).surroundWithCircle(techIconSize)) techEnabledIcons.add(ImageGetter.getConstructionImage(building.name).surroundWithCircle(techIconSize))
for(building in tech.getObsoletedBuildings(techManager.civInfo) ) for (building in tech.getObsoletedBuildings(techManager.civInfo)
.filter { "Will not be displayed in Civilopedia" !in it.uniques })
techEnabledIcons.add(ImageGetter.getConstructionImage(building.name).surroundWithCircle(techIconSize).apply { techEnabledIcons.add(ImageGetter.getConstructionImage(building.name).surroundWithCircle(techIconSize).apply {
val closeImage = ImageGetter.getImage("OtherIcons/Close") val closeImage = ImageGetter.getImage("OtherIcons/Close")
closeImage.setSize(techIconSize/2,techIconSize/2) closeImage.setSize(techIconSize / 2, techIconSize / 2)
closeImage.color = Color.RED closeImage.color = Color.RED
closeImage.center(this) closeImage.center(this)
addActor(closeImage) addActor(closeImage)
}) })
for (improvement in ruleset.tileImprovements.values for (improvement in ruleset.tileImprovements.values
.filter { it.techRequired == techName || it.uniqueObjects.any { u -> u.params.contains(techName) } .filter {
|| it.uniqueObjects.any { it.placeholderText=="[] once [] is discovered" && it.params[1]==techName } } it.techRequired == techName || it.uniqueObjects.any { u -> u.params.contains(techName) }
.filter { it.uniqueTo==null || it.uniqueTo==civName }) || it.uniqueObjects.any { it.placeholderText == "[] once [] is discovered" && it.params[1] == techName }
}
.filter { it.uniqueTo == null || it.uniqueTo == civName })
if (improvement.name.startsWith("Remove")) if (improvement.name.startsWith("Remove"))
techEnabledIcons.add(ImageGetter.getImage("OtherIcons/Stop")).size(techIconSize) techEnabledIcons.add(ImageGetter.getImage("OtherIcons/Stop")).size(techIconSize)
else techEnabledIcons.add(ImageGetter.getImprovementIcon(improvement.name, techIconSize)) else techEnabledIcons.add(ImageGetter.getImprovementIcon(improvement.name, techIconSize))