diff options
| author | HiZe_ <superhize@hotmail.com> | 2023-07-01 00:25:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-01 00:25:18 +0200 |
| commit | 3567d74fe1b4da52c07e952596ae2bddee29a8e5 (patch) | |
| tree | 19142c5af01ed77220154e4cfa2429b236c1213a /src/main/java/at/hannibal2/skyhanni | |
| parent | 6358190311cc90a8713da774010e6fd6fefd83ee (diff) | |
| download | skyhanni-3567d74fe1b4da52c07e952596ae2bddee29a8e5.tar.gz skyhanni-3567d74fe1b4da52c07e952596ae2bddee29a8e5.tar.bz2 skyhanni-3567d74fe1b4da52c07e952596ae2bddee29a8e5.zip | |
Added support for Weirder Tuba and Holy ice in ability cooldown (#272)
Co-authored-by: superhize <superhize@gmail.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni')
2 files changed, 7 insertions, 1 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 e018933bf..b8c0e306a 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,10 +32,11 @@ enum class ItemAbility( STAFF_OF_THE_VOLCANO(30), STARLIGHT_WAND(2), VOODOO_DOLL(5), - WEIRD_TUBA(20), + WEIRD_TUBA(20, "WEIRDER_TUBA"), FIRE_FREEZE_STAFF(10), SWORD_OF_BAD_HEALTH(5), WITHER_CLOAK(10), + HOLY_ICE(4), // 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 f6127512b..dc746c0d5 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 @@ -113,6 +113,11 @@ class ItemAbilityCooldown { ItemAbility.STAFF_OF_THE_VOLCANO.sound() } } + if (event.soundName == "random.drink") { + if (event.pitch == 1.8888888f && event.volume == 1.0f) { + ItemAbility.HOLY_ICE.sound() + } + } } @SubscribeEvent |