Add <p@player.has_town> and <p@player.has_nation>