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

Barbarians no longer spawn on mountains and lakes (a bit silly)

Browse Source
This commit is contained in:
Yair Morgenstern
2019-04-15 22:08:44 +03:00
parent 66370400b5
commit cbf0c52d2c
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/GameInfo.kt
View File

@ -86,7 +86,9 @@ class GameInfo {
// Barbarians will only spawn in places that no one can see
val allViewableTiles = civilizations.filterNot { it.isBarbarianCivilization() }
.flatMap { it.viewableTiles }.toHashSet()
val viableTiles = tileMap.values.filterNot { allViewableTiles.contains(it) || it.militaryUnit != null || it.civilianUnit != null }
val viableTiles = tileMap.values.filter { it.militaryUnit == null
&& it.civilianUnit == null && !it.getBaseTerrain().impassable && it.baseTerrain!="Lakes"
&& !allViewableTiles.contains(it)}
if (viableTiles.isEmpty()) return // no place for more barbs =(
tile = viableTiles.random()
}