diff --git a/public/audio/danielTheBard/Death.mp3 b/public/audio/danielTheBard/Death.mp3 new file mode 100644 index 0000000000..cda07e9076 Binary files /dev/null and b/public/audio/danielTheBard/Death.mp3 differ diff --git a/public/audio/danielTheBard/Death.ogg b/public/audio/danielTheBard/Death.ogg new file mode 100644 index 0000000000..9c0711cbfd Binary files /dev/null and b/public/audio/danielTheBard/Death.ogg differ diff --git a/public/audio/wattsTheme/Achievement_Unlocked.mp3 b/public/audio/wattsTheme/Achievement_Unlocked.mp3 new file mode 100755 index 0000000000..f21b4dd9ab Binary files /dev/null and b/public/audio/wattsTheme/Achievement_Unlocked.mp3 differ diff --git a/public/audio/wattsTheme/Achievement_Unlocked.ogg b/public/audio/wattsTheme/Achievement_Unlocked.ogg new file mode 100755 index 0000000000..5fb69d90fa Binary files /dev/null and b/public/audio/wattsTheme/Achievement_Unlocked.ogg differ diff --git a/public/audio/wattsTheme/Chat.mp3 b/public/audio/wattsTheme/Chat.mp3 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/audio/wattsTheme/Chat.ogg b/public/audio/wattsTheme/Chat.ogg new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/audio/wattsTheme/Daily.mp3 b/public/audio/wattsTheme/Daily.mp3 new file mode 100755 index 0000000000..8ad2ccf91b Binary files /dev/null and b/public/audio/wattsTheme/Daily.mp3 differ diff --git a/public/audio/wattsTheme/Daily.ogg b/public/audio/wattsTheme/Daily.ogg new file mode 100755 index 0000000000..55cbdd1ab7 Binary files /dev/null and b/public/audio/wattsTheme/Daily.ogg differ diff --git a/public/audio/wattsTheme/Death.mp3 b/public/audio/wattsTheme/Death.mp3 new file mode 100755 index 0000000000..f540666a76 Binary files /dev/null and b/public/audio/wattsTheme/Death.mp3 differ diff --git a/public/audio/wattsTheme/Death.ogg b/public/audio/wattsTheme/Death.ogg new file mode 100755 index 0000000000..a2db1834fb Binary files /dev/null and b/public/audio/wattsTheme/Death.ogg differ diff --git a/public/audio/wattsTheme/Item_Drop.mp3 b/public/audio/wattsTheme/Item_Drop.mp3 new file mode 100755 index 0000000000..2d5b879fc7 Binary files /dev/null and b/public/audio/wattsTheme/Item_Drop.mp3 differ diff --git a/public/audio/wattsTheme/Item_Drop.ogg b/public/audio/wattsTheme/Item_Drop.ogg new file mode 100755 index 0000000000..9a69aea16d Binary files /dev/null and b/public/audio/wattsTheme/Item_Drop.ogg differ diff --git a/public/audio/wattsTheme/Level_Up.mp3 b/public/audio/wattsTheme/Level_Up.mp3 new file mode 100755 index 0000000000..7e4be04d88 Binary files /dev/null and b/public/audio/wattsTheme/Level_Up.mp3 differ diff --git a/public/audio/wattsTheme/Level_Up.ogg b/public/audio/wattsTheme/Level_Up.ogg new file mode 100755 index 0000000000..da782f56f7 Binary files /dev/null and b/public/audio/wattsTheme/Level_Up.ogg differ diff --git a/public/audio/wattsTheme/Minus_Habit.mp3 b/public/audio/wattsTheme/Minus_Habit.mp3 new file mode 100755 index 0000000000..71cf23cd53 Binary files /dev/null and b/public/audio/wattsTheme/Minus_Habit.mp3 differ diff --git a/public/audio/wattsTheme/Minus_Habit.ogg b/public/audio/wattsTheme/Minus_Habit.ogg new file mode 100755 index 0000000000..981dc429e6 Binary files /dev/null and b/public/audio/wattsTheme/Minus_Habit.ogg differ diff --git a/public/audio/wattsTheme/Plus_Habit.mp3 b/public/audio/wattsTheme/Plus_Habit.mp3 new file mode 100755 index 0000000000..54f132127d Binary files /dev/null and b/public/audio/wattsTheme/Plus_Habit.mp3 differ diff --git a/public/audio/wattsTheme/Plus_Habit.ogg b/public/audio/wattsTheme/Plus_Habit.ogg new file mode 100755 index 0000000000..3436395de8 Binary files /dev/null and b/public/audio/wattsTheme/Plus_Habit.ogg differ diff --git a/public/audio/wattsTheme/Reward.mp3 b/public/audio/wattsTheme/Reward.mp3 new file mode 100755 index 0000000000..d90efdd83c Binary files /dev/null and b/public/audio/wattsTheme/Reward.mp3 differ diff --git a/public/audio/wattsTheme/Reward.ogg b/public/audio/wattsTheme/Reward.ogg new file mode 100755 index 0000000000..1fce2f529c Binary files /dev/null and b/public/audio/wattsTheme/Reward.ogg differ diff --git a/public/audio/wattsTheme/ToDo.mp3 b/public/audio/wattsTheme/ToDo.mp3 new file mode 100755 index 0000000000..9c85f09e26 Binary files /dev/null and b/public/audio/wattsTheme/ToDo.mp3 differ diff --git a/public/audio/wattsTheme/ToDo.ogg b/public/audio/wattsTheme/ToDo.ogg new file mode 100755 index 0000000000..9dbf533418 Binary files /dev/null and b/public/audio/wattsTheme/ToDo.ogg differ diff --git a/public/js/controllers/notificationCtrl.js b/public/js/controllers/notificationCtrl.js index dae22b9d0f..6c30b511c2 100644 --- a/public/js/controllers/notificationCtrl.js +++ b/public/js/controllers/notificationCtrl.js @@ -6,6 +6,7 @@ habitrpg.controller('NotificationCtrl', $rootScope.$watch('user.stats.hp', function (after, before) { if (after <= 0){ + $rootScope.playSound('Death'); $rootScope.openModal('death', {keyboard:false, backdrop:'static'}); } if (after == before) return; diff --git a/src/models/user.js b/src/models/user.js index 6d6e77aa09..f33984417e 100644 --- a/src/models/user.js +++ b/src/models/user.js @@ -281,7 +281,7 @@ var UserSchema = new Schema({ skin: {type:String, 'default':'915533'}, shirt: {type: String, 'default': 'blue'}, timezoneOffset: Number, - sound: {type:String, 'default':'off', enum: ['off','danielTheBard']}, + sound: {type:String, 'default':'off', enum: ['off','danielTheBard', 'wattsTheme']}, language: String, automaticAllocation: Boolean, allocationMode: {type:String, enum: ['flat','classbased','taskbased'], 'default': 'flat'}, diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index 467fbeeab7..549af9c4e5 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -215,7 +215,7 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}') div ul.toolbar-submenu(ng-click='expandMenu(null)') // Using [{k,v}] instead of {k:v,k:v} to maintain order ('off' at top) - for theme in ['off','danielTheBard'] + for theme in ['off','danielTheBard', 'wattsTheme'] li a(ng-class="{'bg-primary':user.preferences.sound=='#{theme}'}", ng-click="set({'preferences.sound':'#{theme}'})")=env.t('audioTheme_'+theme)