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

Merge tag '3.11.0-patch1'

Browse Source
This commit is contained in:
Yair Morgenstern
2020-10-04 15:20:48 +03:00
parent 2d6c322856 be2dd5c068
commit fd6956507d
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/kotlin/BuildConfig.kt
View File

@ -3,8 +3,8 @@ package com.unciv.build
object BuildConfig {
const val kotlinVersion = "1.3.71"
const val appName = "Unciv"
const val appCodeNumber = 479
const val appVersion = "3.11.0"
const val appCodeNumber = 480
const val appVersion = "3.11.0-patch1"
const val gdxVersion = "1.9.10"
const val roboVMVersion = "2.3.1"

2
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -298,7 +298,7 @@ open class TileInfo {
/** Without regards to what civinfo it is, a lot of the checks are ust for the improvement on the tile.
* Doubles as a check for the map editor.
*/
fun canImprovementBeBuiltHere(improvement: TileImprovement, resourceIsVisible:Boolean = true): Boolean {
fun canImprovementBeBuiltHere(improvement: TileImprovement, resourceIsVisible:Boolean = resource!=null): Boolean {
val topTerrain = getLastTerrain()
return when {

3
core/src/com/unciv/ui/cityscreen/CityInfoTable.kt
View File

@ -152,7 +152,8 @@ class CityInfoTable(private val cityScreen: CityScreen) : Table(CameraStageBaseS
specialistIcons.row().size(20f).pad(5f)
for (stat in building.specialistSlots!!.toHashMap()) {
if (stat.value == 0f) continue
val specialist = cityInfo.getRuleset().specialists[cityInfo.population.specialistNameByStat(stat.key)]!!
val specialist = cityInfo.getRuleset().specialists[cityInfo.population.specialistNameByStat(stat.key)]
if (specialist == null) continue // probably a mod that doesn't have the specialist defined yet
for (i in 0 until stat.value.toInt())
specialistIcons.add(ImageGetter.getSpecialistIcon(specialist.colorObject)).size(20f)
}