diff --git a/website/assets/audio/beatscribeNesTheme/Achievement_Unlocked.mp3 b/website/assets/audio/beatscribeNesTheme/Achievement_Unlocked.mp3 new file mode 100644 index 0000000000..9052995c68 Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/Achievement_Unlocked.mp3 differ diff --git a/website/assets/audio/beatscribeNesTheme/Achievement_Unlocked.ogg b/website/assets/audio/beatscribeNesTheme/Achievement_Unlocked.ogg new file mode 100644 index 0000000000..839a521d0e Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/Achievement_Unlocked.ogg differ diff --git a/website/assets/audio/beatscribeNesTheme/Chat.mp3 b/website/assets/audio/beatscribeNesTheme/Chat.mp3 new file mode 100644 index 0000000000..2881e5f43d Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/Chat.mp3 differ diff --git a/website/assets/audio/beatscribeNesTheme/Chat.ogg b/website/assets/audio/beatscribeNesTheme/Chat.ogg new file mode 100644 index 0000000000..4d3e9f44d3 Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/Chat.ogg differ diff --git a/website/assets/audio/beatscribeNesTheme/Daily.mp3 b/website/assets/audio/beatscribeNesTheme/Daily.mp3 new file mode 100644 index 0000000000..c7f7840534 Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/Daily.mp3 differ diff --git a/website/assets/audio/beatscribeNesTheme/Daily.ogg b/website/assets/audio/beatscribeNesTheme/Daily.ogg new file mode 100644 index 0000000000..ad81219a47 Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/Daily.ogg differ diff --git a/website/assets/audio/beatscribeNesTheme/Death.mp3 b/website/assets/audio/beatscribeNesTheme/Death.mp3 new file mode 100644 index 0000000000..0f3a2baa22 Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/Death.mp3 differ diff --git a/website/assets/audio/beatscribeNesTheme/Death.ogg b/website/assets/audio/beatscribeNesTheme/Death.ogg new file mode 100644 index 0000000000..de39c9eca5 Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/Death.ogg differ diff --git a/website/assets/audio/beatscribeNesTheme/Item_Drop.mp3 b/website/assets/audio/beatscribeNesTheme/Item_Drop.mp3 new file mode 100644 index 0000000000..cfefbad34e Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/Item_Drop.mp3 differ diff --git a/website/assets/audio/beatscribeNesTheme/Item_Drop.ogg b/website/assets/audio/beatscribeNesTheme/Item_Drop.ogg new file mode 100644 index 0000000000..dd4858b002 Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/Item_Drop.ogg differ diff --git a/website/assets/audio/beatscribeNesTheme/Minus_Habit.mp3 b/website/assets/audio/beatscribeNesTheme/Minus_Habit.mp3 new file mode 100644 index 0000000000..febd52ebdc Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/Minus_Habit.mp3 differ diff --git a/website/assets/audio/beatscribeNesTheme/Minus_Habit.ogg b/website/assets/audio/beatscribeNesTheme/Minus_Habit.ogg new file mode 100644 index 0000000000..5f50f9ff96 Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/Minus_Habit.ogg differ diff --git a/website/assets/audio/beatscribeNesTheme/Plus_Habit.mp3 b/website/assets/audio/beatscribeNesTheme/Plus_Habit.mp3 new file mode 100644 index 0000000000..6bedf79973 Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/Plus_Habit.mp3 differ diff --git a/website/assets/audio/beatscribeNesTheme/Plus_Habit.ogg b/website/assets/audio/beatscribeNesTheme/Plus_Habit.ogg new file mode 100644 index 0000000000..268f8e0589 Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/Plus_Habit.ogg differ diff --git a/website/assets/audio/beatscribeNesTheme/Reward.mp3 b/website/assets/audio/beatscribeNesTheme/Reward.mp3 new file mode 100644 index 0000000000..ea3509137a Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/Reward.mp3 differ diff --git a/website/assets/audio/beatscribeNesTheme/Reward.ogg b/website/assets/audio/beatscribeNesTheme/Reward.ogg new file mode 100644 index 0000000000..70e2a1e8dc Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/Reward.ogg differ diff --git a/website/assets/audio/beatscribeNesTheme/ToDo.mp3 b/website/assets/audio/beatscribeNesTheme/ToDo.mp3 new file mode 100644 index 0000000000..e96284de93 Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/ToDo.mp3 differ diff --git a/website/assets/audio/beatscribeNesTheme/ToDo.ogg b/website/assets/audio/beatscribeNesTheme/ToDo.ogg new file mode 100644 index 0000000000..51a6832c91 Binary files /dev/null and b/website/assets/audio/beatscribeNesTheme/ToDo.ogg differ diff --git a/website/common/locales/en/generic.json b/website/common/locales/en/generic.json index 555e5a8d12..dc57ecb55e 100644 --- a/website/common/locales/en/generic.json +++ b/website/common/locales/en/generic.json @@ -1,4 +1,4 @@ -{ +{ "languageName": "English", "stringNotFound": "String '<%= string %>' not found.", "titleIndex": "Habitica | Your Life The Role Playing Game", @@ -127,6 +127,7 @@ "audioTheme_rosstavoTheme": "Rosstavo's Theme", "audioTheme_dewinTheme": "Dewin's Theme", "audioTheme_airuTheme": "Airu's Theme", + "audioTheme_beatscribeNesTheme": "Beatscribe's NES 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 518758b89f..3ac8207eb7 100644 --- a/website/server/models/user/schema.js +++ b/website/server/models/user/schema.js @@ -410,7 +410,7 @@ let schema = new Schema({ skin: {type: String, default: '915533'}, shirt: {type: String, default: 'blue'}, timezoneOffset: {type: Number, default: 0}, - sound: {type: String, default: 'rosstavoTheme', enum: ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme', 'dewinTheme', 'airuTheme']}, + sound: {type: String, default: 'rosstavoTheme', enum: ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme', 'dewinTheme', 'airuTheme', 'beatscribeNesTheme']}, 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 0103574d50..6f6c3ec6f4 100644 --- a/website/views/shared/header/menu.jade +++ b/website/views/shared/header/menu.jade @@ -245,7 +245,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', 'rosstavoTheme', 'dewinTheme', 'airuTheme'] + for theme in ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme', 'dewinTheme', 'airuTheme', 'beatscribeNesTheme'] li a(ng-class="{'bg-info':user.preferences.sound === '#{theme}'}", ng-click="set({'preferences.sound':'#{theme}'})")=env.t('audioTheme_'+theme) ul.toolbar-controls