wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Barbarians will not spawn in tiles that any civilization can currently see

Browse source
This commit is contained in:
Yair Morgenstern 2018-07-16 12:36:33 +03:00
parent ce7cb2ce17
commit 2cd3347cec
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/com/unciv/logic/GameInfo.kt
View file

@ -64,8 +64,10 @@ class GameInfo {
fun placeBarbarianUnit(tileToPlace: TileInfo?) {
var tile = tileToPlace
if(tileToPlace==null) {
val playerViewableTiles = getPlayerCivilization().getViewableTiles().toHashSet()
val viableTiles = tileMap.values.filterNot { playerViewableTiles.contains(it) || it.militaryUnit != null || it.civilianUnit!=null}
// Barbarians will only spawn in places that no one can see
val allViewableTiles = civilizations.filterNot { it.isBarbarianCivilization() }
.flatMap { it.getViewableTiles() }.toHashSet()
val viableTiles = tileMap.values.filterNot { allViewableTiles.contains(it) || it.militaryUnit != null || it.civilianUnit!=null}
if(viableTiles.isEmpty()) return // no place for more barbs =(
tile=viableTiles.getRandom()
}