mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-19 16:57:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed later civs not getting any CS quests

Browse Source
This commit is contained in:
Yair Morgenstern 2023-06-04 11:58:27 +03:00
parent 13619d18a1
commit c0bd8c12fb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,8 @@ class QuestManager : IsPartOfGameInfoSerialization {
/** Number of turns left before starting new global quest */ /** Number of turns left before starting new global quest */
private var globalQuestCountdown: Int = UNSET private var globalQuestCountdown: Int = UNSET
/** Number of turns left before this city state can start a new individual quest */ /** Number of turns left before this city state can start a new individual quest.
* Key is major civ name, value is turns to quest */
private var individualQuestCountdown: HashMap<String, Int> = HashMap() private var individualQuestCountdown: HashMap<String, Int> = HashMap()
/** Target number of units to kill for this war, for war with major pseudo-quest */ /** Target number of units to kill for this war, for war with major pseudo-quest */
@ -209,10 +210,10 @@ class QuestManager : IsPartOfGameInfoSerialization {
val challenger = civInfo.gameInfo.getCivilization(challengerName) val challenger = civInfo.gameInfo.getCivilization(challengerName)
if (countdown != 0) if (countdown != 0)
return continue
if (assignedQuests.count { it.assignee == challenger.civName && it.isIndividual() } >= INDIVIDUAL_QUEST_MAX_ACTIVE) if (assignedQuests.count { it.assignee == challenger.civName && it.isIndividual() } >= INDIVIDUAL_QUEST_MAX_ACTIVE)
return continue
val assignableQuests = civInfo.gameInfo.ruleset.quests.values.filter { it.isIndividual() && isQuestValid(it, challenger) } val assignableQuests = civInfo.gameInfo.ruleset.quests.values.filter { it.isIndividual() && isQuestValid(it, challenger) }
val weights = assignableQuests.map { getQuestWeight(it.name) } val weights = assignableQuests.map { getQuestWeight(it.name) }
@ -222,7 +223,6 @@ class QuestManager : IsPartOfGameInfoSerialization {
val assignees = arrayListOf(challenger) val assignees = arrayListOf(challenger)
assignNewQuest(quest, assignees) assignNewQuest(quest, assignees)
break
} }
} }
} }