diff options
Diffstat (limited to 'src/main')
5 files changed, 2 insertions, 36 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/CoopBossHighlightConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/CoopBossHighlightConfig.java index c3edb3b91..f3358c00c 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/CoopBossHighlightConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/CoopBossHighlightConfig.java @@ -35,10 +35,4 @@ public class CoopBossHighlightConfig { @ConfigEditorBoolean @FeatureToggle public boolean twinClawsTitle = true; - - @Expose - @ConfigOption(name = "Twinclaws Sound", desc = "Play a sound when Twinclaws is about to happen.") - @ConfigEditorBoolean - @FeatureToggle - public boolean twinClawsSound = true; } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/OthersBossConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/OthersBossConfig.java index 87d9343d6..7f96a2d7b 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/OthersBossConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/OthersBossConfig.java @@ -30,10 +30,4 @@ public class OthersBossConfig { @ConfigEditorBoolean @FeatureToggle public boolean twinClawsTitle = true; - - @Expose - @ConfigOption(name = "Twinclaws Sound", desc = "Play a sound when Twinclaws is about to happen.") - @ConfigEditorBoolean - @FeatureToggle - public boolean twinClawsSound = true; } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/OwnBossConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/OwnBossConfig.java index 0750bac3e..44834b46e 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/OwnBossConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/OwnBossConfig.java @@ -31,10 +31,4 @@ public class OwnBossConfig { @ConfigEditorBoolean @FeatureToggle public boolean twinClawsTitle = true; - - @Expose - @ConfigOption(name = "Twinclaws Sound", desc = "Play a sound when Twinclaws is about to happen.") - @ConfigEditorBoolean - @FeatureToggle - public boolean twinClawsSound = true; } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/VampireConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/VampireConfig.java index 911b78761..8bc908c6f 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/VampireConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/VampireConfig.java @@ -47,7 +47,7 @@ public class VampireConfig { public String steakColor = "0:255:255:0:88"; @Expose - @ConfigOption(name = "Twinclaws", desc = "Delay the sound and title of Twinclaws alert for a given amount in milliseconds.") + @ConfigOption(name = "Twinclaws", desc = "Delay the Twinclaws alert for a given amount in milliseconds.") @ConfigEditorSlider(minStep = 1, minValue = 0, maxValue = 1000) public int twinclawsDelay = 0; diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt index 85bd64e9e..faf455246 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt @@ -127,16 +127,9 @@ object VampireSlayerFeatures { else if (containCoop && configCoopBoss.twinClawsTitle) true else taggedEntityList.contains(this.entityId) && configOtherBoss.twinClawsTitle - val shouldSendSound = - if (containUser && configOwnBoss.twinClawsSound) true - else if (containCoop && configCoopBoss.twinClawsSound) true - else taggedEntityList.contains(this.entityId) && configOtherBoss.twinClawsSound - - if (shouldSendTitle || shouldSendSound) { + if (shouldSendTitle) { DelayedRun.runDelayed(config.twinclawsDelay.milliseconds) { if (nextClawSend < System.currentTimeMillis()) { - if (shouldSendSound) - playTwinclawsSound() if (shouldSendTitle) { LorenzUtils.sendTitle( "§6§lTWINCLAWS", @@ -204,15 +197,6 @@ object VampireSlayerFeatures { } } - private fun playTwinclawsSound() { - SkyHanniMod.coroutineScope.launch { - repeat(15) { - delay(50) - SoundUtils.createSound("random.orb", 0.5f).playSound() - } - } - } - private fun EntityOtherPlayerMP.isHighlighted(): Boolean { return entityList.contains(this) || taggedEntityList.contains(this.entityId) } |