diff --git a/src/main/java/net/oxyopia/vice/config/Config.java b/src/main/java/net/oxyopia/vice/config/Config.java index 5acab9f0..c367bbcc 100644 --- a/src/main/java/net/oxyopia/vice/config/Config.java +++ b/src/main/java/net/oxyopia/vice/config/Config.java @@ -565,6 +565,22 @@ public void OPEN_DEV_CONFIG() { ) public float EIGHT_BIT_KATANA_VOLUME = 1f; + @Property( + type = PropertyType.DECIMAL_SLIDER, + name = "Wave Pulser Volume", + category = "Sounds", + maxF = 2f + ) + public float WAVE_PULSER_VOLUME = 1f; + + @Property( + type = PropertyType.SWITCH, + name = "Apply to Wave Pulser Volume to Evoker Fangs", + description = "Wether the Evoker Fangs sound is affected by Wave Pulser Volume. Disable if you still want to know how many mobs were hit without getting earraped.", + category = "Sounds" + ) + public boolean APPLY_WAVE_PULSER_VOLUME_TO_FANGS = true; + @Property( type = PropertyType.DECIMAL_SLIDER, name = "Glitch Mallet Volume", @@ -795,6 +811,8 @@ public void init() { addDependency("LIVE_ARENA_MOBS", "LIVE_ARENA_TOGGLE"); addDependency("LIVE_ARENA_ROUND_TIMER", "LIVE_ARENA_TOGGLE"); addDependency("LIVE_ARENA_DROPS", "LIVE_ARENA_TOGGLE"); + + addDependency("APPLY_WAVE_PULSER_VOLUME_TO_FANGS", "WAVE_PULSER_VOLUME", (value) -> (float) value != 1f); } public @NotNull List getMigrations() { diff --git a/src/main/java/net/oxyopia/vice/features/itemabilities/AbilitySoundChanger.kt b/src/main/java/net/oxyopia/vice/features/itemabilities/AbilitySoundChanger.kt index 402dea62..8f5f4831 100644 --- a/src/main/java/net/oxyopia/vice/features/itemabilities/AbilitySoundChanger.kt +++ b/src/main/java/net/oxyopia/vice/features/itemabilities/AbilitySoundChanger.kt @@ -23,7 +23,7 @@ object AbilitySoundChanger { event.setReturnValue(config.SNOWBALL_CANNON_VOLUME) } - (sound == "entity.snowball.throw" || sound == "entity.generic.explode") && volume == 9999f && ItemAbility.ARCTIC_CORE.remainingCooldown() > 0f -> { + (sound == "entity.snowball.throw" || sound == "entity.generic.explode") && volume == 9999f && ItemAbility.ARCTIC_CORE.isOnCooldown() -> { event.setReturnValue(config.ARCTIC_CORE_VOLUME) } @@ -46,6 +46,17 @@ object AbilitySoundChanger { (sound == "entity.illusioner.cast_spell" && ItemAbility.SHADOW_GELATO_DRUM_GUN.isOnCooldown()) -> { event.setReturnValue(config.SHADOW_DRUM_GUN_VOLUME) } + + volume == 3f && ( + sound == "block.beacon.activate" || + sound == "item.shield.block" || + sound == "entity.player.hurt_freeze" || + sound == "entity.elder_guardian.curse" || + sound == "item.trident.riptide_1" || + (sound == "entity.evoker_fangs.attack" && config.APPLY_WAVE_PULSER_VOLUME_TO_FANGS) + ) && ItemAbility.WAVE_PULSER.remainingCooldown() >= 7f -> { + event.setReturnValue(config.WAVE_PULSER_VOLUME) + } } } } \ No newline at end of file