diff --git a/common/audio/rosstavoTheme/Achievement_Unlocked.mp3 b/common/audio/rosstavoTheme/Achievement_Unlocked.mp3 new file mode 100644 index 0000000000..664e79de56 Binary files /dev/null and b/common/audio/rosstavoTheme/Achievement_Unlocked.mp3 differ diff --git a/common/audio/rosstavoTheme/Achievement_Unlocked.ogg b/common/audio/rosstavoTheme/Achievement_Unlocked.ogg new file mode 100755 index 0000000000..1cd36b3320 Binary files /dev/null and b/common/audio/rosstavoTheme/Achievement_Unlocked.ogg differ diff --git a/common/audio/rosstavoTheme/Chat.mp3 b/common/audio/rosstavoTheme/Chat.mp3 new file mode 100644 index 0000000000..f9be720d47 Binary files /dev/null and b/common/audio/rosstavoTheme/Chat.mp3 differ diff --git a/common/audio/rosstavoTheme/Chat.ogg b/common/audio/rosstavoTheme/Chat.ogg new file mode 100755 index 0000000000..714c93c7b6 Binary files /dev/null and b/common/audio/rosstavoTheme/Chat.ogg differ diff --git a/common/audio/rosstavoTheme/Daily.mp3 b/common/audio/rosstavoTheme/Daily.mp3 new file mode 100644 index 0000000000..1a8d717ba4 Binary files /dev/null and b/common/audio/rosstavoTheme/Daily.mp3 differ diff --git a/common/audio/rosstavoTheme/Daily.ogg b/common/audio/rosstavoTheme/Daily.ogg new file mode 100755 index 0000000000..10c01a0316 Binary files /dev/null and b/common/audio/rosstavoTheme/Daily.ogg differ diff --git a/common/audio/rosstavoTheme/Death.mp3 b/common/audio/rosstavoTheme/Death.mp3 new file mode 100644 index 0000000000..dce7fb8d99 Binary files /dev/null and b/common/audio/rosstavoTheme/Death.mp3 differ diff --git a/common/audio/rosstavoTheme/Death.ogg b/common/audio/rosstavoTheme/Death.ogg new file mode 100755 index 0000000000..8adf489762 Binary files /dev/null and b/common/audio/rosstavoTheme/Death.ogg differ diff --git a/common/audio/rosstavoTheme/Item_Drop.mp3 b/common/audio/rosstavoTheme/Item_Drop.mp3 new file mode 100644 index 0000000000..bcec7adbee Binary files /dev/null and b/common/audio/rosstavoTheme/Item_Drop.mp3 differ diff --git a/common/audio/rosstavoTheme/Item_Drop.ogg b/common/audio/rosstavoTheme/Item_Drop.ogg new file mode 100755 index 0000000000..6e119a8a8d Binary files /dev/null and b/common/audio/rosstavoTheme/Item_Drop.ogg differ diff --git a/common/audio/rosstavoTheme/Level_Up.mp3 b/common/audio/rosstavoTheme/Level_Up.mp3 new file mode 100644 index 0000000000..126f8c2c3c Binary files /dev/null and b/common/audio/rosstavoTheme/Level_Up.mp3 differ diff --git a/common/audio/rosstavoTheme/Level_Up.ogg b/common/audio/rosstavoTheme/Level_Up.ogg new file mode 100755 index 0000000000..e2502d5219 Binary files /dev/null and b/common/audio/rosstavoTheme/Level_Up.ogg differ diff --git a/common/audio/rosstavoTheme/Minus_Habit.mp3 b/common/audio/rosstavoTheme/Minus_Habit.mp3 new file mode 100644 index 0000000000..90ca460550 Binary files /dev/null and b/common/audio/rosstavoTheme/Minus_Habit.mp3 differ diff --git a/common/audio/rosstavoTheme/Minus_Habit.ogg b/common/audio/rosstavoTheme/Minus_Habit.ogg new file mode 100755 index 0000000000..58706d0c86 Binary files /dev/null and b/common/audio/rosstavoTheme/Minus_Habit.ogg differ diff --git a/common/audio/rosstavoTheme/Plus_Habit.mp3 b/common/audio/rosstavoTheme/Plus_Habit.mp3 new file mode 100644 index 0000000000..6f7b9ca215 Binary files /dev/null and b/common/audio/rosstavoTheme/Plus_Habit.mp3 differ diff --git a/common/audio/rosstavoTheme/Plus_Habit.ogg b/common/audio/rosstavoTheme/Plus_Habit.ogg new file mode 100755 index 0000000000..6416ce8ca5 Binary files /dev/null and b/common/audio/rosstavoTheme/Plus_Habit.ogg differ diff --git a/common/audio/rosstavoTheme/Reward.mp3 b/common/audio/rosstavoTheme/Reward.mp3 new file mode 100644 index 0000000000..434cbbc974 Binary files /dev/null and b/common/audio/rosstavoTheme/Reward.mp3 differ diff --git a/common/audio/rosstavoTheme/Reward.ogg b/common/audio/rosstavoTheme/Reward.ogg new file mode 100755 index 0000000000..722fa68fa6 Binary files /dev/null and b/common/audio/rosstavoTheme/Reward.ogg differ diff --git a/common/audio/rosstavoTheme/ToDo.mp3 b/common/audio/rosstavoTheme/ToDo.mp3 new file mode 100644 index 0000000000..8dc54d7035 Binary files /dev/null and b/common/audio/rosstavoTheme/ToDo.mp3 differ diff --git a/common/audio/rosstavoTheme/ToDo.ogg b/common/audio/rosstavoTheme/ToDo.ogg new file mode 100755 index 0000000000..462a675854 Binary files /dev/null and b/common/audio/rosstavoTheme/ToDo.ogg differ diff --git a/common/locales/en/generic.json b/common/locales/en/generic.json index 8d39f77866..c374357dc8 100644 --- a/common/locales/en/generic.json +++ b/common/locales/en/generic.json @@ -3,7 +3,7 @@ "stringNotFound": "String '<%= string %>' not found.", "titleIndex": "Habitica | Your Life The Role Playing Game", "habitica": "Habitica", - + "titleTasks": "Tasks", "titleAvatar": "Avatar", "titleBackgrounds": "Backgrounds", @@ -24,7 +24,7 @@ "titleTimeTravelers": "Time Travelers", "titleSeasonalShop": "Seasonal Shop", "titleSettings": "Settings", - + "expandToolbar": "Expand Toolbar", "collapseToolbar": "Collapse Toolbar", "markdownBlurb": "Habitica uses markdown for message formatting. See the Markdown Cheat Sheet for more info.", @@ -116,6 +116,7 @@ "audioTheme_wattsTheme": "Watts' Theme", "audioTheme_gokulTheme": "Gokul Theme", "audioTheme_luneFoxTheme": "LuneFox's Theme", + "audioTheme_rosstavoTheme": "Rosstavo's Theme", "askQuestion": "Ask a Question", "reportBug": "Report a Bug", "HabiticaWiki": "The Habitica Wiki", diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js index ab827c4405..5943a5b39b 100644 --- a/website/server/models/user/schema.js +++ b/website/server/models/user/schema.js @@ -391,7 +391,7 @@ let schema = new Schema({ skin: {type: String, default: '915533'}, shirt: {type: String, default: 'blue'}, timezoneOffset: {type: Number, default: 0}, - sound: {type: String, default: 'off', enum: ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme']}, + sound: {type: String, default: 'off', enum: ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme']}, chair: {type: String, default: 'none'}, timezoneOffsetAtLastCron: Number, language: String, diff --git a/website/views/shared/header/menu.jade b/website/views/shared/header/menu.jade index 93841f80d8..178d653d19 100644 --- a/website/views/shared/header/menu.jade +++ b/website/views/shared/header/menu.jade @@ -222,7 +222,7 @@ nav.toolbar(ng-controller='MenuCtrl') div ul.toolbar-submenu // Using [{k,v}] instead of {k:v,k:v} to maintain order ('off' at top) - for theme in ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme'] + for theme in ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme'] li a(ng-class="{'bg-primary':user.preferences.sound === '# {theme}'}", ng-click="set({'preferences.sound':'#{theme}'})")=env.t('audioTheme_'+theme) ul.toolbar-controls