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

Fixed Embarkation tutorial

Browse Source
This commit is contained in:
Yair Morgenstern
2018-11-21 15:10:15 +02:00
parent eaa1287653
commit 17c98f9f46
4 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/com/unciv/ui/cityscreen/BuildingsTable.kt
View File

@ -82,7 +82,7 @@ class BuildingsTable(private val cityScreen: CityScreen) : Table() {
add(specialistBuildingsExpander).row()
// specialist allocation
addSpecialistAllocation(skin, specialistBuildings, cityInfo)
addSpecialistAllocation(skin, cityInfo)
}
if (!others.isEmpty()) {
@ -96,7 +96,7 @@ class BuildingsTable(private val cityScreen: CityScreen) : Table() {
pack()
}
private fun addSpecialistAllocation(skin: Skin, specialistBuildings: MutableList<Building>, cityInfo: CityInfo) {
private fun addSpecialistAllocation(skin: Skin, cityInfo: CityInfo) {
val specialistAllocationExpander = ExpanderTab("Specialist allocation", skin)
specialistAllocationExpander.innerTable.defaults().pad(5f)
@ -104,17 +104,17 @@ class BuildingsTable(private val cityScreen: CityScreen) : Table() {
val currentSpecialists = cityInfo.population.specialists.toHashMap()
val maximumSpecialists = cityInfo.population.getMaxSpecialists()
for (entry in maximumSpecialists.toHashMap()) {
if (entry.value == 0f) continue
val stat = entry.key
for (statToMaximumSpecialist in maximumSpecialists.toHashMap()) {
if (statToMaximumSpecialist.value == 0f) continue
val stat = statToMaximumSpecialist.key
// these two are conflictingly named compared to above...
val assignedSpecialists = currentSpecialists[entry.key]!!.toInt()
val maxSpecialists = entry.value.toInt()
val assignedSpecialists = currentSpecialists[statToMaximumSpecialist.key]!!.toInt()
val maxSpecialists = statToMaximumSpecialist.value.toInt()
if (assignedSpecialists > 0) {
val unassignButton = TextButton("-", skin)
unassignButton.label.setFontSize(24)
unassignButton.onClick {
cityInfo.population.specialists.add(entry.key, -1f)
cityInfo.population.specialists.add(statToMaximumSpecialist.key, -1f)
cityInfo.cityStats.update()
cityScreen.update()
}
@ -131,7 +131,7 @@ class BuildingsTable(private val cityScreen: CityScreen) : Table() {
val assignButton = TextButton("+", skin)
assignButton.label.setFontSize(24)
assignButton.onClick {
cityInfo.population.specialists.add(entry.key, +1f)
cityInfo.population.specialists.add(statToMaximumSpecialist.key, +1f)
cityInfo.cityStats.update()
cityScreen.update()
}

14
core/src/com/unciv/ui/tilegroups/TileGroup.kt
View File

@ -119,8 +119,8 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
updateCityImage()
updateTileColor(isViewable)
updateResourceImage(isViewable,showResourcesAndImprovements)
updateImprovementImage(isViewable,showResourcesAndImprovements)
updateResourceImage(showResourcesAndImprovements)
updateImprovementImage(showResourcesAndImprovements)
civilianUnitImage = newUnitImage(tileInfo.civilianUnit, civilianUnitImage, isViewable, -20f)
@ -272,7 +272,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
}
}
private fun updateImprovementImage(viewable: Boolean, showResourcesAndImprovements: Boolean) {
private fun updateImprovementImage(showResourcesAndImprovements: Boolean) {
if (improvementImage != null) {
improvementImage!!.remove()
improvementImage = null
@ -293,7 +293,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
}
}
private fun updateResourceImage(viewable: Boolean, showResourcesAndImprovements: Boolean) {
private fun updateResourceImage(showResourcesAndImprovements: Boolean) {
val shouldDisplayResource = showResourcesAndImprovements
&& tileInfo.hasViewableResource(tileInfo.tileMap.gameInfo.getPlayerCivilization())
@ -365,9 +365,9 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
fun showCircle(color: Color) {
circleImage.isVisible = true
val color = color.cpy()
color.a = 0.3f
circleImage.color = color
val colorCopy = color.cpy()
colorCopy.a = 0.3f
circleImage.color = colorCopy
}
fun hideCircle() {