aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-12-25 14:01:20 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-12-25 14:01:20 +0100
commitcda98f91f58002ed2b757da98682f308d505b8a0 (patch)
tree967cec2f30e19eca5bc6d25057843f9f5e989b6b /src/main/java
parent98e83588fd9b80e21f5fb9332649d5044409b6f6 (diff)
downloadskyhanni-cda98f91f58002ed2b757da98682f308d505b8a0.tar.gz
skyhanni-cda98f91f58002ed2b757da98682f308d505b8a0.tar.bz2
skyhanni-cda98f91f58002ed2b757da98682f308d505b8a0.zip
Added Derpy XP factor to minion xp display.
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt
index 92f7d8e3e..5c755b66b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt
@@ -1,6 +1,7 @@
package at.hannibal2.skyhanni.features.minion
import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.MayorElection
import at.hannibal2.skyhanni.data.jsonobjects.repo.MinionXPJson
import at.hannibal2.skyhanni.events.IslandChangeEvent
import at.hannibal2.skyhanni.events.LorenzToolTipEvent
@@ -110,8 +111,11 @@ class MinionXp {
val name = item.name
val xp = xpInfoMap[name] ?: return@forEach
- // TODO add wisdom and Derpy to calculation and random extra Exp Events
- val xpAmount = xp.amount * item.stackSize
+ // TODO add wisdom and temporary skill exp (Events) to calculation
+ val baseXp = xp.amount * item.stackSize
+ val xpAmount = if (MayorElection.isPerkActive("Derpy", "MOAR SKILLZ!!!")) {
+ baseXp * 1.5
+ } else baseXp
xpItemMap[item] = collectMessage(xp.type, xpAmount)
xpTotal.compute(xp.type) { _, currentAmount -> (currentAmount ?: 0.0) + xpAmount }