AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 05:46:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #439 from ninjatao/barbarians

Browse Source 
Barbarians
This commit is contained in:
Yair Morgenstern 2019-01-27 17:58:58 +02:00 committed by GitHub
commit 5ab6c6c991
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,17 @@ class GameInfo {
if (viableTiles.isEmpty()) return // no place for more barbs =(
tile = viableTiles.getRandom()
}
tileMap.placeUnitNearTile(tile!!.position, "Warrior", getBarbarianCivilization())
var allResearchedTechs = GameBasics.Technologies.keys
for (civ in civilizations.filter { !it.isBarbarianCivilization() && !it.isDefeated() }) {
allResearchedTechs.retainAll(civ.tech.techsResearched)
}
val unitList = GameBasics.Units.values.filter { !it.unitType.isCivilian() && it.uniqueTo == null }
.filter{ allResearchedTechs.contains(it.requiredTech)
&& (it.obsoleteTech == null || !allResearchedTechs.contains(it.obsoleteTech!!)) }
val unit = if (unitList.isEmpty()) "Warrior" else unitList.getRandom().name
tileMap.placeUnitNearTile(tile!!.position, unit, getBarbarianCivilization())
}
fun setTransients() {
@ -131,4 +141,4 @@ class GameInfo {
}
}
}
}