Merge branch 'release' into develop

2018-02-14 02:31:17 +00:00
parent 1e23395c8c fd5ab32c43
commit 7684f9b26a
135 changed files with 1189 additions and 217 deletions
@@ -3099,6 +3099,92 @@ let quests = {
      unlock: t('questBadgerUnlockText'),
    },
  },
+  dysheartener: {
+    text: t('questDysheartenerText'),
+    notes: t('questDysheartenerNotes'),
+    completion: t('questDysheartenerCompletion'),
+    completionChat: t('questDysheartenerCompletionChat'),
+    value: 0,
+    canBuy () {
+      return false;
+    },
+    category: 'world',
+    boss: {
+      name: t('questDysheartenerText'),
+      hp: 17000000,
+      str: 1.25,
+      def: 1,
+      rage: {
+        title: t('questDysheartenerBossRageTitle'),
+        description: t('questDysheartenerBossRageDescription'),
+        value: 500000,
+        seasonalShop: t('questDysheartenerBossRageSeasonal'),
+        market: t('questDysheartenerBossRageMarket'),
+        quests: t('questDysheartenerBossRageQuests'),
+      },
+    },
+    colors: {
+      dark: '#410F2A',
+      medium: '#5C1130',
+      light: '#931F4D',
+      extralight: '#DC4069',
+    },
+    drop: {
+      items: [
+        {
+          type: 'pets',
+          key: 'Hippogriff-Hopeful',
+          text: t('questDysheartenerDropHippogriffPet'),
+        }, {
+          type: 'mounts',
+          key: 'Hippogriff-Hopeful',
+          text: t('questDysheartenerDropHippogriffMount'),
+        }, {
+          type: 'food',
+          key: 'Cake_Base',
+          text: t('foodCakeBase'),
+        }, {
+          type: 'food',
+          key: 'Candy_White',
+          text: t('foodCandyWhite'),
+        }, {
+          type: 'food',
+          key: 'Cake_Desert',
+          text: t('foodCakeDesert'),
+        }, {
+          type: 'food',
+          key: 'Candy_Red',
+          text: t('foodCandyRed'),
+        }, {
+          type: 'food',
+          key: 'Cake_Shade',
+          text: t('foodCakeShade'),
+        }, {
+          type: 'food',
+          key: 'Candy_Skeleton',
+          text: t('foodCandySkeleton'),
+        }, {
+          type: 'food',
+          key: 'Cake_Zombie',
+          text: t('foodCakeZombie'),
+        }, {
+          type: 'food',
+          key: 'Candy_CottonCandyPink',
+          text: t('foodCandyCottonCandyPink'),
+        }, {
+          type: 'food',
+          key: 'Candy_CottonCandyBlue',
+          text: t('foodCandyCottonCandyBlue'),
+        }, {
+          type: 'food',
+          key: 'Cake_Golden',
+          text: t('foodCakeGolden'),
+        },
+      ],
+      gp: 0,
+      exp: 0,
+    },
+  },
 };

 each(quests, (v, key) => {
@@ -70,6 +70,7 @@ let specialPets = {
  'Jackalope-RoyalPurple': 'royalPurpleJackalope',
  'Orca-Base': 'orca',
  'Bear-Veteran': 'veteranBear',
+  'Hippogriff-Hopeful': 'hopefulHippogriffPet',
 };

 let specialMounts = {
@@ -87,6 +88,7 @@ let specialMounts = {
  'Jackalope-RoyalPurple': 'royalPurpleJackalope',
  'Aether-Invisible': 'invisibleAether',
  'JackOLantern-Ghost': 'ghostJackolantern',
+  'Hippogriff-Hopeful': 'hopefulHippogriffMount',
 };

 each(specialPets, (translationString, key) => {