diff --git a/website/assets/audio/airuTheme/Achievement_Unlocked.mp3 b/website/assets/audio/airuTheme/Achievement_Unlocked.mp3 new file mode 100644 index 0000000000..07bb224585 Binary files /dev/null and b/website/assets/audio/airuTheme/Achievement_Unlocked.mp3 differ diff --git a/website/assets/audio/airuTheme/Achievement_Unlocked.ogg b/website/assets/audio/airuTheme/Achievement_Unlocked.ogg new file mode 100644 index 0000000000..c51d29ab15 Binary files /dev/null and b/website/assets/audio/airuTheme/Achievement_Unlocked.ogg differ diff --git a/website/assets/audio/airuTheme/Chat.mp3 b/website/assets/audio/airuTheme/Chat.mp3 new file mode 100644 index 0000000000..a1d2c3e9c6 Binary files /dev/null and b/website/assets/audio/airuTheme/Chat.mp3 differ diff --git a/website/assets/audio/airuTheme/Chat.ogg b/website/assets/audio/airuTheme/Chat.ogg new file mode 100644 index 0000000000..bcb2bdb742 Binary files /dev/null and b/website/assets/audio/airuTheme/Chat.ogg differ diff --git a/website/assets/audio/airuTheme/Daily.mp3 b/website/assets/audio/airuTheme/Daily.mp3 new file mode 100644 index 0000000000..44bc55eb14 Binary files /dev/null and b/website/assets/audio/airuTheme/Daily.mp3 differ diff --git a/website/assets/audio/airuTheme/Daily.ogg b/website/assets/audio/airuTheme/Daily.ogg new file mode 100644 index 0000000000..d306b3e430 Binary files /dev/null and b/website/assets/audio/airuTheme/Daily.ogg differ diff --git a/website/assets/audio/airuTheme/Death.mp3 b/website/assets/audio/airuTheme/Death.mp3 new file mode 100644 index 0000000000..ae1922eb5d Binary files /dev/null and b/website/assets/audio/airuTheme/Death.mp3 differ diff --git a/website/assets/audio/airuTheme/Death.ogg b/website/assets/audio/airuTheme/Death.ogg new file mode 100644 index 0000000000..212408a80a Binary files /dev/null and b/website/assets/audio/airuTheme/Death.ogg differ diff --git a/website/assets/audio/airuTheme/Item_Drop.mp3 b/website/assets/audio/airuTheme/Item_Drop.mp3 new file mode 100644 index 0000000000..431ec390dd Binary files /dev/null and b/website/assets/audio/airuTheme/Item_Drop.mp3 differ diff --git a/website/assets/audio/airuTheme/Item_Drop.ogg b/website/assets/audio/airuTheme/Item_Drop.ogg new file mode 100644 index 0000000000..244a8e8783 Binary files /dev/null and b/website/assets/audio/airuTheme/Item_Drop.ogg differ diff --git a/website/assets/audio/airuTheme/Level_Up.mp3 b/website/assets/audio/airuTheme/Level_Up.mp3 new file mode 100644 index 0000000000..226da2a139 Binary files /dev/null and b/website/assets/audio/airuTheme/Level_Up.mp3 differ diff --git a/website/assets/audio/airuTheme/Level_Up.ogg b/website/assets/audio/airuTheme/Level_Up.ogg new file mode 100644 index 0000000000..d29944cfa8 Binary files /dev/null and b/website/assets/audio/airuTheme/Level_Up.ogg differ diff --git a/website/assets/audio/airuTheme/Minus_Habit.mp3 b/website/assets/audio/airuTheme/Minus_Habit.mp3 new file mode 100644 index 0000000000..b3e4ae0c24 Binary files /dev/null and b/website/assets/audio/airuTheme/Minus_Habit.mp3 differ diff --git a/website/assets/audio/airuTheme/Minus_Habit.ogg b/website/assets/audio/airuTheme/Minus_Habit.ogg new file mode 100644 index 0000000000..dc70073118 Binary files /dev/null and b/website/assets/audio/airuTheme/Minus_Habit.ogg differ diff --git a/website/assets/audio/airuTheme/Plus_Habit.mp3 b/website/assets/audio/airuTheme/Plus_Habit.mp3 new file mode 100644 index 0000000000..7b1cfa212f Binary files /dev/null and b/website/assets/audio/airuTheme/Plus_Habit.mp3 differ diff --git a/website/assets/audio/airuTheme/Plus_Habit.ogg b/website/assets/audio/airuTheme/Plus_Habit.ogg new file mode 100644 index 0000000000..c371dba24d Binary files /dev/null and b/website/assets/audio/airuTheme/Plus_Habit.ogg differ diff --git a/website/assets/audio/airuTheme/Reward.mp3 b/website/assets/audio/airuTheme/Reward.mp3 new file mode 100644 index 0000000000..b7b865e6a1 Binary files /dev/null and b/website/assets/audio/airuTheme/Reward.mp3 differ diff --git a/website/assets/audio/airuTheme/Reward.ogg b/website/assets/audio/airuTheme/Reward.ogg new file mode 100644 index 0000000000..eba14d63e5 Binary files /dev/null and b/website/assets/audio/airuTheme/Reward.ogg differ diff --git a/website/assets/audio/airuTheme/ToDo.mp3 b/website/assets/audio/airuTheme/ToDo.mp3 new file mode 100644 index 0000000000..ff6e917b42 Binary files /dev/null and b/website/assets/audio/airuTheme/ToDo.mp3 differ diff --git a/website/assets/audio/airuTheme/ToDo.ogg b/website/assets/audio/airuTheme/ToDo.ogg new file mode 100644 index 0000000000..c147968b35 Binary files /dev/null and b/website/assets/audio/airuTheme/ToDo.ogg differ diff --git a/website/common/locales/en/generic.json b/website/common/locales/en/generic.json index cb46a19867..9e4ff7d418 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", @@ -122,6 +122,7 @@ "audioTheme_luneFoxTheme": "LuneFox's Theme", "audioTheme_rosstavoTheme": "Rosstavo's Theme", "audioTheme_dewinTheme": "Dewin's Theme", + "audioTheme_airuTheme": "Airu'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 648e183f4c..3816641331 100644 --- a/website/server/models/user/schema.js +++ b/website/server/models/user/schema.js @@ -400,7 +400,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']}, + sound: {type: String, default: 'rosstavoTheme', enum: ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme', 'dewinTheme', 'airuTheme']}, 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 ab5090e09d..8a22563ff6 100644 --- a/website/views/shared/header/menu.jade +++ b/website/views/shared/header/menu.jade @@ -235,7 +235,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'] + for theme in ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme', 'dewinTheme', 'airuTheme'] li a(ng-class="{'bg-info':user.preferences.sound === '#{theme}'}", ng-click="set({'preferences.sound':'#{theme}'})")=env.t('audioTheme_'+theme) ul.toolbar-controls