Merge branch 'release' into develop

website/common/script/content/achievements.js

@@ -23,6 +23,11 @@ let worldQuestAchievs = {
     titleKey: 'achievementBewilder',
     textKey: 'achievementBewilderText',
   },
+  dysheartenerQuest: {
+    icon: 'achievement-dysheartener',
+    titleKey: 'achievementDysheartener',
+    textKey: 'achievementDysheartenerText',
+  },
 };
 Object.assign(achievementsData, worldQuestAchievs);
 

website/common/script/content/stable.js

@@ -70,7 +70,7 @@ let specialPets = {
   'Jackalope-RoyalPurple': 'royalPurpleJackalope',
   'Orca-Base': 'orca',
   'Bear-Veteran': 'veteranBear',
-  // 'Hippogriff-Hopeful': 'hopefulHippogriffPet',
+  'Hippogriff-Hopeful': 'hopefulHippogriffPet',
 };
 
 let specialMounts = {
@@ -88,7 +88,7 @@ let specialMounts = {
   'Jackalope-RoyalPurple': 'royalPurpleJackalope',
   'Aether-Invisible': 'invisibleAether',
   'JackOLantern-Ghost': 'ghostJackolantern',
-  // 'Hippogriff-Hopeful': 'hopefulHippogriffMount',
+  'Hippogriff-Hopeful': 'hopefulHippogriffMount',
 };
 
 each(specialPets, (translationString, key) => {

website/common/script/libs/achievements.js

@@ -239,7 +239,7 @@ function _getSeasonalAchievements (user, language) {
     _addSimpleWithCount(result, user, {path, language});
   });
 
-  let questAchievements = ['dilatory', 'stressbeast', 'burnout', 'bewilder'];
+  let questAchievements = ['dilatory', 'stressbeast', 'burnout', 'bewilder', 'dysheartener'];
   questAchievements.forEach(path => {
     if (user.achievements.quests[path]) {
       _addQuest(result, user, {path, language});