From 61a0ccba5f9c44386a6476d920ee4605350e21bf Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 30 Nov 2020 22:07:44 +0200 Subject: [PATCH] Fixed minor mod bugs --- core/src/com/unciv/logic/civilization/CivilizationInfo.kt | 1 + core/src/com/unciv/logic/map/TileInfo.kt | 2 +- core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index d375b5ec96..52302f95fc 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -521,6 +521,7 @@ class CivilizationInfo { fun addUnit(unitName:String, city: CityInfo?=null) { if (cities.isEmpty()) return val cityToAddTo = city ?: cities.random() + if (!gameInfo.ruleSet.units.containsKey(unitName)) return val unit = getEquivalentUnit(unitName) placeUnitNearTile(cityToAddTo.location, unit.name) if (unit.uniques.any { it.equalsPlaceholderText("Great Person - []") }) diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index ba54c6b2f8..19a494927e 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -453,7 +453,7 @@ open class TileInfo { } fun setTerrainTransients() { - baseTerrainObject = ruleset.terrains[baseTerrain]!! // This is a HACK. + baseTerrainObject = ruleset.terrains[baseTerrain]!! isWater = getBaseTerrain().type == TerrainType.Water isLand = getBaseTerrain().type == TerrainType.Land isOcean = baseTerrain == Constants.ocean diff --git a/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt b/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt index c6d76b1ef3..d5bff3cf01 100644 --- a/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt +++ b/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt @@ -493,9 +493,9 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera } if (tileInfo.terrainFeature != null) { - val terrainFeature = tileInfo.getTerrainFeature()!! - if(terrainFeature.occursOn.isNotEmpty() && !terrainFeature.occursOn.contains(tileInfo.baseTerrain)) - tileInfo.terrainFeature=null + val terrainFeature = tileInfo.getTerrainFeature() + if (terrainFeature==null || terrainFeature.occursOn.isNotEmpty() && !terrainFeature.occursOn.contains(tileInfo.baseTerrain)) + tileInfo.terrainFeature = null } if (tileInfo.resource != null) { val resource = tileInfo.getTileResource()