aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorHiZe_ <superhize@hotmail.com>2023-07-05 17:24:00 +0200
committerGitHub <noreply@github.com>2023-07-05 17:24:00 +0200
commit7d4d1e0f0f21ef3407e60795602193c07f4cd5d9 (patch)
tree50e200b4932e2778ba74ded7cc566899a7305304 /src/main/java
parente041b9205fed5b550a5e3e2986d68def6d14b6ca (diff)
downloadskyhanni-7d4d1e0f0f21ef3407e60795602193c07f4cd5d9.tar.gz
skyhanni-7d4d1e0f0f21ef3407e60795602193c07f4cd5d9.tar.bz2
skyhanni-7d4d1e0f0f21ef3407e60795602193c07f4cd5d9.zip
Jinxed voodoo doll abillity cooldown support (#299)
Co-authored-by: superhize <superhize@gmail.com>
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt5
2 files changed, 6 insertions, 0 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 b8c0e306a..9fd8eeeab 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
@@ -37,6 +37,7 @@ enum class ItemAbility(
SWORD_OF_BAD_HEALTH(5),
WITHER_CLOAK(10),
HOLY_ICE(4),
+ VOODOO_DOLL_WILTED(3),
// doesn't have a sound
ENDER_BOW("Ender Warp", 30, "Ender Bow"),
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 dc746c0d5..309a1ab70 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
@@ -68,6 +68,11 @@ class ItemAbilityCooldown {
ItemAbility.VOODOO_DOLL.sound()
}
}
+ if (event.soundName == "random.successful_hit") {
+ if (event.volume == 1.0f && event.pitch == 0.7936508f) {
+ ItemAbility.VOODOO_DOLL_WILTED.sound()
+ }
+ }
if (event.soundName == "random.explode") {
if (event.pitch == 4.047619f && event.volume == 0.2f) {
ItemAbility.GOLEM_SWORD.sound()