Repo-Mirror/EcoQuests
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoQuests.git synced 2025-12-19 15:09:22 +00:00
Code Issues Releases 1 Activity

Merge pull request #4 from Exanthiax/improved_sorting

Browse Source 
improved sorting and multi-line descriptions
This commit is contained in:
Will FP
2024-09-22 15:47:35 +01:00
committed by GitHub
parent 5e51c369bb c1c985d638
commit 26ccae38b1
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/quests/Quest.kt
View File

@@ -101,10 +101,20 @@ class Quest(
// The tasks that are actually in use
var tasks = run {
if (isResettable) {
loadTasks() ?: availableTasks.randomlyPick(taskAmount)
if (taskAmount == availableTasks.size) {
// If taskAmount is equal to availableTasks.size then tasks are ordered as configured
if (isResettable) {
availableTasks.take(taskAmount)
} else {
availableTasks.shuffled().take(taskAmount)
}
} else {
availableTasks.randomlyPick(taskAmount)
// If taskAmount is less than availableTasks.size then tasks are selected and ordered randomly.
if (isResettable) {
loadTasks() ?: availableTasks.randomlyPick(taskAmount)
} else {
availableTasks.randomlyPick(taskAmount)
}
}
}
private set
@@ -268,7 +278,8 @@ class Quest(
}
fun getDescription(player: Player): List<String> {
return addPlaceholdersInto(listOf(config.getString("description")), player)
val descriptions = config.getStrings("description")
return addPlaceholdersInto(descriptions, player)
}
fun hasActive(player: OfflinePlayer): Boolean {