From ac4b8068b09ab7b7bded3d7dfec7bcccd426aea4 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Sun, 20 Jan 2019 02:44:18 -0800
Subject: [PATCH] Activating a super ability has a sound, and trying to cut
 down trees or activate skull splitter when on cooldown also has a sound.

---
 .../java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java | 5 +++++
 .../java/com/gmail/nossr50/util/sounds/SoundManager.java     | 2 ++
 src/main/java/com/gmail/nossr50/util/sounds/SoundType.java   | 3 ++-
 src/main/resources/sounds.yml                                | 3 +++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java
index 6a5d585e3..7fa5592e5 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java
@@ -806,6 +806,7 @@ public class McMMOPlayer {
              */
             if (skill == PrimarySkillType.WOODCUTTING || skill == PrimarySkillType.AXES) {
                 NotificationManager.sendPlayerInformation(player, NotificationType.ABILITY_COOLDOWN, "Skills.TooTired", String.valueOf(timeRemaining));
+                SoundManager.sendSound(player, player.getLocation(), SoundType.TIRED);
             }
 
             return;
@@ -828,6 +829,10 @@ public class McMMOPlayer {
 
         SkillUtils.sendSkillMessage(player, NotificationType.SUPER_ABILITY_ALERT_OTHERS, ability.getAbilityPlayer());
 
+        //Sounds
+        SoundManager.worldSendSound(player.getWorld(), player.getLocation(), SoundType.ABILITY_ACTIVATED_GENERIC);
+
+
         // Enable the ability
         profile.setAbilityDATS(ability, System.currentTimeMillis() + (ticks * Misc.TIME_CONVERSION_FACTOR));
         setAbilityMode(ability, true);
diff --git a/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java b/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java
index 227ccac4d..d6c8bd4d5 100644
--- a/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java
+++ b/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java
@@ -86,6 +86,8 @@ public class SoundManager {
                 return Sound.ITEM_TRIDENT_RIPTIDE_3;
             case DEFLECT_ARROWS:
                 return Sound.ENTITY_ENDER_EYE_DEATH;
+            case TIRED:
+                return Sound.BLOCK_CONDUIT_AMBIENT;
             default:
                 return null;
         }
diff --git a/src/main/java/com/gmail/nossr50/util/sounds/SoundType.java b/src/main/java/com/gmail/nossr50/util/sounds/SoundType.java
index 0e6e1ccd7..c2f41f631 100644
--- a/src/main/java/com/gmail/nossr50/util/sounds/SoundType.java
+++ b/src/main/java/com/gmail/nossr50/util/sounds/SoundType.java
@@ -13,7 +13,8 @@ public enum SoundType {
     DEFLECT_ARROWS,
     TOOL_READY,
     ABILITY_ACTIVATED_GENERIC,
-    ABILITY_ACTIVATED_BERSERK;
+    ABILITY_ACTIVATED_BERSERK,
+    TIRED;
 
     public boolean usesCustomPitch()
     {
diff --git a/src/main/resources/sounds.yml b/src/main/resources/sounds.yml
index 43b5fa971..f18c53146 100644
--- a/src/main/resources/sounds.yml
+++ b/src/main/resources/sounds.yml
@@ -42,4 +42,7 @@ Sounds:
         Pitch: 0.1
     ABILITY_ACTIVATED_BERSERK:
         Volume: 0.5
+        Pitch: 1.7
+    TIRED:
+        Volume: 1.0
         Pitch: 1.7
\ No newline at end of file