aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt7
2 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
index de49befd8..8f62d5266 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
@@ -32,7 +32,8 @@ enum class ItemAbility(
STAFF_OF_THE_VOLCANO(30),
STARLIGHT_WAND(2),
VOODOO_DOLL(5),
- WEIRD_TUBA(20, "WEIRDER_TUBA"),
+ WEIRD_TUBA(20),
+ WEIRDER_TUBA(30),
FIRE_FREEZE_STAFF(10),
SWORD_OF_BAD_HEALTH(5),
WITHER_CLOAK(10),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
index e7137bf17..afb1210aa 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.itemabilities.abilitycooldown
import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.data.ItemRenderBackground.Companion.background
import at.hannibal2.skyhanni.events.*
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
import at.hannibal2.skyhanni.utils.InventoryUtils
import at.hannibal2.skyhanni.utils.ItemUtils
import at.hannibal2.skyhanni.utils.ItemUtils.cleanName
@@ -90,7 +91,11 @@ class ItemAbilityCooldown {
}
if (event.soundName == "mob.wolf.howl") {
if (event.volume == 0.5f) {
- ItemAbility.WEIRD_TUBA.sound()
+ if (!RiftAPI.inRift()) {
+ ItemAbility.WEIRD_TUBA.sound()
+ } else {
+ ItemAbility.WEIRDER_TUBA.sound()
+ }
}
}
if (event.soundName == "mob.zombie.unfect") {