mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-10 07:48:31 +07:00
Resolve #9432 - city-state-owned great merchants can no longer 'conduct trade mission' on their own tiles
This commit is contained in:
@ -259,7 +259,10 @@ object SpecificUnitAutomation {
|
||||
val closestCityStateTile =
|
||||
unit.civ.gameInfo.civilizations
|
||||
.filter {
|
||||
!unit.civ.isAtWarWith(it) && it.isCityState() && it.cities.isNotEmpty()
|
||||
it != unit.civ
|
||||
&& !unit.civ.isAtWarWith(it)
|
||||
&& it.isCityState()
|
||||
&& it.cities.isNotEmpty()
|
||||
}
|
||||
.flatMap { it.cities[0].getTiles() }
|
||||
.filter { unit.civ.hasExplored(it) }
|
||||
|
@ -6,8 +6,8 @@ import com.unciv.logic.civilization.Civilization
|
||||
import com.unciv.logic.civilization.NotificationCategory
|
||||
import com.unciv.logic.civilization.NotificationIcon
|
||||
import com.unciv.logic.civilization.PopupAlert
|
||||
import com.unciv.logic.map.tile.Tile
|
||||
import com.unciv.logic.map.mapunit.UnitMovement
|
||||
import com.unciv.logic.map.tile.Tile
|
||||
import com.unciv.models.ruleset.unique.UniqueType
|
||||
import com.unciv.models.stats.Stat
|
||||
import com.unciv.models.stats.Stats
|
||||
@ -37,7 +37,7 @@ class DiplomacyFunctions(val civInfo:Civilization){
|
||||
otherCiv.diplomacyFunctions.meetCiv(civInfo, warOnContact)
|
||||
}
|
||||
|
||||
fun meetCiv(otherCiv: Civilization, warOnContact: Boolean = false) {
|
||||
private fun meetCiv(otherCiv: Civilization, warOnContact: Boolean = false) {
|
||||
civInfo.diplomacy[otherCiv.civName] = DiplomacyManager(civInfo, otherCiv.civName)
|
||||
.apply { diplomaticStatus = DiplomaticStatus.Peace }
|
||||
|
||||
|
Reference in New Issue
Block a user