diff --git a/website/assets/audio/arashiTheme/Achievement_Unlocked.mp3 b/website/assets/audio/arashiTheme/Achievement_Unlocked.mp3 new file mode 100644 index 0000000000..0cebdbd1cd Binary files /dev/null and b/website/assets/audio/arashiTheme/Achievement_Unlocked.mp3 differ diff --git a/website/assets/audio/arashiTheme/Achievement_Unlocked.ogg b/website/assets/audio/arashiTheme/Achievement_Unlocked.ogg new file mode 100644 index 0000000000..bc3d2c3fd0 Binary files /dev/null and b/website/assets/audio/arashiTheme/Achievement_Unlocked.ogg differ diff --git a/website/assets/audio/arashiTheme/Chat.mp3 b/website/assets/audio/arashiTheme/Chat.mp3 new file mode 100644 index 0000000000..0931bc79ae Binary files /dev/null and b/website/assets/audio/arashiTheme/Chat.mp3 differ diff --git a/website/assets/audio/arashiTheme/Chat.ogg b/website/assets/audio/arashiTheme/Chat.ogg new file mode 100644 index 0000000000..1924797118 Binary files /dev/null and b/website/assets/audio/arashiTheme/Chat.ogg differ diff --git a/website/assets/audio/arashiTheme/Daily.mp3 b/website/assets/audio/arashiTheme/Daily.mp3 new file mode 100644 index 0000000000..e66e101fc2 Binary files /dev/null and b/website/assets/audio/arashiTheme/Daily.mp3 differ diff --git a/website/assets/audio/arashiTheme/Daily.ogg b/website/assets/audio/arashiTheme/Daily.ogg new file mode 100644 index 0000000000..68dee98f0e Binary files /dev/null and b/website/assets/audio/arashiTheme/Daily.ogg differ diff --git a/website/assets/audio/arashiTheme/Death.mp3 b/website/assets/audio/arashiTheme/Death.mp3 new file mode 100644 index 0000000000..ded81ee34d Binary files /dev/null and b/website/assets/audio/arashiTheme/Death.mp3 differ diff --git a/website/assets/audio/arashiTheme/Death.ogg b/website/assets/audio/arashiTheme/Death.ogg new file mode 100644 index 0000000000..2ab54114f4 Binary files /dev/null and b/website/assets/audio/arashiTheme/Death.ogg differ diff --git a/website/assets/audio/arashiTheme/Item_Drop.mp3 b/website/assets/audio/arashiTheme/Item_Drop.mp3 new file mode 100644 index 0000000000..61d0046ec9 Binary files /dev/null and b/website/assets/audio/arashiTheme/Item_Drop.mp3 differ diff --git a/website/assets/audio/arashiTheme/Item_Drop.ogg b/website/assets/audio/arashiTheme/Item_Drop.ogg new file mode 100644 index 0000000000..70b7b9bb79 Binary files /dev/null and b/website/assets/audio/arashiTheme/Item_Drop.ogg differ diff --git a/website/assets/audio/arashiTheme/Level_Up.mp3 b/website/assets/audio/arashiTheme/Level_Up.mp3 new file mode 100644 index 0000000000..6ef2fc96ff Binary files /dev/null and b/website/assets/audio/arashiTheme/Level_Up.mp3 differ diff --git a/website/assets/audio/arashiTheme/Level_Up.ogg b/website/assets/audio/arashiTheme/Level_Up.ogg new file mode 100644 index 0000000000..d34d93c261 Binary files /dev/null and b/website/assets/audio/arashiTheme/Level_Up.ogg differ diff --git a/website/assets/audio/arashiTheme/Minus_Habit.mp3 b/website/assets/audio/arashiTheme/Minus_Habit.mp3 new file mode 100644 index 0000000000..dd0b3fa9ea Binary files /dev/null and b/website/assets/audio/arashiTheme/Minus_Habit.mp3 differ diff --git a/website/assets/audio/arashiTheme/Minus_Habit.ogg b/website/assets/audio/arashiTheme/Minus_Habit.ogg new file mode 100644 index 0000000000..51e35c2a98 Binary files /dev/null and b/website/assets/audio/arashiTheme/Minus_Habit.ogg differ diff --git a/website/assets/audio/arashiTheme/Plus_Habit.mp3 b/website/assets/audio/arashiTheme/Plus_Habit.mp3 new file mode 100644 index 0000000000..1d0d8f583b Binary files /dev/null and b/website/assets/audio/arashiTheme/Plus_Habit.mp3 differ diff --git a/website/assets/audio/arashiTheme/Plus_Habit.ogg b/website/assets/audio/arashiTheme/Plus_Habit.ogg new file mode 100644 index 0000000000..0f998a6285 Binary files /dev/null and b/website/assets/audio/arashiTheme/Plus_Habit.ogg differ diff --git a/website/assets/audio/arashiTheme/Reward.mp3 b/website/assets/audio/arashiTheme/Reward.mp3 new file mode 100644 index 0000000000..f55f7a5774 Binary files /dev/null and b/website/assets/audio/arashiTheme/Reward.mp3 differ diff --git a/website/assets/audio/arashiTheme/Reward.ogg b/website/assets/audio/arashiTheme/Reward.ogg new file mode 100644 index 0000000000..7664e174c3 Binary files /dev/null and b/website/assets/audio/arashiTheme/Reward.ogg differ diff --git a/website/assets/audio/arashiTheme/ToDo.mp3 b/website/assets/audio/arashiTheme/ToDo.mp3 new file mode 100644 index 0000000000..c9a47ef56c Binary files /dev/null and b/website/assets/audio/arashiTheme/ToDo.mp3 differ diff --git a/website/assets/audio/arashiTheme/ToDo.ogg b/website/assets/audio/arashiTheme/ToDo.ogg new file mode 100644 index 0000000000..24dbb3c8a2 Binary files /dev/null and b/website/assets/audio/arashiTheme/ToDo.ogg differ diff --git a/website/common/locales/en/generic.json b/website/common/locales/en/generic.json index 6e10623c93..012962711e 100644 --- a/website/common/locales/en/generic.json +++ b/website/common/locales/en/generic.json @@ -128,6 +128,7 @@ "audioTheme_dewinTheme": "Dewin's Theme", "audioTheme_airuTheme": "Airu's Theme", "audioTheme_beatscribeNesTheme": "Beatscribe's NES Theme", + "audioTheme_arashiTheme": "Arashi'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 57c2857290..2c21954ac4 100644 --- a/website/server/models/user/schema.js +++ b/website/server/models/user/schema.js @@ -417,7 +417,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', 'beatscribeNesTheme']}, + sound: {type: String, default: 'rosstavoTheme', enum: ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme', 'dewinTheme', 'airuTheme', 'beatscribeNesTheme', 'arashiTheme']}, 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 6f6c3ec6f4..bcdede415a 100644 --- a/website/views/shared/header/menu.jade +++ b/website/views/shared/header/menu.jade @@ -244,8 +244,8 @@ nav.toolbar(ng-controller='MenuCtrl') h4=env.t('audioTheme') 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', 'beatscribeNesTheme'] + // 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', 'beatscribeNesTheme', 'arashiTheme'] li a(ng-class="{'bg-info':user.preferences.sound === '#{theme}'}", ng-click="set({'preferences.sound':'#{theme}'})")=env.t('audioTheme_'+theme) ul.toolbar-controls