diff --git a/common/audio/dewinTheme/Achievement_Unlocked.mp3 b/common/audio/dewinTheme/Achievement_Unlocked.mp3 new file mode 100644 index 0000000000..54b53b6a71 Binary files /dev/null and b/common/audio/dewinTheme/Achievement_Unlocked.mp3 differ diff --git a/common/audio/dewinTheme/Achievement_Unlocked.ogg b/common/audio/dewinTheme/Achievement_Unlocked.ogg new file mode 100644 index 0000000000..21ca0d8ca7 Binary files /dev/null and b/common/audio/dewinTheme/Achievement_Unlocked.ogg differ diff --git a/common/audio/dewinTheme/Boss_Battles_Background_Music.mp3 b/common/audio/dewinTheme/Boss_Battles_Background_Music.mp3 new file mode 100644 index 0000000000..67447214bd Binary files /dev/null and b/common/audio/dewinTheme/Boss_Battles_Background_Music.mp3 differ diff --git a/common/audio/dewinTheme/Boss_Battles_Background_Music.ogg b/common/audio/dewinTheme/Boss_Battles_Background_Music.ogg new file mode 100644 index 0000000000..f2f37dd8f5 Binary files /dev/null and b/common/audio/dewinTheme/Boss_Battles_Background_Music.ogg differ diff --git a/common/audio/dewinTheme/Chat.mp3 b/common/audio/dewinTheme/Chat.mp3 new file mode 100644 index 0000000000..56bd6fb980 Binary files /dev/null and b/common/audio/dewinTheme/Chat.mp3 differ diff --git a/common/audio/dewinTheme/Chat.ogg b/common/audio/dewinTheme/Chat.ogg new file mode 100644 index 0000000000..26b16bf82a Binary files /dev/null and b/common/audio/dewinTheme/Chat.ogg differ diff --git a/common/audio/dewinTheme/Checklist_Complete.mp3 b/common/audio/dewinTheme/Checklist_Complete.mp3 new file mode 100644 index 0000000000..0094f44086 Binary files /dev/null and b/common/audio/dewinTheme/Checklist_Complete.mp3 differ diff --git a/common/audio/dewinTheme/Checklist_Complete.ogg b/common/audio/dewinTheme/Checklist_Complete.ogg new file mode 100644 index 0000000000..af022c12f6 Binary files /dev/null and b/common/audio/dewinTheme/Checklist_Complete.ogg differ diff --git a/common/audio/dewinTheme/Daily.mp3 b/common/audio/dewinTheme/Daily.mp3 new file mode 100644 index 0000000000..2729f58039 Binary files /dev/null and b/common/audio/dewinTheme/Daily.mp3 differ diff --git a/common/audio/dewinTheme/Daily.ogg b/common/audio/dewinTheme/Daily.ogg new file mode 100644 index 0000000000..a8aa4f0543 Binary files /dev/null and b/common/audio/dewinTheme/Daily.ogg differ diff --git a/common/audio/dewinTheme/Death.mp3 b/common/audio/dewinTheme/Death.mp3 new file mode 100644 index 0000000000..cc01653a1d Binary files /dev/null and b/common/audio/dewinTheme/Death.mp3 differ diff --git a/common/audio/dewinTheme/Death.ogg b/common/audio/dewinTheme/Death.ogg new file mode 100644 index 0000000000..64899ca388 Binary files /dev/null and b/common/audio/dewinTheme/Death.ogg differ diff --git a/common/audio/dewinTheme/Item_Drop.mp3 b/common/audio/dewinTheme/Item_Drop.mp3 new file mode 100644 index 0000000000..c63251ebfa Binary files /dev/null and b/common/audio/dewinTheme/Item_Drop.mp3 differ diff --git a/common/audio/dewinTheme/Item_Drop.ogg b/common/audio/dewinTheme/Item_Drop.ogg new file mode 100644 index 0000000000..2dd963af97 Binary files /dev/null and b/common/audio/dewinTheme/Item_Drop.ogg differ diff --git a/common/audio/dewinTheme/Level_Up.mp3 b/common/audio/dewinTheme/Level_Up.mp3 new file mode 100644 index 0000000000..f2d7fc8df3 Binary files /dev/null and b/common/audio/dewinTheme/Level_Up.mp3 differ diff --git a/common/audio/dewinTheme/Level_Up.ogg b/common/audio/dewinTheme/Level_Up.ogg new file mode 100644 index 0000000000..738ecfb03f Binary files /dev/null and b/common/audio/dewinTheme/Level_Up.ogg differ diff --git a/common/audio/dewinTheme/Minus_Habit.mp3 b/common/audio/dewinTheme/Minus_Habit.mp3 new file mode 100644 index 0000000000..5adf67258d Binary files /dev/null and b/common/audio/dewinTheme/Minus_Habit.mp3 differ diff --git a/common/audio/dewinTheme/Minus_Habit.ogg b/common/audio/dewinTheme/Minus_Habit.ogg new file mode 100644 index 0000000000..f0f9353a3f Binary files /dev/null and b/common/audio/dewinTheme/Minus_Habit.ogg differ diff --git a/common/audio/dewinTheme/Plus_Habit.mp3 b/common/audio/dewinTheme/Plus_Habit.mp3 new file mode 100644 index 0000000000..5051e8f239 Binary files /dev/null and b/common/audio/dewinTheme/Plus_Habit.mp3 differ diff --git a/common/audio/dewinTheme/Plus_Habit.ogg b/common/audio/dewinTheme/Plus_Habit.ogg new file mode 100644 index 0000000000..9490713cf5 Binary files /dev/null and b/common/audio/dewinTheme/Plus_Habit.ogg differ diff --git a/common/audio/dewinTheme/Reward.mp3 b/common/audio/dewinTheme/Reward.mp3 new file mode 100644 index 0000000000..59191060e1 Binary files /dev/null and b/common/audio/dewinTheme/Reward.mp3 differ diff --git a/common/audio/dewinTheme/Reward.ogg b/common/audio/dewinTheme/Reward.ogg new file mode 100644 index 0000000000..0598d4f04f Binary files /dev/null and b/common/audio/dewinTheme/Reward.ogg differ diff --git a/common/audio/dewinTheme/Settings_Page_Background_Music.mp3 b/common/audio/dewinTheme/Settings_Page_Background_Music.mp3 new file mode 100644 index 0000000000..0e7a83f99c Binary files /dev/null and b/common/audio/dewinTheme/Settings_Page_Background_Music.mp3 differ diff --git a/common/audio/dewinTheme/Settings_Page_Background_Music.ogg b/common/audio/dewinTheme/Settings_Page_Background_Music.ogg new file mode 100644 index 0000000000..f05980858b Binary files /dev/null and b/common/audio/dewinTheme/Settings_Page_Background_Music.ogg differ diff --git a/common/audio/dewinTheme/Todo.mp3 b/common/audio/dewinTheme/Todo.mp3 new file mode 100644 index 0000000000..d5082ccd57 Binary files /dev/null and b/common/audio/dewinTheme/Todo.mp3 differ diff --git a/common/audio/dewinTheme/Todo.ogg b/common/audio/dewinTheme/Todo.ogg new file mode 100644 index 0000000000..cd173ec50e Binary files /dev/null and b/common/audio/dewinTheme/Todo.ogg differ diff --git a/common/locales/en/generic.json b/common/locales/en/generic.json index c374357dc8..52b9d72a41 100644 --- a/common/locales/en/generic.json +++ b/common/locales/en/generic.json @@ -117,6 +117,7 @@ "audioTheme_gokulTheme": "Gokul Theme", "audioTheme_luneFoxTheme": "LuneFox's Theme", "audioTheme_rosstavoTheme": "Rosstavo's Theme", + "audioTheme_dewinTheme": "Dewin'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 5943a5b39b..659d031000 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', 'rosstavoTheme']}, + sound: {type: String, default: 'off', enum: ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme', 'dewinTheme']}, 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 7c6c7b03fa..3e9e9b771f 100644 --- a/website/views/shared/header/menu.jade +++ b/website/views/shared/header/menu.jade @@ -223,7 +223,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'] + for theme in ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme', 'dewinTheme'] li a(ng-class="{'bg-primary':user.preferences.sound === '# {theme}'}", ng-click="set({'preferences.sound':'#{theme}'})")=env.t('audioTheme_'+theme) ul.toolbar-controls