diff options
| author | Brandon <brandon.wamboldt@gmail.com> | 2023-09-10 07:19:03 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-10 12:19:03 +0200 |
| commit | 855cda60f0650811fd5af1934c430294b51dc5f0 (patch) | |
| tree | dca90b5eff769dacffa155ecd229c65dd4f65c7b /src/main/java | |
| parent | 1159de0e664adeb3f474d2ef20766bdfd2b2c72d (diff) | |
| download | skyhanni-855cda60f0650811fd5af1934c430294b51dc5f0.tar.gz skyhanni-855cda60f0650811fd5af1934c430294b51dc5f0.tar.bz2 skyhanni-855cda60f0650811fd5af1934c430294b51dc5f0.zip | |
Fix item cooldown for fire fury staff and jinxed voodoo doll (#460)
Fix item cooldown for fire fury staff and jinxed voodoo doll #460
Diffstat (limited to 'src/main/java')
2 files changed, 16 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 6ab81e0c9..de6f1521f 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 @@ -41,6 +41,7 @@ enum class ItemAbility( WITHER_CLOAK(10), HOLY_ICE(4), VOODOO_DOLL_WILTED(3), + FIRE_FURY_STAFF(20), SHADOW_FURY(15, "STARRED_SHADOW_FURY"), // doesn't have a sound @@ -48,7 +49,6 @@ enum class ItemAbility( LIVID_DAGGER("Throw", 5, "Livid Dagger"), FIRE_VEIL("Fire Veil", 5, "Fire Veil Wand"), INK_WAND("Ink Bomb", 30, "Ink Wand"), - FIRE_FURY_STAFF("Firestorm", 20, "Fire Fury Staff"), // doesn't have a consistent sound ECHO("Echo", 3, "Ancestral Spade"); 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 a0fd45a13..a664bd0ce 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 @@ -25,6 +25,7 @@ class ItemAbilityCooldown { private val youAlignedOthersPattern = "§eYou aligned §r§a.* §r§eother player(s)?!".toPattern() private val WEIRD_TUBA = "WEIRD_TUBA".asInternalName() private val WEIRDER_TUBA = "WEIRDER_TUBA".asInternalName() + private val VOODOO_DOLL_WILTED = "VOODOO_DOLL_WILTED".asInternalName() @SubscribeEvent fun onSoundEvent(event: PlaySoundEvent) { @@ -36,6 +37,11 @@ class ItemAbilityCooldown { ItemAbility.HYPERION.sound() } } + if (event.soundName == "liquid.lavapop") { + if (event.pitch == 1.0f && event.volume == 1f) { + ItemAbility.FIRE_FURY_STAFF.sound() + } + } if (event.soundName == "mob.enderdragon.growl") { if (event.pitch == 1f && event.volume == 1f) { ItemAbility.ICE_SPRAY_WAND.sound() @@ -86,11 +92,19 @@ class ItemAbilityCooldown { ItemAbility.VOODOO_DOLL.sound() } } - if (event.soundName == "random.successful_hit") { + if (event.soundName == "random.successful_hit") { // Jinxed Voodoo Doll Hit if (event.volume == 1.0f && event.pitch == 0.7936508f) { ItemAbility.VOODOO_DOLL_WILTED.sound() } } + if (event.soundName == "mob.ghast.scream") { // Jinxed Voodoo Doll Miss + if (event.volume == 1.0f && event.pitch >= 1.6 && event.pitch <= 1.7) { + val recentItems = InventoryUtils.recentItemsInHand.values + if (VOODOO_DOLL_WILTED in recentItems) { + ItemAbility.VOODOO_DOLL_WILTED.sound() + } + } + } if (event.soundName == "random.explode") { if (event.pitch == 4.047619f && event.volume == 0.2f) { ItemAbility.GOLEM_SWORD.sound() |