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

Fixed minor mod bugs

Browse Source
This commit is contained in:
Yair Morgenstern 2020-11-30 22:07:44 +02:00
parent f59c9a8593
commit 61a0ccba5f
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -521,6 +521,7 @@ class CivilizationInfo {
fun addUnit(unitName:String, city: CityInfo?=null) { fun addUnit(unitName:String, city: CityInfo?=null) {
if (cities.isEmpty()) return if (cities.isEmpty()) return
val cityToAddTo = city ?: cities.random() val cityToAddTo = city ?: cities.random()
if (!gameInfo.ruleSet.units.containsKey(unitName)) return
val unit = getEquivalentUnit(unitName) val unit = getEquivalentUnit(unitName)
placeUnitNearTile(cityToAddTo.location, unit.name) placeUnitNearTile(cityToAddTo.location, unit.name)
if (unit.uniques.any { it.equalsPlaceholderText("Great Person - []") }) if (unit.uniques.any { it.equalsPlaceholderText("Great Person - []") })

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

@ -453,7 +453,7 @@ open class TileInfo {
} }
fun setTerrainTransients() { fun setTerrainTransients() {
baseTerrainObject = ruleset.terrains[baseTerrain]!! // This is a HACK. baseTerrainObject = ruleset.terrains[baseTerrain]!!
isWater = getBaseTerrain().type == TerrainType.Water isWater = getBaseTerrain().type == TerrainType.Water
isLand = getBaseTerrain().type == TerrainType.Land isLand = getBaseTerrain().type == TerrainType.Land
isOcean = baseTerrain == Constants.ocean isOcean = baseTerrain == Constants.ocean

6
core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt
View File

@ -493,9 +493,9 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera
} }
if (tileInfo.terrainFeature != null) { if (tileInfo.terrainFeature != null) {
val terrainFeature = tileInfo.getTerrainFeature()!! val terrainFeature = tileInfo.getTerrainFeature()
if(terrainFeature.occursOn.isNotEmpty() && !terrainFeature.occursOn.contains(tileInfo.baseTerrain)) if (terrainFeature==null || terrainFeature.occursOn.isNotEmpty() && !terrainFeature.occursOn.contains(tileInfo.baseTerrain))
tileInfo.terrainFeature=null tileInfo.terrainFeature = null
} }
if (tileInfo.resource != null) { if (tileInfo.resource != null) {
val resource = tileInfo.getTileResource() val resource = tileInfo.getTileResource()