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

Resolved #12678 - city-states don't take unique units from barbarians / other city states

Browse Source
This commit is contained in:
yairm210
2024-12-22 10:45:00 +02:00
parent 053ca67bed
commit 7eb642d40d
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt
View File

@ -59,6 +59,7 @@ class CityStateFunctions(val civInfo: Civilization) {
return@filter !it.availableInEra(ruleset, startingEra) // Not from the start era or before
&& it.uniqueTo != null && it.uniqueTo !in usedMajorCivs // Must be from a major civ not in the game
// Note that this means that units unique to a civ *filter* instead of a civ *name* will not be provided
&& ruleset.nations[it.uniqueTo]?.isMajorCiv == true // don't take unique units from other city states / barbs
&& ruleset.unitTypes[it.unitType]!!.isLandUnit()
&& (it.strength > 0 || it.rangedStrength > 0) // Must be a land military unit
}