AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Barbarian generation improvement.

Browse Source
This commit is contained in:
Duan Tao 2019-01-27 21:34:40 +08:00
parent 624f83d109
commit edc53171cc
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,10 +91,13 @@ class GameInfo {
tile = viableTiles.getRandom() tile = viableTiles.getRandom()
} }
val allResearchedTechs = civilizations.filterNot { it.isBarbarianCivilization() } var allResearchedTechs = GameBasics.Technologies.keys
.flatMap { it.tech.researchedTechnologies }.map{ it.name } 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 } val unitList = GameBasics.Units.values.filter { !it.unitType.isCivilian() && it.uniqueTo == null }
.filter{ allResearchedTechs.contains(it.requiredTech) } .filter{ allResearchedTechs.contains(it.requiredTech)
&& (it.obsoleteTech == null || !allResearchedTechs.contains(it.obsoleteTech!!)) }
val unit = if (unitList.isEmpty()) "Warrior" else unitList.getRandom().name val unit = if (unitList.isEmpty()) "Warrior" else unitList.getRandom().name
tileMap.placeUnitNearTile(tile!!.position, unit, getBarbarianCivilization()) tileMap.placeUnitNearTile(tile!!.position, unit, getBarbarianCivilization())