Merge branch 'release' into develop

2017-06-13 21:25:41 +00:00
parent 592345e22c c1c42e17b8
commit c084f8a2b9
356 changed files with 35610 additions and 34662 deletions
@@ -320,6 +320,12 @@ let quests = {
    adjective: t('questEggButterflyAdjective'),
    canBuy: hasQuestAchievementFunction('butterfly'),
  },
+  Nudibranch: {
+    text: t('questEggNudibranchText'),
+    mountText: t('questEggNudibranchMountText'),
+    adjective: t('questEggNudibranchAdjective'),
+    canBuy: hasQuestAchievementFunction('nudibranch'),
+  },
 };

 applyEggDefaults(drops, {
@@ -2688,6 +2688,38 @@ let quests = {
      exp: 650,
    },
  },
+  nudibranch: {
+    text: t('questNudibranchText'),
+    notes: t('questNudibranchNotes'),
+    completion: t('questNudibranchCompletion'),
+    value: 4,
+    category: 'pet',
+    boss: {
+      name: t('questNudibranchBoss'),
+      hp: 400,
+      str: 1.5,
+    },
+    drop: {
+      items: [
+        {
+          type: 'eggs',
+          key: 'Nudibranch',
+          text: t('questNudibranchDropNudibranchEgg'),
+        }, {
+          type: 'eggs',
+          key: 'Nudibranch',
+          text: t('questNudibranchDropNudibranchEgg'),
+        }, {
+          type: 'eggs',
+          key: 'Nudibranch',
+          text: t('questNudibranchDropNudibranchEgg'),
+        },
+      ],
+      gp: 31,
+      exp: 200,
+      unlock: t('questNudibranchUnlockText'),
+    },
+  },
 };

 each(quests, (v, key) => {