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

Resolved #12413 - City-state unique units are not taken from civs within this game

Browse Source
This commit is contained in:
yairm210
2024-11-07 13:10:44 +02:00
parent 0ea175573f
commit e4253bf007
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ import kotlin.random.Random
class CityStateFunctions(val civInfo: Civilization) { class CityStateFunctions(val civInfo: Civilization) {
/** Attempts to initialize the city state, returning true if successful. */ /** Attempts to initialize the city state, returning true if successful. */
fun initCityState(ruleset: Ruleset, startingEra: String, unusedMajorCivs: Sequence<String>): Boolean { fun initCityState(ruleset: Ruleset, startingEra: String, usedMajorCivs: Sequence<String>): Boolean {
val allMercantileResources = ruleset.tileResources.values.filter { it.hasUnique(UniqueType.CityStateOnlyResource) }.map { it.name } val allMercantileResources = ruleset.tileResources.values.filter { it.hasUnique(UniqueType.CityStateOnlyResource) }.map { it.name }
val uniqueTypes = HashSet<UniqueType>() // We look through these to determine what kinds of city states we have val uniqueTypes = HashSet<UniqueType>() // We look through these to determine what kinds of city states we have
@ -56,7 +56,7 @@ class CityStateFunctions(val civInfo: Civilization) {
if (uniqueTypes.contains(UniqueType.CityStateMilitaryUnits)) { if (uniqueTypes.contains(UniqueType.CityStateMilitaryUnits)) {
val possibleUnits = ruleset.units.values.filter { val possibleUnits = ruleset.units.values.filter {
return@filter !it.availableInEra(ruleset, startingEra) // Not from the start era or before return@filter !it.availableInEra(ruleset, startingEra) // Not from the start era or before
&& it.uniqueTo != null && it.uniqueTo in unusedMajorCivs // Must be from a major civ not in the game && 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 // Note that this means that units unique to a civ *filter* instead of a civ *name* will not be provided
&& ruleset.unitTypes[it.unitType]!!.isLandUnit() && ruleset.unitTypes[it.unitType]!!.isLandUnit()
&& (it.strength > 0 || it.rangedStrength > 0) // Must be a land military unit && (it.strength > 0 || it.rangedStrength > 0) // Must be a land military unit