9
0
mirror of https://github.com/Auxilor/EcoQuests.git synced 2025-12-21 16:09:16 +00:00

Compare commits

..

26 Commits

Author SHA1 Message Date
Will FP
779f942454 libreforge-updater 2025-03-29 14:22:27 +00:00
Will FP
abad5bdfbd libreforge-updater 2025-01-31 11:55:03 +00:00
Will FP
588839fc97 libreforge-updater 2025-01-25 13:50:08 +00:00
Will FP
1c36c4b18f Fix 2025-01-25 13:48:44 +00:00
Will FP
0460f1f6bf libreforge-updater 2025-01-25 13:46:03 +00:00
Will FP
5814587ed5 libreforge-updater 2024-11-06 18:33:27 +00:00
Will FP
f4682214cc libreforge-updater 2024-10-22 12:14:38 +01:00
Will FP
3c0d5651d8 Merge pull request #3 from kiriharu/master
FIX: Prevent to give expirience to task when it marked as completed
2024-09-26 19:08:57 +01:00
Will FP
c86651df9b libreforge-updater 2024-09-22 17:00:59 +01:00
Will FP
26ccae38b1 Merge pull request #4 from Exanthiax/improved_sorting
improved sorting and multi-line descriptions
2024-09-22 15:47:35 +01:00
Exanthiax
c1c985d638 improved sorting and multi-line descriptions 2024-09-22 15:12:11 +01:00
kiriharu
ed947b354f FIX: Stop giving exp to task and call steps related to it when task already marked as completed 2024-09-21 13:00:51 +03:00
Auxilor
5e51c369bb libreforge-updater 2024-09-02 11:30:14 +01:00
Auxilor
67a2e2fb4f libreforge-updater 2024-08-30 17:25:13 +01:00
Auxilor
f94e79bc92 libreforge-updater 2024-08-29 12:09:23 +01:00
Auxilor
9cf8d465b9 libreforge-updater 2024-08-23 15:35:29 +01:00
Auxilor
237ebda870 libreforge-updater 2024-08-21 18:58:25 +01:00
Auxilor
ed6bcaab04 libreforge-updater 2024-08-15 15:07:42 +01:00
Auxilor
40a0f99716 libreforge-updater 2024-08-03 13:41:32 +01:00
Auxilor
a59bce65ab libreforge-updater 2024-07-25 10:04:39 +01:00
Auxilor
0212076fad libreforge-updater 2024-07-21 12:19:23 +01:00
Auxilor
c4b0429ad5 libreforge-updater 2024-07-19 20:28:44 +01:00
Auxilor
c5e0611a20 libreforge-updater 2024-07-18 13:24:18 +01:00
Auxilor
cb2e8a181f libreforge-updater 2024-07-16 17:13:48 +01:00
Auxilor
c40a304c8a libreforge-updater 2024-07-13 20:45:24 +01:00
Auxilor
9e7a8a7581 libreforge-updater 2024-07-08 15:58:33 +01:00
4 changed files with 32 additions and 14 deletions

View File

@@ -1,9 +1,11 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
java
`java-library`
`maven-publish`
kotlin("jvm") version "1.9.20"
id("io.github.goooler.shadow") version "8.1.7"
kotlin("jvm") version "2.1.0"
id("com.gradleup.shadow") version "8.3.0"
id("com.willfp.libreforge-gradle-plugin") version "1.0.0"
}
@@ -25,7 +27,7 @@ allprojects {
apply(plugin = "java")
apply(plugin = "kotlin")
apply(plugin = "maven-publish")
apply(plugin = "io.github.goooler.shadow")
apply(plugin = "com.gradleup.shadow")
repositories {
mavenLocal()
@@ -39,12 +41,12 @@ allprojects {
dependencies {
compileOnly("com.willfp:eco:6.65.0")
compileOnly("org.jetbrains:annotations:23.0.0")
compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.20")
compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.1.0")
}
java {
withSourcesJar()
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
toolchain.languageVersion.set(JavaLanguageVersion.of(17))
}
tasks {
@@ -54,8 +56,8 @@ allprojects {
}
compileKotlin {
kotlinOptions {
jvmTarget = "21"
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}

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 {

View File

@@ -146,6 +146,11 @@ class Task(
* Give experience directly
*/
fun giveExperience(player: Player, amount: Double) {
if (player.profile.read(hasCompletedKey)) {
return
}
val requiredXp = getExperienceRequired(player)
val newXp = player.profile.read(xpKey) + amount

View File

@@ -1,5 +1,5 @@
#libreforge-updater
#Fri Jul 05 13:02:51 BST 2024
#Sat Mar 29 14:22:27 GMT 2025
kotlin.code.style=official
libreforge-version=4.64.1
version=1.35.1
libreforge-version=4.75.0
version=1.46.0