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

Resolved #3639 - City states that can't be connected by land no longer assign road connection quests

Browse Source
This commit is contained in:
Yair Morgenstern 2021-03-03 22:43:07 +02:00
parent 9e98fb5b59
commit 0f109e31a0
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/com/unciv/logic/civilization/QuestManager.kt
View File

@ -5,6 +5,7 @@ import com.badlogic.gdx.math.Vector2
import com.unciv.Constants
import com.unciv.UncivGame
import com.unciv.logic.GameInfo
import com.unciv.logic.map.BFS
import com.unciv.logic.map.TileInfo
import com.unciv.models.ruleset.Building
import com.unciv.models.ruleset.Quest
@ -295,8 +296,14 @@ class QuestManager {
return when (quest.name) {
QuestName.ClearBarbarianCamp.value -> getBarbarianEncampmentForQuest(challenger) != null
QuestName.Route.value -> civInfo.hasEverBeenFriendWith(challenger) && challenger.cities.any()
&& !civInfo.isCapitalConnectedToCity(challenger.getCapital())
QuestName.Route.value -> {
if (challenger.cities.none() || !civInfo.hasEverBeenFriendWith(challenger)
|| civInfo.isCapitalConnectedToCity(challenger.getCapital())) return false
val bfs = BFS(civInfo.getCapital().getCenterTile()) { it.isLand && !it.isImpassible() }
bfs.stepUntilDestination(challenger.getCapital().getCenterTile())
bfs.hasReachedTile(challenger.getCapital().getCenterTile())
}
QuestName.ConnectResource.value -> civInfo.hasEverBeenFriendWith(challenger) && getResourceForQuest(challenger) != null
QuestName.ConstructWonder.value -> civInfo.hasEverBeenFriendWith(challenger) && getWonderToBuildForQuest(challenger) != null
QuestName.GreatPerson.value -> civInfo.hasEverBeenFriendWith(challenger) && getGreatPersonForQuest(challenger) != null