Skip to content

feat: Replace dynamicXPMod setting with flexible experienceRateMin/Max #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HarleyGilpin wants to merge 1 commit into from
Closed

feat: Replace dynamicXPMod setting with flexible experienceRateMin/Max #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions ...src/main/kotlin/world/gregs/voidps/engine/entity/character/player/skill/exp/Experience.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,21 @@ class Experience(
}

fun add(skill: Skill, baseExperience: Double) {
if (baseExperience <= 0.0) {
return
}
if (baseExperience <= 0.0) return

val rateMin = Settings["world.experienceRateMin", 1.0]
val rateMax = Settings["world.experienceRateMax", 1.0]

val xpModSetting = Settings["world.dynamicXPMod", "off"].lowercase()
val playerMaxLevel = level(skill, get(skill))
val maxLevel = Level.MAX_LEVEL
val playerLevel = level(skill, get(skill)).toDouble()
val maxLevel = Level.MAX_LEVEL.toDouble()

val modifier = when (xpModSetting) {
"linear" -> interpolate(1.0, 5.0, playerMaxLevel.toDouble() / maxLevel)
"inverse" -> interpolate(5.0, 1.0, playerMaxLevel.toDouble() / maxLevel)
else -> 1.0
val modifier = if (rateMin != rateMax) {
interpolate(rateMin, rateMax, playerLevel / maxLevel)
} else {
rateMin
}

val experienceRate = Settings["world.experienceRate", DEFAULT_EXPERIENCE_RATE]
val adjustedExperience = baseExperience * modifier * experienceRate
val adjustedExperience = baseExperience * modifier

if (blocked.contains(skill)) {
events.emit(BlockedExperience(skill, adjustedExperience))
Expand Down
3 changes: 2 additions & 1 deletion ...ain/kotlin/world/gregs/voidps/engine/entity/character/player/skill/level/Interpolation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ object Interpolation {
}

fun interpolate(start: Double, end: Double, fraction: Double): Double {
return start + fraction * (end - start)
val result = start + fraction * (end - start)
return kotlin.math.round(result * 10) / 10.0
}

fun lerp(value: Int, inRange: IntRange, result: IntRange): Int {
Expand Down
6 changes: 5 additions & 1 deletion game/src/main/resources/game.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,11 @@ world.home.y=3219
world.messages=false

# Experience multiplier (1.0 = normal XP rate)
world.experienceRate=1.0
# Set both to the same value (e.g., 1.0) for static XP
# Set min < max for increasing XP at higher levels
# Set min > max for decreasing XP at higher levels
world.experienceRateMin=1.0
world.experienceRateMax=1.0

# world.dynamicXPMod - Linear (1x-5x multiplier) or inverse (5x-1x multiplier) XP scaling: "off", "linear", or "inverse"
world.dynamicXPMod=off
Expand Down
Loading