mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-06 08:21:36 +07:00
Code Issues Packages Projects Releases Wiki Activity

Allow Barbarians to make set-up ranged units (#11173)

Browse Source 
Allow Barbarians to create units that must set up to ranged attack, unless specifically forbidden by the relevant unique

Since we have a unique for this explicit purpose, we no longer need this extra prevention for Barbarian unit types.
This commit is contained in:
SpacedOutChicken
2024-02-24 13:38:22 -07:00
committed by GitHub
parent bebe0c67da
commit b17f162be9
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/automation/civilization/BarbarianManager.kt
View File

@ -258,8 +258,7 @@ class Encampment() : IsPartOfGameInfoSerialization {
barbarianCiv.tech.techsResearched = allResearchedTechs.toHashSet() barbarianCiv.tech.techsResearched = allResearchedTechs.toHashSet()
val unitList = gameInfo.ruleset.units.values val unitList = gameInfo.ruleset.units.values
.filter { it.isMilitary() && .filter { it.isMilitary() &&
!(it.hasUnique(UniqueType.MustSetUp) || !(it.hasUnique(UniqueType.CannotAttack) ||
it.hasUnique(UniqueType.CannotAttack) ||
it.hasUnique(UniqueType.CannotBeBarbarian)) && it.hasUnique(UniqueType.CannotBeBarbarian)) &&
(if (naval) it.isWaterUnit() else it.isLandUnit()) && (if (naval) it.isWaterUnit() else it.isLandUnit()) &&
it.isBuildable(barbarianCiv) } it.isBuildable(barbarianCiv) }