diff --git a/core/src/com/unciv/logic/map/tile/TileStatFunctions.kt b/core/src/com/unciv/logic/map/tile/TileStatFunctions.kt index a74fce64dd..2833d4b08d 100644 --- a/core/src/com/unciv/logic/map/tile/TileStatFunctions.kt +++ b/core/src/com/unciv/logic/map/tile/TileStatFunctions.kt @@ -56,11 +56,15 @@ class TileStatFunctions(val tile: Tile) { ): List> { val stateForConditionals = StateForConditionals(civInfo = observingCiv, city = city, tile = tile) val listOfStats = getTerrainStatsBreakdown(stateForConditionals) + + val otherYieldsIgnored = tile.allTerrains.any { it.hasUnique(UniqueType.NullifyYields, stateForConditionals) } - val improvement = tile.getUnpillagedTileImprovement() + val improvement = if (otherYieldsIgnored) null // Treat it as if there is no improvement + else tile.getUnpillagedTileImprovement() val improvementStats = improvement?.cloneStats() ?: Stats.ZERO // If improvement==null, will never be added to - val road = tile.getUnpillagedRoadImprovement() + val road = if (otherYieldsIgnored) null + else tile.getUnpillagedRoadImprovement() val roadStats = road?.cloneStats() ?: Stats.ZERO if (city != null) {