4.113.1

fix(gear): add missing Healer eyewear and fix headgear desc
4.113.0
2026-05-22 11:40:07 -05:00 · 2019-09-24 19:34:21 -05:00 · 2019-09-24 19:34:15 -05:00 · 2019-09-24 18:41:37 -05:00 · 2019-09-24 18:41:08 -05:00 · 2019-09-24 18:41:00 -05:00
488 changed files with 40246 additions and 36079 deletions
@@ -1 +1 @@
-10
+12
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - '10'
+  - '12'
 services:
  - mongodb
 cache:
@@ -1,4 +1,4 @@
-FROM node:10
+FROM node:12

 ENV ADMIN_EMAIL admin@habitica.com
 ENV AMAZON_PAYMENTS_CLIENT_ID amzn1.application-oa2-client.68ed9e6904ef438fbc1bf86bf494056e
@@ -18,7 +18,7 @@ RUN npm install -g gulp-cli mocha
 # Clone Habitica repo and install dependencies
 RUN mkdir -p /usr/src/habitrpg
 WORKDIR /usr/src/habitrpg
-RUN git clone --branch release https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
+RUN git clone --branch release --depth 1 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
 RUN npm install
 RUN gulp build:prod --force

@@ -1,5 +1,5 @@
-FROM node:10
-WORKDIR /code
-COPY package*.json /code/
-RUN npm install
-RUN npm install -g gulp-cli mocha
+FROM node:12
+WORKDIR /code
+COPY package*.json /code/
+RUN npm install
+RUN npm install -g gulp-cli mocha
@@ -0,0 +1,104 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20190917_pet_color_achievements';
+import { model as User } from '../../../website/server/models/user';
+
+const progressCount = 1000;
+let count = 0;
+
+async function updateUser (user) {
+  count++;
+
+  let set = {
+    migration: MIGRATION_NAME,
+  };
+
+  if (user && user.items && user.items.pets) {
+    const pets = user.items.pets;
+    if (pets['Wolf-Base'] > 0
+      && pets['TigerCub-Base'] > 0
+      && pets['PandaCub-Base'] > 0
+      && pets['LionCub-Base'] > 0
+      && pets['Fox-Base'] > 0
+      && pets['FlyingPig-Base'] > 0
+      && pets['Dragon-Base'] > 0
+      && pets['Cactus-Base'] > 0
+      && pets['BearCub-Base'] > 0) {
+        set['achievements.backToBasics'] = true;
+      }
+    if (pets['Wolf-Desert'] > 0
+      && pets['TigerCub-Desert'] > 0
+      && pets['PandaCub-Desert'] > 0
+      && pets['LionCub-Desert'] > 0
+      && pets['Fox-Desert'] > 0
+      && pets['FlyingPig-Desert'] > 0
+      && pets['Dragon-Desert'] > 0
+      && pets['Cactus-Desert'] > 0
+      && pets['BearCub-Desert'] > 0) {
+        set['achievements.dustDevil'] = true;
+      }
+  }
+
+  if (user && user.items && user.items.mounts) {
+    const mounts = user.items.mounts;
+    if (mounts['Wolf-Base']
+      && mounts['TigerCub-Base']
+      && mounts['PandaCub-Base']
+      && mounts['LionCub-Base']
+      && mounts['Fox-Base']
+      && mounts['FlyingPig-Base']
+      && mounts['Dragon-Base']
+      && mounts['Cactus-Base']
+      && mounts['BearCub-Base'] ) {
+        set['achievements.allYourBase'] = true;
+      }
+    if (mounts['Wolf-Desert']
+      && mounts['TigerCub-Desert']
+      && mounts['PandaCub-Desert']
+      && mounts['LionCub-Desert']
+      && mounts['Fox-Desert']
+      && mounts['FlyingPig-Desert']
+      && mounts['Dragon-Desert']
+      && mounts['Cactus-Desert']
+      && mounts['BearCub-Desert'] ) {
+        set['achievements.aridAuthority'] = true;
+      }
+  }
+
+  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+
+  return await User.update({ _id: user._id }, { $set: set }).exec();
+}
+
+module.exports = async function processUsers () {
+  let query = {
+    migration: { $ne: MIGRATION_NAME },
+    'auth.timestamps.loggedin': { $gt: new Date('2019-09-01') },
+  };
+
+  const fields = {
+    _id: 1,
+    items: 1,
+  };
+
+  while (true) { // eslint-disable-line no-constant-condition
+    const users = await User // eslint-disable-line no-await-in-loop
+      .find(query)
+      .limit(250)
+      .sort({_id: 1})
+      .select(fields)
+      .lean()
+      .exec();
+
+    if (users.length === 0) {
+      console.warn('All appropriate users found and modified.');
+      console.warn(`\n${count} users processed\n`);
+      break;
+    } else {
+      query._id = {
+        $gt: users[users.length - 1]._id,
+      };
+    }
+
+    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
+  }
+};
@@ -1,7 +1,7 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.108.0",
+  "version": "4.113.1",
  "main": "./website/server/index.js",
  "dependencies": {
    "@google-cloud/trace-agent": "^4.0.0",
@@ -9,7 +9,7 @@
    "accepts": "^1.3.5",
    "amazon-payments": "^0.2.7",
    "amplitude": "^3.5.0",
-    "amplitude-js": "^5.0.0",
+    "amplitude-js": "^5.2.2",
    "apidoc": "^0.17.5",
    "apn": "^2.2.0",
    "autoprefixer": "^9.4.0",
@@ -28,7 +28,7 @@
    "babel-preset-es2015": "^6.6.0",
    "babel-register": "^6.6.0",
    "babel-runtime": "^6.11.6",
-    "bcrypt": "^3.0.5",
+    "bcrypt": "^3.0.6",
    "body-parser": "^1.18.3",
    "bootstrap": "^4.1.1",
    "bootstrap-vue": "^2.0.0-rc.18",
@@ -64,11 +64,11 @@
    "method-override": "^3.0.0",
    "moment": "^2.22.1",
    "moment-recur": "^1.0.7",
-    "mongoose": "^5.4.19",
+    "mongoose": "^5.6.9",
    "morgan": "^1.7.0",
    "nconf": "^0.10.0",
    "node-gcm": "^1.0.2",
-    "node-sass": "^4.9.0",
+    "node-sass": "^4.12.0",
    "ora": "^3.2.0",
    "pageres": "^5.1.0",
    "passport": "^0.4.0",
@@ -80,6 +80,7 @@
    "postcss-easy-import": "^3.0.0",
    "ps-tree": "^1.0.0",
    "pug": "^2.0.3",
+    "regenerator-runtime": "^0.13.3",
    "rimraf": "^2.4.3",
    "sass-loader": "^7.0.3",
    "shelljs": "^0.8.2",
@@ -115,7 +116,7 @@
  },
  "private": true,
  "engines": {
-    "node": "^10",
+    "node": "^12",
    "npm": "^6"
  },
  "scripts": {
@@ -276,44 +276,70 @@ describe('POST /groups/:groupId/leave', () => {
    });
  });

-  context('Leaving a group plan', () => {
-    it('cancels the free subscription', async () => {
-      // Create group
-      let { group, groupLeader, members } = await createAndPopulateGroup({
-        groupDetails: {
-          name: 'Test Private Guild',
-          type: 'guild',
-        },
-        members: 1,
+  each(typesOfGroups, (groupDetails, groupType) => {
+    context(`Leaving a group plan when the group is a ${groupType}`, () => {
+      let groupWithPlan;
+      let leader;
+      let member;
+
+      beforeEach(async () => {
+        let { group, groupLeader, members } = await createAndPopulateGroup({
+          groupDetails,
+          members: 1,
+        });
+        leader = groupLeader;
+        member = members[0];
+        groupWithPlan = group;
+        let userWithFreePlan = await User.findById(leader._id).exec();
+
+        // Create subscription
+        let paymentData = {
+          user: userWithFreePlan,
+          groupId: groupWithPlan._id,
+          sub: {
+            key: 'basic_3mo',
+          },
+          customerId: 'customer-id',
+          paymentMethod: 'Payment Method',
+          headers: {
+            'x-client': 'habitica-web',
+            'user-agent': '',
+          },
+        };
+        await payments.createSubscription(paymentData);
+        await member.sync();
      });

-      let leader = groupLeader;
-      let member = members[0];
-      let userWithFreePlan = await User.findById(leader._id).exec();
+      it('cancels the free subscription', async () => {
+        expect(member.purchased.plan.planId).to.equal('group_plan_auto');
+        expect(member.purchased.plan.dateTerminated).to.not.exist;

-      // Create subscription
-      let paymentData = {
-        user: userWithFreePlan,
-        groupId: group._id,
-        sub: {
-          key: 'basic_3mo',
-        },
-        customerId: 'customer-id',
-        paymentMethod: 'Payment Method',
-        headers: {
-          'x-client': 'habitica-web',
-          'user-agent': '',
-        },
-      };
-      await payments.createSubscription(paymentData);
-      await member.sync();
-      expect(member.purchased.plan.planId).to.equal('group_plan_auto');
-      expect(member.purchased.plan.dateTerminated).to.not.exist;
+        // Leave
+        await member.post(`/groups/${groupWithPlan._id}/leave`);
+        await member.sync();
+        expect(member.purchased.plan.dateTerminated).to.exist;
+      });

-      // Leave
-      await member.post(`/groups/${group._id}/leave`);
-      await member.sync();
-      expect(member.purchased.plan.dateTerminated).to.exist;
+      it('preserves the free subscription when leaving a any other group without a plan', async () => {
+        // Joining a guild without a group plan
+        let { group: groupWithNoPlan } = await createAndPopulateGroup({
+          groupDetails: {
+            name: 'Group Without Plan',
+            type: 'guild',
+            privacy: 'public',
+          },
+        });
+
+        await member.post(`/groups/${groupWithNoPlan._id}/join`);
+        await member.sync();
+        expect(member.purchased.plan.planId).to.equal('group_plan_auto');
+        expect(member.purchased.plan.dateTerminated).to.not.exist;
+
+        // Leaving the guild without a group plan
+        await member.post(`/groups/${groupWithNoPlan._id}/leave`);
+        await member.sync();
+        expect(member.purchased.plan.dateTerminated).to.not.exist;
+      });
    });
  });
 });
@@ -9,6 +9,7 @@ describe('POST /user/open-mystery-item', () => {
  let mysteryItemKey = 'eyewear_special_summerRogue';
  let mysteryItemIndex = content.gear.flat[mysteryItemKey].index;
  let mysteryItemType = content.gear.flat[mysteryItemKey].type;
+  let mysteryItemText = content.gear.flat[mysteryItemKey].text();

  beforeEach(async () => {
    user = await generateUser({
@@ -32,5 +33,6 @@ describe('POST /user/open-mystery-item', () => {
    expect(response.data.key).to.eql(mysteryItemKey);
    expect(response.data.index).to.eql(mysteryItemIndex);
    expect(response.data.type).to.eql(mysteryItemType);
+    expect(response.data.text).to.eql(mysteryItemText);
  });
 });
@@ -14,7 +14,7 @@ describe('POST /user/purchase-hourglass/:type/:key', () => {

  // More tests in common code unit tests

-  it('buys a hourglass pet', async () => {
+  it('buys an hourglass pet', async () => {
    let response = await user.post('/user/purchase-hourglass/pets/MantisShrimp-Base');
    await user.sync();

@@ -22,4 +22,22 @@ describe('POST /user/purchase-hourglass/:type/:key', () => {
    expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
    expect(user.items.pets['MantisShrimp-Base']).to.eql(5);
  });
+
+  it('buys an hourglass quest', async () => {
+    let response = await user.post('/user/purchase-hourglass/quests/robot');
+    await user.sync();
+
+    expect(response.message).to.eql(t('hourglassPurchase'));
+    expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
+    expect(user.items.quests.robot).to.eql(1);
+  });
+
+  it('buys multiple hourglass quests', async () => {
+    let response = await user.post('/user/purchase-hourglass/quests/robot', {quantity: 2});
+    await user.sync();
+
+    expect(response.message).to.eql(t('hourglassPurchase'));
+    expect(user.purchased.plan.consecutive.trinkets).to.eql(0);
+    expect(user.items.quests.robot).to.eql(2);
+  });
 });
@@ -40,6 +40,7 @@ describe('GET /inbox/conversations', () => {
    expect(result.length).to.be.equal(3);
    expect(result[0].user).to.be.equal(user.profile.name);
    expect(result[0].username).to.be.equal(user.auth.local.username);
+    expect(result[0].text).to.be.not.empty;
  });

  it('returns the user inbox messages as an array of ordered messages (from most to least recent)', async () => {
@@ -11,8 +11,6 @@
  ],
  "plugins": [
    "transform-object-rest-spread",
-    "syntax-async-functions",
-    "transform-regenerator",
  ],
  "comments": false,
 }
@@ -187,6 +187,24 @@ describe('shared.ops.feed', () => {
      expect(user.achievements.allYourBase).to.eql(true);
    });

+    it('awards Arid Authority achievement', () => {
+      user.items.pets['Wolf-Spooky'] = 5;
+      user.items.food.Milk = 2;
+      user.items.mounts = {
+        'Wolf-Desert': true,
+        'TigerCub-Desert': true,
+        'PandaCub-Desert': true,
+        'LionCub-Desert': true,
+        'Fox-Desert': true,
+        'FlyingPig-Desert': true,
+        'Dragon-Desert': true,
+        'Cactus-Desert': true,
+        'BearCub-Desert': true,
+      };
+      feed(user, {params: {pet: 'Wolf-Spooky', food: 'Milk'}});
+      expect(user.achievements.aridAuthority).to.eql(true);
+    });
+
    it('evolves the pet into a mount when feeding user.items.pets[pet] >= 50', () => {
      user.items.pets['Wolf-Base'] = 49;
      user.items.food.Milk = 2;
@@ -177,6 +177,24 @@ describe('shared.ops.hatch', () => {
        hatch(user, {params: {egg: 'Wolf', hatchingPotion: 'Spooky'}});
        expect(user.achievements.backToBasics).to.eql(true);
      });
+
+      it('awards Dust Devil achievement', () => {
+        user.items.pets = {
+          'Wolf-Desert': 5,
+          'TigerCub-Desert': 5,
+          'PandaCub-Desert': 10,
+          'LionCub-Desert': 5,
+          'Fox-Desert': 5,
+          'FlyingPig-Desert': 5,
+          'Dragon-Desert': 5,
+          'Cactus-Desert': 15,
+          'BearCub-Desert': 5,
+        };
+        user.items.eggs = {Wolf: 1};
+        user.items.hatchingPotions = {Spooky: 1};
+        hatch(user, {params: {egg: 'Wolf', hatchingPotion: 'Spooky'}});
+        expect(user.achievements.dustDevil).to.eql(true);
+      });
    });
  });
 });
@@ -36,7 +36,9 @@ describe('shared.ops.openMysteryItem', () => {

    expect(user.items.gear.owned[mysteryItemKey]).to.be.true;
    expect(message).to.equal(i18n.t('mysteryItemOpened'));
-    expect(data).to.eql(content.gear.flat[mysteryItemKey]);
+    let item = _.cloneDeep(content.gear.flat[mysteryItemKey]);
+    item.text = content.gear.flat[mysteryItemKey].text();
+    expect(data).to.eql(item);
    expect(user.notifications.length).to.equal(0);
  });
 });
@@ -86,10 +86,14 @@ describe('shared.ops.rebirth', () => {
  });

  it('resets user\'s daily streaks to 0', () => {
+    tasks[0].counterDown = 1; // Habit
+    tasks[0].counterUp = 1; // Habit
    tasks[1].streak = 1; // Daily

    rebirth(user, tasks);

+    expect(tasks[0].counterDown).to.equal(0);
+    expect(tasks[0].counterUp).to.equal(0);
    expect(tasks[1].streak).to.equal(0);
  });

@@ -85,6 +85,19 @@ describe('shared.ops.sell', () => {
    }
  });

+  it('returns error when trying to sell Saddle', (done) => {
+    const foodType = 'food';
+    const saddleKey = 'Saddle';
+    user.items[foodType][saddleKey] = 1;
+    try {
+      sell(user, {params: {type: foodType, key: saddleKey}});
+    } catch (err) {
+      expect(err).to.be.an.instanceof(NotAuthorized);
+      expect(err.message).to.equal(i18n.t('foodSaddleSellWarningNote'));
+      done();
+    }
+  });
+
  it('reduces item count from user', () => {
    sell(user, {params: { type, key } });

@@ -60,7 +60,7 @@ const baseConfig = {
          }),
          postcss: [
            autoprefixer({
-              browsers: ['last 2 versions'],
+              overrideBrowserslist: ['last 2 versions'],
            }),
            postcssEasyImport(),
          ],
@@ -103,6 +103,7 @@ const baseConfig = {
            options: {
              plugins: [
                {removeViewBox: false},
+                {convertPathData: {noSpaceAfterFlags: false}},
              ],
            },
          },
@@ -124,6 +125,7 @@ const baseConfig = {
            options: {
              plugins: [
                {removeViewBox: false},
+                {convertPathData: {noSpaceAfterFlags: false}},
              ],
            },
          },
@@ -657,5 +657,6 @@ export default {
 <style src="assets/css/sprites/spritesmith-main-23.css"></style>
 <style src="assets/css/sprites/spritesmith-main-24.css"></style>
 <style src="assets/css/sprites/spritesmith-main-25.css"></style>
+<style src="assets/css/sprites/spritesmith-main-26.css"></style>
 <style src="assets/css/sprites.css"></style>
 <style src="smartbanner.js/dist/smartbanner.min.css"></style>
@@ -1,36 +1,60 @@
-.promo_armoire_backgrounds_201908 {
+.promo_armoire_backgrounds_201909 {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -313px 0px;
+  background-position: 0px -533px;
  width: 423px;
  height: 147px;
 }
-.promo_farm_friends_bundle {
+.promo_desert_pet_achievements {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -223px;
+  background-position: -816px -392px;
+  width: 204px;
+  height: 102px;
+}
+.promo_fall_festival_2018 {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -653px 0px;
+  width: 372px;
+  height: 180px;
+}
+.promo_fall_festival_2019 {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: 0px -343px;
+  width: 360px;
+  height: 189px;
+}
+.promo_rocking_reptiles_bundle {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -424px -533px;
  width: 420px;
  height: 147px;
 }
-.promo_mystery_201908 {
+.promo_seasonal_shop_fall {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -421px -223px;
-  width: 282px;
-  height: 147px;
+  background-position: -653px -392px;
+  width: 162px;
+  height: 138px;
 }
 .promo_take_this {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -313px -148px;
+  background-position: -864px -181px;
  width: 96px;
  height: 69px;
 }
-.promo_unconventional_armor {
-  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -371px;
-  width: 180px;
-  height: 180px;
-}
 .scene_casting_spells {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px 0px;
+  background-position: -340px 0px;
  width: 312px;
  height: 222px;
 }
+.scene_medal {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -653px -181px;
+  width: 210px;
+  height: 210px;
+}
+.scene_video_games {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: 0px 0px;
+  width: 339px;
+  height: 342px;
+}
@@ -1,108 +1,168 @@
-.quest_TEMPLATE_FOR_MISSING_IMAGE {
+.quest_atom1 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -502px -1546px;
-  width: 221px;
-  height: 39px;
-}
-.quest_cow {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1757px 0px;
-  width: 174px;
-  height: 213px;
-}
-.quest_dilatory {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -660px;
-  width: 219px;
-  height: 219px;
-}
-.quest_dilatoryDistress1 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1540px -1085px;
-  width: 210px;
-  height: 210px;
-}
-.quest_dilatoryDistress2 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1757px -724px;
-  width: 150px;
+  background-position: -1333px -1332px;
+  width: 250px;
  height: 150px;
 }
-.quest_dilatoryDistress3 {
+.quest_atom2 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px 0px;
-  width: 219px;
-  height: 219px;
+  background-position: -642px -1534px;
+  width: 207px;
+  height: 138px;
 }
-.quest_dilatory_derby {
+.quest_atom3 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -892px;
-  width: 219px;
-  height: 219px;
+  background-position: -211px -1534px;
+  width: 216px;
+  height: 180px;
 }
-.quest_dolphin {
+.quest_axolotl {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
  background-position: 0px -232px;
  width: 219px;
  height: 219px;
 }
-.quest_dustbunnies {
+.quest_badger {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
  background-position: -220px -232px;
  width: 219px;
  height: 219px;
 }
-.quest_egg {
+.quest_basilist {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1757px -214px;
-  width: 165px;
-  height: 207px;
+  background-position: -191px -1721px;
+  width: 189px;
+  height: 141px;
 }
-.quest_evilsanta {
+.quest_beetle {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1757px -1026px;
-  width: 118px;
-  height: 131px;
+  background-position: 0px -1332px;
+  width: 204px;
+  height: 201px;
 }
-.quest_evilsanta2 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px 0px;
-  width: 219px;
-  height: 219px;
-}
-.quest_falcon {
+.quest_bronze {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
  background-position: -660px -220px;
  width: 219px;
  height: 219px;
 }
-.quest_ferret {
+.quest_bunny {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -452px;
+  background-position: 0px -1534px;
+  width: 210px;
+  height: 186px;
+}
+.quest_butterfly {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -220px -452px;
  width: 219px;
  height: 219px;
 }
-.quest_frog {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -1112px;
-  width: 221px;
-  height: 213px;
-}
-.quest_ghost_stag {
+.quest_cheetah {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
  background-position: -440px -452px;
  width: 219px;
  height: 219px;
 }
+.quest_cow {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1762px 0px;
+  width: 174px;
+  height: 213px;
+}
+.quest_dilatory {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -880px -220px;
+  width: 219px;
+  height: 219px;
+}
+.quest_dilatoryDistress1 {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1540px -1082px;
+  width: 210px;
+  height: 210px;
+}
+.quest_dilatoryDistress2 {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1762px -422px;
+  width: 150px;
+  height: 150px;
+}
+.quest_dilatoryDistress3 {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -220px -672px;
+  width: 219px;
+  height: 219px;
+}
+.quest_dilatory_derby {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -880px 0px;
+  width: 219px;
+  height: 219px;
+}
+.quest_dolphin {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -440px -672px;
+  width: 219px;
+  height: 219px;
+}
+.quest_dustbunnies {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -660px -672px;
+  width: 219px;
+  height: 219px;
+}
+.quest_egg {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1762px -214px;
+  width: 165px;
+  height: 207px;
+}
+.quest_evilsanta {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1762px -724px;
+  width: 118px;
+  height: 131px;
+}
+.quest_evilsanta2 {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1100px -220px;
+  width: 219px;
+  height: 219px;
+}
+.quest_falcon {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1100px -440px;
+  width: 219px;
+  height: 219px;
+}
+.quest_ferret {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1100px -660px;
+  width: 219px;
+  height: 219px;
+}
+.quest_frog {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1540px 0px;
+  width: 221px;
+  height: 213px;
+}
+.quest_ghost_stag {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -220px -892px;
+  width: 219px;
+  height: 219px;
+}
 .quest_goldenknight1 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -452px;
+  background-position: -440px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_goldenknight2 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -251px -1546px;
+  background-position: -1082px -1332px;
  width: 250px;
  height: 150px;
 }
@@ -114,289 +174,223 @@
 }
 .quest_gryphon {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1314px -1332px;
+  background-position: -648px -1332px;
  width: 216px;
  height: 177px;
 }
 .quest_guineapig {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -440px;
+  background-position: -1320px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_harpy {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -672px;
+  background-position: -1320px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_hedgehog {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -1332px;
+  background-position: -205px -1332px;
  width: 219px;
  height: 186px;
 }
 .quest_hippo {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -672px;
+  background-position: -220px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_horse {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -672px;
+  background-position: -1320px -880px;
  width: 219px;
  height: 219px;
 }
 .quest_kangaroo {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -672px;
+  background-position: 0px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_kraken {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1322px -1112px;
+  background-position: -865px -1332px;
  width: 216px;
  height: 177px;
 }
 .quest_lostMasterclasser1 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px 0px;
+  background-position: -440px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_lostMasterclasser2 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -220px;
+  background-position: -660px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_lostMasterclasser3 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -440px;
+  background-position: -880px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_mayhemMistiflying1 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1757px -422px;
+  background-position: -1762px -573px;
  width: 150px;
  height: 150px;
 }
 .quest_mayhemMistiflying2 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -892px;
+  background-position: -1320px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_mayhemMistiflying3 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -892px;
+  background-position: -1100px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_monkey {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -892px;
+  background-position: -220px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_moon1 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1540px 0px;
+  background-position: -1540px -214px;
  width: 216px;
  height: 216px;
 }
 .quest_moon2 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -892px;
+  background-position: -1320px -660px;
  width: 219px;
  height: 219px;
 }
 .quest_moon3 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -892px;
+  background-position: -1320px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone1 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px 0px;
+  background-position: -1100px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone2 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px -220px;
+  background-position: -660px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone3 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px -440px;
+  background-position: 0px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_nudibranch {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1540px -651px;
+  background-position: -1540px -865px;
  width: 216px;
  height: 216px;
 }
 .quest_octopus {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -1332px;
+  background-position: -425px -1332px;
  width: 222px;
  height: 177px;
 }
 .quest_owl {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px -880px;
+  background-position: -1100px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_peacock {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1540px -434px;
+  background-position: -1540px -648px;
  width: 216px;
  height: 216px;
 }
 .quest_penguin {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1697px;
+  background-position: 0px -1721px;
  width: 190px;
  height: 183px;
 }
 .quest_pterodactyl {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -1112px;
+  background-position: -880px -672px;
  width: 219px;
  height: 219px;
 }
 .quest_rat {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -1112px;
+  background-position: 0px -672px;
+  width: 219px;
+  height: 219px;
+}
+.quest_robot {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -880px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_rock {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1540px -217px;
+  background-position: -1540px -431px;
  width: 216px;
  height: 216px;
 }
 .quest_rooster {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1531px -1332px;
+  background-position: -428px -1534px;
  width: 213px;
  height: 174px;
 }
 .quest_sabretooth {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -1112px;
+  background-position: -660px -452px;
  width: 219px;
  height: 219px;
 }
 .quest_seaserpent {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -452px;
+  background-position: 0px -452px;
  width: 219px;
  height: 219px;
 }
 .quest_sheep {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -1112px;
+  background-position: -660px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_silver {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px -660px;
+  background-position: -440px -232px;
  width: 219px;
  height: 219px;
 }
 .quest_slime {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -672px;
+  background-position: -440px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_sloth {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px 0px;
+  background-position: -880px -892px;
  width: 219px;
  height: 219px;
 }
-.quest_snail {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1332px;
-  width: 219px;
-  height: 213px;
-}
-.quest_snake {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -1332px;
-  width: 216px;
-  height: 177px;
-}
-.quest_spider {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1546px;
-  width: 250px;
-  height: 150px;
-}
-.quest_squirrel {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_stoikalmCalamity1 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1757px -573px;
-  width: 150px;
-  height: 150px;
-}
-.quest_stoikalmCalamity2 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -220px;
-  width: 219px;
-  height: 219px;
-}
-.quest_stoikalmCalamity3 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px 0px;
-  width: 219px;
-  height: 219px;
-}
-.quest_taskwoodsTerror1 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1757px -875px;
-  width: 150px;
-  height: 150px;
-}
-.quest_taskwoodsTerror2 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1540px -868px;
-  width: 216px;
-  height: 216px;
-}
-.quest_taskwoodsTerror3 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -232px;
-  width: 219px;
-  height: 219px;
-}
-.quest_treeling {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -663px -1332px;
-  width: 216px;
-  height: 177px;
-}
-.quest_trex_undead {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1097px -1332px;
-  width: 216px;
-  height: 177px;
-}
@@ -0,0 +1,234 @@
+.Pet-Yarn-Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Skeleton {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-White {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -82px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -164px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet_HatchingPotion_Aquatic {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -82px -100px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Base {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -151px -100px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Bronze {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -246px 0px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Celestial {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -246px -69px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_CottonCandyBlue {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -200px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_CottonCandyPink {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -69px -200px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Cupid {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -138px -200px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Desert {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -207px -200px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Ember {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -315px 0px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Fairy {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -315px -69px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Floral {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -315px -138px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Frost {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -269px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Ghost {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -69px -269px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Glass {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -138px -269px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Glow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -207px -269px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Golden {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -207px -407px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Holly {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -384px 0px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_IcySnow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -384px -69px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Peppermint {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -384px -138px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Purple {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -384px -207px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Rainbow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -338px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Red {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -69px -338px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_RoseQuartz {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -138px -338px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_RoyalPurple {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -207px -338px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -276px -338px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shimmer {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -345px -338px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Silver {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -453px 0px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Skeleton {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -453px -69px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Spooky {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -453px -138px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_StarryNight {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -453px -207px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Sunshine {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -453px -276px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Thunderstorm {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -407px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Watery {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -69px -407px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_White {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -138px -407px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -276px -269px;
+  width: 68px;
+  height: 68px;
+}
@@ -2,8 +2,8 @@
 // possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring, summer
 // more to be added on future seasons

-$npc_market_flavor: 'normal';
-$npc_quests_flavor: 'normal';
-$npc_seasonal_flavor: 'normal';
-$npc_timetravelers_flavor: 'normal';
-$npc_tavern_flavor: 'normal';
+$npc_market_flavor: 'fall';
+$npc_quests_flavor: 'fall';
+$npc_seasonal_flavor: 'fall';
+$npc_timetravelers_flavor: 'fall';
+$npc_tavern_flavor: 'fall';
@@ -9,41 +9,23 @@
    </defs>
    <g fill="none" fill-rule="evenodd">
        <g transform="translate(138.726 12.613)">
-            <mask id="b" fill="#fff">
-                <use xlink:href="#a"/>
-            </mask>
-            <path fill="#4F2A93" d="M21.94 19.774a3.025 3.025 0 0 0-4.23.545 6.115 6.115 0 0 1-4.87 2.389c-3.249 0-5.934-2.519-6.131-5.743-.007-.465-.012-3.793-.012-4.226 0-3.376 2.756-6.122 6.144-6.122a6.1 6.1 0 0 1 4.456 1.907 3.023 3.023 0 0 0 4.263.11 2.997 2.997 0 0 0 .11-4.249A12.248 12.248 0 0 0 12.84.606C6.128.606.667 6.048.667 12.739c0 .041.001 4.206.018 4.512.35 6.43 5.69 11.467 12.157 11.467a12.11 12.11 0 0 0 9.645-4.728 2.999 2.999 0 0 0-.546-4.216" mask="url(#b)"/>
+            <path fill="#4F2A93" d="M21.94 19.774a3.025 3.025 0 0 0-4.23.545 6.115 6.115 0 0 1-4.87 2.389c-3.249 0-5.934-2.519-6.131-5.743-.007-.465-.012-3.793-.012-4.226 0-3.376 2.756-6.122 6.144-6.122a6.1 6.1 0 0 1 4.456 1.907 3.023 3.023 0 0 0 4.263.11 2.997 2.997 0 0 0 .11-4.249A12.248 12.248 0 0 0 12.84.606C6.128.606.667 6.048.667 12.739c0 .041.001 4.206.018 4.512.35 6.43 5.69 11.467 12.157 11.467a12.11 12.11 0 0 0 9.645-4.728 2.999 2.999 0 0 0-.546-4.216"/>
        </g>
        <path fill="#4F2A93" d="M178.606 35.32c-3.249 0-5.933-2.518-6.131-5.74-.007-.467-.012-3.81-.012-4.229 0-3.375 2.756-6.122 6.143-6.122 3.388 0 6.144 2.747 6.144 6.122 0 .434-.005 3.763-.012 4.223-.195 3.226-2.88 5.746-6.132 5.746m9.16-22.621a3.007 3.007 0 0 0-2.911 2.259 12.12 12.12 0 0 0-6.249-1.74c-6.713 0-12.174 5.444-12.174 12.133 0 .043.002 4.205.017 4.513.35 6.43 5.69 11.467 12.157 11.467 2.341 0 4.53-.667 6.392-1.815a3.014 3.014 0 0 0 2.768 1.815 3.01 3.01 0 0 0 3.015-3.006V15.704a3.01 3.01 0 0 0-3.015-3.005M40.6 35.32c-3.25 0-5.934-2.519-6.13-5.742-.008-.464-.013-3.793-.013-4.227 0-3.375 2.756-6.122 6.144-6.122 3.387 0 6.143 2.747 6.143 6.122 0 .434-.005 3.763-.012 4.223-.195 3.226-2.88 5.746-6.131 5.746m9.159-22.621a3.007 3.007 0 0 0-2.91 2.259 12.12 12.12 0 0 0-6.25-1.74c-6.713 0-12.175 5.444-12.175 12.133 0 .043.002 4.206.019 4.513.35 6.43 5.69 11.467 12.157 11.467 2.34 0 4.53-.667 6.392-1.815a3.014 3.014 0 0 0 2.767 1.815 3.01 3.01 0 0 0 3.016-3.006V15.704A3.01 3.01 0 0 0 49.76 12.7M94.159 12.699a3.01 3.01 0 0 0-3.016 3.005v22.621a3.01 3.01 0 0 0 3.016 3.006 3.01 3.01 0 0 0 3.016-3.006v-22.62a3.01 3.01 0 0 0-3.016-3.006M129.678 12.699a3.01 3.01 0 0 0-3.016 3.005v22.621a3.01 3.01 0 0 0 3.016 3.006 3.01 3.01 0 0 0 3.016-3.006v-22.62a3.01 3.01 0 0 0-3.016-3.006"/>
        <g transform="translate(59.646 .591)">
-            <mask id="d" fill="#fff">
-                <use xlink:href="#c"/>
-            </mask>
-            <path fill="#4F2A93" d="M18.864 28.99c-.198 3.221-2.883 5.739-6.131 5.739-3.25 0-5.935-2.519-6.132-5.746-.008-.464-.012-3.79-.012-4.223 0-3.376 2.756-6.122 6.144-6.122 3.386 0 6.143 2.746 6.143 6.122 0 .419-.005 3.762-.012 4.23m-6.131-16.363c-2.242 0-4.338.618-6.144 1.676V3.083A3.01 3.01 0 0 0 3.574.076 3.01 3.01 0 0 0 .558 3.082v34.653a3.01 3.01 0 0 0 3.016 3.005c1.24 0 2.304-.748 2.767-1.815a12.149 12.149 0 0 0 6.392 1.815c6.466 0 11.806-5.037 12.157-11.478.015-.297.017-4.46.017-4.502 0-6.69-5.462-12.133-12.174-12.133" mask="url(#d)"/>
+            <path fill="#4F2A93" d="M18.864 28.99c-.198 3.221-2.883 5.739-6.131 5.739-3.25 0-5.935-2.519-6.132-5.746-.008-.464-.012-3.79-.012-4.223 0-3.376 2.756-6.122 6.144-6.122 3.386 0 6.143 2.746 6.143 6.122 0 .419-.005 3.762-.012 4.23m-6.131-16.363c-2.242 0-4.338.618-6.144 1.676V3.083A3.01 3.01 0 0 0 3.574.076 3.01 3.01 0 0 0 .558 3.082v34.653a3.01 3.01 0 0 0 3.016 3.005c1.24 0 2.304-.748 2.767-1.815a12.149 12.149 0 0 0 6.392 1.815c6.466 0 11.806-5.037 12.157-11.478.015-.297.017-4.46.017-4.502 0-6.69-5.462-12.133-12.174-12.133"/>
        </g>
        <g transform="translate(0 .591)">
-            <mask id="f" fill="#fff">
-                <use xlink:href="#e"/>
-            </mask>
-            <path fill="#4F2A93" d="M11.855 12.627c-2.08 0-4.07.52-5.823 1.47V3.082A3.01 3.01 0 0 0 3.016.077 3.01 3.01 0 0 0 0 3.082v34.652a3.01 3.01 0 0 0 3.016 3.006 3.01 3.01 0 0 0 3.016-3.006V22.201c.23-.196.442-.416.612-.684a6.12 6.12 0 0 1 5.211-2.879c3.387 0 6.143 2.746 6.143 6.122 0 .55-.005 12.23-.013 12.9a3.01 3.01 0 0 0 3.018 3.08 3.012 3.012 0 0 0 3.01-2.853c.014-.297.016-12.999.016-13.127 0-6.69-5.46-12.133-12.174-12.133" mask="url(#f)"/>
+            <path fill="#4F2A93" d="M11.855 12.627c-2.08 0-4.07.52-5.823 1.47V3.082A3.01 3.01 0 0 0 3.016.077 3.01 3.01 0 0 0 0 3.082v34.652a3.01 3.01 0 0 0 3.016 3.006 3.01 3.01 0 0 0 3.016-3.006V22.201c.23-.196.442-.416.612-.684a6.12 6.12 0 0 1 5.211-2.879c3.387 0 6.143 2.746 6.143 6.122 0 .55-.005 12.23-.013 12.9a3.01 3.01 0 0 0 3.018 3.08 3.012 3.012 0 0 0 3.01-2.853c.014-.297.016-12.999.016-13.127 0-6.69-5.46-12.133-12.174-12.133"/>
        </g>
        <g transform="translate(101.867 .591)">
-            <mask id="h" fill="#fff">
-                <use xlink:href="#g"/>
-            </mask>
-            <path fill="#4F2A93" d="M16.363 12.108h-3.518V3.082A3.01 3.01 0 0 0 9.829.077a3.01 3.01 0 0 0-3.016 3.005v9.026H3.295a3.01 3.01 0 0 0-3.016 3.005 3.01 3.01 0 0 0 3.016 3.005h3.518v19.616a3.01 3.01 0 0 0 3.016 3.005 3.01 3.01 0 0 0 3.016-3.005V18.118h3.518a3.01 3.01 0 0 0 3.016-3.005 3.01 3.01 0 0 0-3.016-3.005" mask="url(#h)"/>
+            <path fill="#4F2A93" d="M16.363 12.108h-3.518V3.082A3.01 3.01 0 0 0 9.829.077a3.01 3.01 0 0 0-3.016 3.005v9.026H3.295a3.01 3.01 0 0 0-3.016 3.005 3.01 3.01 0 0 0 3.016 3.005h3.518v19.616a3.01 3.01 0 0 0 3.016 3.005 3.01 3.01 0 0 0 3.016-3.005V18.118h3.518a3.01 3.01 0 0 0 3.016-3.005 3.01 3.01 0 0 0-3.016-3.005"/>
        </g>
        <g transform="translate(90.474 .591)">
-            <mask id="j" fill="#fff">
-                <use xlink:href="#i"/>
-            </mask>
-            <path fill="#FF6066" d="M6.59 3.082a3.01 3.01 0 0 1-3.016 3.005A3.01 3.01 0 0 1 .558 3.082 3.01 3.01 0 0 1 3.574.077 3.01 3.01 0 0 1 6.59 3.082" mask="url(#j)"/>
+            <path fill="#FF6066" d="M6.59 3.082a3.01 3.01 0 0 1-3.016 3.005A3.01 3.01 0 0 1 .558 3.082 3.01 3.01 0 0 1 3.574.077 3.01 3.01 0 0 1 6.59 3.082"/>
        </g>
        <g transform="translate(125.993 .591)">
-            <mask id="l" fill="#fff">
-                <use xlink:href="#k"/>
-            </mask>
-            <path fill="#4FB5E8" d="M6.59 3.082a3.01 3.01 0 0 1-3.016 3.005A3.01 3.01 0 0 1 .558 3.082 3.01 3.01 0 0 1 3.574.077 3.01 3.01 0 0 1 6.59 3.082" mask="url(#l)"/>
+            <path fill="#4FB5E8" d="M6.59 3.082a3.01 3.01 0 0 1-3.016 3.005A3.01 3.01 0 0 1 .558 3.082 3.01 3.01 0 0 1 3.574.077 3.01 3.01 0 0 1 6.59 3.082"/>
        </g>
    </g>
 </svg>
@@ -4,8 +4,8 @@
    </defs>
    <g fill="none" fill-rule="evenodd">
        <path fill="#FFF" d="M24.052 26.3c-.832-.09-.841-.462-.832-5.421 0 0-.083-.312.395-.582.477-.27 1.93-2.679 1.037-4.734-.892-2.056-.248-1.952.125-1.744.374.208.554-.055.332-1.183-.457-2.325-1.17-3.113-2.851-4.162-1.104-.69-.704-1.94.866-1.848.766.045.766.046.862-.555.152-.947-.15-2.565-1.327-2.788-.81-.154-1.817.713-3.015.109-1.198-.604-3.178.904-3.988 1.254s-1.479.354-2.403.331c-.925-.022.49 1.531 1.906 1.881 1.216.3.743.516.674 1.51-.078 1.113.24 1.59-.279 1.707-.796.178-1.686-1.961-3.052-2.857C9.4 5.183 7.56 6.152 2.15.201 1.211-.83 1.592 2.36 2.17 4.063c1.543 4.55 4.532 5.153 5.942 5.29 1.18.116 1.984-.158 1.984.297 0 .33-1.391.48-1.93.482a9.469 9.469 0 0 1-1.762-.173c-1.073-.2.569 2.535 1.624 3.402 1.78 1.465 3.818 2.014 5.456 2.18.473.048 1.146.04 1.146.41 0 .352-.354.438-.773.441-2.294.017-3.612 1.849-3.986 3.967-.237 1.346-.06 2.868-.035 4.005l.09.812c.18 1.426-4.948 1.975-5.627-.322-.743-2.51 3.309-3.837 3.383-6.232.047-1.509-1.333-2.194-1.333-2.194V14.224H4.76v-1.587H3.174V11.05H1.587v4.761h1.587V17.4h2.613c.594 0 1.07.392 1.015 1.24-.137 2.093-4.589 3.379-3.365 6.716.884 2.41 4.696 2.441 8.513 2.441l7.118-.006c.222 0 .534-.107.08-1.255-.367-.927-1.632-.276-2.706-.276-1.137 0-1.176-.96-.446-1.973.446-.618 1.014-1.078 1.979-1.527 1.486-.693 2.617.198 3.174.963.8 1.099 1.054 2.355.348 2.552-.851.238-1.113.27-1.141 1.08-.022.581.256.422 1.595.422h4.445c.688 0 .637-.53-.055-1.45-.491-.653-1.028.11-2.289-.027z"/>
-        <path fill="#FFF" d="M0 10.827h1.587V9.24H0zM113.986 19.894a1.385 1.385 0 0 0-1.942.25c-.54.7-1.354 1.101-2.236 1.101a2.82 2.82 0 0 1-2.815-2.645 416.05 416.05 0 0 1-.005-1.947 2.824 2.824 0 0 1 2.82-2.821c.781 0 1.508.312 2.046.879a1.385 1.385 0 0 0 2.008-1.907 5.614 5.614 0 0 0-4.054-1.741 5.596 5.596 0 0 0-5.59 5.59c0 .019.001 1.937.009 2.078a5.589 5.589 0 0 0 5.581 5.283c1.747 0 3.361-.793 4.429-2.178a1.385 1.385 0 0 0-.251-1.942M122.223 21.245a2.819 2.819 0 0 1-2.815-2.644 419.52 419.52 0 0 1-.006-1.949 2.824 2.824 0 0 1 2.82-2.82 2.824 2.824 0 0 1 2.821 2.82c0 .2-.002 1.734-.005 1.946a2.818 2.818 0 0 1-2.815 2.647m4.205-10.422c-.645 0-1.183.444-1.336 1.04a5.55 5.55 0 0 0-2.87-.8 5.596 5.596 0 0 0-5.589 5.59c0 .019.001 1.936.008 2.078a5.589 5.589 0 0 0 8.517 4.447 1.384 1.384 0 0 0 2.655-.548V12.208c0-.765-.62-1.385-1.385-1.385M58.861 21.245a2.819 2.819 0 0 1-2.815-2.646c-.003-.213-.005-1.747-.005-1.947a2.824 2.824 0 0 1 2.82-2.82 2.824 2.824 0 0 1 2.82 2.82c0 .2-.001 1.734-.005 1.946a2.818 2.818 0 0 1-2.815 2.647m4.206-10.422c-.646 0-1.183.444-1.337 1.04a5.55 5.55 0 0 0-2.869-.8 5.596 5.596 0 0 0-5.59 5.59c0 .019.001 1.937.009 2.078a5.589 5.589 0 0 0 8.516 4.447 1.384 1.384 0 0 0 2.655-.548V12.208c0-.765-.62-1.385-1.384-1.385M83.451 10.823c-.764 0-1.384.62-1.384 1.385V22.63a1.385 1.385 0 0 0 2.769 0V12.208c0-.765-.62-1.385-1.385-1.385M99.759 10.823c-.765 0-1.385.62-1.385 1.385V22.63a1.385 1.385 0 0 0 2.77 0V12.208c0-.765-.62-1.385-1.385-1.385M76.266 18.6a2.82 2.82 0 0 1-2.815 2.645 2.82 2.82 0 0 1-2.815-2.647c-.004-.214-.005-1.746-.005-1.946a2.824 2.824 0 0 1 2.82-2.82 2.824 2.824 0 0 1 2.82 2.82c0 .193-.002 1.733-.005 1.949m-2.815-7.538c-1.03 0-1.991.284-2.82.772v-5.17a1.385 1.385 0 0 0-2.77 0V22.63a1.385 1.385 0 0 0 2.655.548c.856.529 1.86.836 2.935.836a5.59 5.59 0 0 0 5.582-5.288c.007-.137.008-2.054.008-2.074a5.596 5.596 0 0 0-5.59-5.59M45.664 11.063a5.58 5.58 0 0 0-2.674.677V6.665a1.385 1.385 0 0 0-2.77 0V22.63a1.385 1.385 0 1 0 2.77 0v-7.157c.106-.09.203-.191.281-.315a2.808 2.808 0 0 1 2.393-1.326 2.824 2.824 0 0 1 2.82 2.82c0 .254-.002 5.635-.006 5.944a1.385 1.385 0 0 0 2.767.104c.007-.137.008-5.989.008-6.048a5.596 5.596 0 0 0-5.59-5.59M94.503 10.823h-1.616V6.665a1.385 1.385 0 0 0-2.77 0v4.158h-1.614a1.385 1.385 0 0 0 0 2.77h1.615v9.037a1.385 1.385 0 0 0 2.77 0v-9.038h1.615a1.385 1.385 0 0 0 0-2.769" mask="url(#b)"/>
-        <path fill="#FF6066" d="M84.785 6.665a1.385 1.385 0 1 1-2.77 0 1.385 1.385 0 0 1 2.77 0" mask="url(#b)"/>
-        <path fill="#4FB5E8" d="M101.092 6.665a1.385 1.385 0 1 1-2.77 0 1.385 1.385 0 0 1 2.77 0" mask="url(#b)"/>
+        <path fill="#FFF" d="M0 10.827h1.587V9.24H0zM113.986 19.894a1.385 1.385 0 0 0-1.942.25c-.54.7-1.354 1.101-2.236 1.101a2.82 2.82 0 0 1-2.815-2.645 416.05 416.05 0 0 1-.005-1.947 2.824 2.824 0 0 1 2.82-2.821c.781 0 1.508.312 2.046.879a1.385 1.385 0 0 0 2.008-1.907 5.614 5.614 0 0 0-4.054-1.741 5.596 5.596 0 0 0-5.59 5.59c0 .019.001 1.937.009 2.078a5.589 5.589 0 0 0 5.581 5.283c1.747 0 3.361-.793 4.429-2.178a1.385 1.385 0 0 0-.251-1.942M122.223 21.245a2.819 2.819 0 0 1-2.815-2.644 419.52 419.52 0 0 1-.006-1.949 2.824 2.824 0 0 1 2.82-2.82 2.824 2.824 0 0 1 2.821 2.82c0 .2-.002 1.734-.005 1.946a2.818 2.818 0 0 1-2.815 2.647m4.205-10.422c-.645 0-1.183.444-1.336 1.04a5.55 5.55 0 0 0-2.87-.8 5.596 5.596 0 0 0-5.589 5.59c0 .019.001 1.936.008 2.078a5.589 5.589 0 0 0 8.517 4.447 1.384 1.384 0 0 0 2.655-.548V12.208c0-.765-.62-1.385-1.385-1.385M58.861 21.245a2.819 2.819 0 0 1-2.815-2.646c-.003-.213-.005-1.747-.005-1.947a2.824 2.824 0 0 1 2.82-2.82 2.824 2.824 0 0 1 2.82 2.82c0 .2-.001 1.734-.005 1.946a2.818 2.818 0 0 1-2.815 2.647m4.206-10.422c-.646 0-1.183.444-1.337 1.04a5.55 5.55 0 0 0-2.869-.8 5.596 5.596 0 0 0-5.59 5.59c0 .019.001 1.937.009 2.078a5.589 5.589 0 0 0 8.516 4.447 1.384 1.384 0 0 0 2.655-.548V12.208c0-.765-.62-1.385-1.384-1.385M83.451 10.823c-.764 0-1.384.62-1.384 1.385V22.63a1.385 1.385 0 0 0 2.769 0V12.208c0-.765-.62-1.385-1.385-1.385M99.759 10.823c-.765 0-1.385.62-1.385 1.385V22.63a1.385 1.385 0 0 0 2.77 0V12.208c0-.765-.62-1.385-1.385-1.385M76.266 18.6a2.82 2.82 0 0 1-2.815 2.645 2.82 2.82 0 0 1-2.815-2.647c-.004-.214-.005-1.746-.005-1.946a2.824 2.824 0 0 1 2.82-2.82 2.824 2.824 0 0 1 2.82 2.82c0 .193-.002 1.733-.005 1.949m-2.815-7.538c-1.03 0-1.991.284-2.82.772v-5.17a1.385 1.385 0 0 0-2.77 0V22.63a1.385 1.385 0 0 0 2.655.548c.856.529 1.86.836 2.935.836a5.59 5.59 0 0 0 5.582-5.288c.007-.137.008-2.054.008-2.074a5.596 5.596 0 0 0-5.59-5.59M45.664 11.063a5.58 5.58 0 0 0-2.674.677V6.665a1.385 1.385 0 0 0-2.77 0V22.63a1.385 1.385 0 1 0 2.77 0v-7.157c.106-.09.203-.191.281-.315a2.808 2.808 0 0 1 2.393-1.326 2.824 2.824 0 0 1 2.82 2.82c0 .254-.002 5.635-.006 5.944a1.385 1.385 0 0 0 2.767.104c.007-.137.008-5.989.008-6.048a5.596 5.596 0 0 0-5.59-5.59M94.503 10.823h-1.616V6.665a1.385 1.385 0 0 0-2.77 0v4.158h-1.614a1.385 1.385 0 0 0 0 2.77h1.615v9.037a1.385 1.385 0 0 0 2.77 0v-9.038h1.615a1.385 1.385 0 0 0 0-2.769" />
+        <path fill="#FF6066" d="M84.785 6.665a1.385 1.385 0 1 1-2.77 0 1.385 1.385 0 0 1 2.77 0" />
+        <path fill="#4FB5E8" d="M101.092 6.665a1.385 1.385 0 1 1-2.77 0 1.385 1.385 0 0 1 2.77 0" />
    </g>
 </svg>
@@ -16,7 +16,7 @@ export default {
    ...mapState(['isUserLoggedIn']),
    contactUsLink () {
      if (this.isUserLoggedIn) {
-        return {name: 'guild', params: {groupId: '5481ccf3-5d2d-48a9-a871-70a7380cee5a'} };
+        return {name: 'guild', params: {groupId: 'a29da26b-37de-4a71-b0c6-48e72a900dac'} };
      } else {
        return {name: 'contact'};
      }
@@ -164,30 +164,32 @@ export default {
    classGear (heroClass) {
      if (heroClass === 'rogue') {
        return {
-          armor: 'armor_rogue_5',
-          head: 'head_rogue_5',
-          shield: 'shield_rogue_6',
-          weapon: 'weapon_rogue_6',
+          armor: 'armor_special_fall2019Rogue',
+          eyewear: 'eyewear_special_fall2019Rogue',
+          head: 'head_special_fall2019Rogue',
+          shield: 'shield_special_fall2019Rogue',
+          weapon: 'weapon_special_fall2019Rogue',
        };
      } else if (heroClass === 'wizard') {
        return {
-          armor: 'armor_wizard_5',
-          head: 'head_wizard_5',
-          weapon: 'weapon_wizard_6',
+          armor: 'armor_special_fall2019Mage',
+          head: 'head_special_fall2019Mage',
+          weapon: 'weapon_special_fall2019Mage',
        };
      } else if (heroClass === 'healer') {
        return {
-          armor: 'armor_healer_5',
-          head: 'head_healer_5',
-          shield: 'shield_healer_5',
-          weapon: 'weapon_healer_6',
+          armor: 'armor_special_fall2019Healer',
+          eyewear: 'eyewear_special_fall2019Healer',
+          head: 'head_special_fall2019Healer',
+          shield: 'shield_special_fall2019Healer',
+          weapon: 'weapon_special_fall2019Healer',
        };
      } else {
        return {
-          armor: 'armor_warrior_5',
-          head: 'head_warrior_5',
-          shield: 'shield_warrior_5',
-          weapon: 'weapon_warrior_6',
+          armor: 'armor_special_fall2019Warrior',
+          head: 'head_special_fall2019Warrior',
+          shield: 'shield_special_fall2019Warrior',
+          weapon: 'weapon_special_fall2019Warrior',
        };
      }
    },
@@ -57,6 +57,7 @@
        :type="column",
        :key="column",
        :taskListOverride='tasksByType[column]',
+        :showOptions="showOptions",
        @editTask="editTask",
        @taskDestroyed="taskDestroyed",
        v-if='tasksByType[column].length > 0')
@@ -251,6 +252,9 @@ export default {
    canJoin () {
      return !this.isMember;
    },
+    showOptions () {
+      return this.isLeader;
+    },
  },
  mounted () {
    if (!this.searchId) this.searchId = this.challengeId;
@@ -39,9 +39,9 @@
            .custom-control.custom-checkbox
              input.custom-control-input(type="checkbox",
                :value="group.key",
-                :id="group.key",
+                :id="`challenge-modal-cat-${group.key}`",
                 v-model="workingChallenge.categories")
-              label.custom-control-label(v-once, :for="group.key") {{ $t(group.label) }}
+              label.custom-control-label(v-once, :for="`challenge-modal-cat-${group.key}`") {{ $t(group.label) }}
          button.btn.btn-primary(@click.prevent="toggleCategorySelect") {{$t('close')}}
      // @TODO: Implement in V2 .form-group
        label
@@ -44,17 +44,21 @@ b-modal#avatar-modal(title="", :size='editing ? "lg" : "md"', :hide-header='true
          strong(v-once) {{$t('shirt')}}
      .row(v-if='activeSubPage === "size"')
        .col-12.customize-options.size-options
-          .option(v-for='option in ["slim", "broad"]', :class='{active: user.preferences.size === option}')
-            .sprite.customize-option(:class="`${option}_shirt_black`", @click='set({"preferences.size": option})')
+          .option(v-for='option in ["slim", "broad"]',
+            :class='{active: user.preferences.size === option}',
+            @click='set({"preferences.size": option})')
+            .sprite.customize-option(:class="`${option}_shirt_black`")
      .row(v-if='activeSubPage === "shirt"')
        .col-12.customize-options
          .option(v-for='option in ["black", "blue", "green", "pink", "white", "yellow"]',
-            :class='{active: user.preferences.shirt === option}')
-            .sprite.customize-option(:class="`slim_shirt_${option}`", @click='set({"preferences.shirt": option})')
+            :class='{active: user.preferences.shirt === option}',
+            @click='set({"preferences.shirt": option})')
+            .sprite.customize-option(:class="`slim_shirt_${option}`")
        .col-12.customize-options(v-if='editing')
          .option(v-for='item in specialShirts',
-            :class='{active: item.active, locked: item.locked}')
-            .sprite.customize-option(:class="`broad_shirt_${item.key}`", @click='item.click')
+            :class='{active: item.active, locked: item.locked}',
+            @click='item.click')
+            .sprite.customize-option(:class="`broad_shirt_${item.key}`")
            .gem-lock(v-if='item.locked')
              .svg-icon.gem(v-html='icons.gem')
              span 2
@@ -70,13 +74,15 @@ b-modal#avatar-modal(title="", :size='editing ? "lg" : "md"', :hide-header='true
      .row
        .col-12.customize-options
          .option(v-for='option in ["ddc994", "f5a76e", "ea8349", "c06534", "98461a", "915533", "c3e1dc", "6bd049"]',
-            :class='{active: user.preferences.skin === option}')
-            .skin.sprite.customize-option(:class="`skin_${option}`", @click='set({"preferences.skin": option})')
+            :class='{active: user.preferences.skin === option}',
+            @click='set({"preferences.skin": option})')
+            .skin.sprite.customize-option(:class="`skin_${option}`")
      .row(v-if='editing && set.key !== "undefined"', v-for='set in seasonalSkins')
        .col-12.customize-options
          .option(v-for='option in set.options',
-            :class='{active: option.active, locked: option.locked, hide: option.hide}')
-            .skin.sprite.customize-option(:class="`skin_${option.key}`", @click='option.click')
+            :class='{active: option.active, locked: option.locked, hide: option.hide}',
+            @click='option.click')
+            .skin.sprite.customize-option(:class="`skin_${option.key}`")
            .gem-lock(v-if='option.locked')
              .svg-icon.gem(v-html='icons.gem')
              span 2
@@ -98,12 +104,14 @@ b-modal#avatar-modal(title="", :size='editing ? "lg" : "md"', :hide-header='true
      #hair-color.row(v-if='activeSubPage === "color"')
        .col-12.customize-options
          .option(v-for='option in ["white", "brown", "blond", "red", "black"]',
-            :class='{active: user.preferences.hair.color === option}')
-            .color-bangs.sprite.customize-option(:class="`hair_bangs_1_${option}`", @click='set({"preferences.hair.color": option})')
+            :class='{active: user.preferences.hair.color === option}',
+            @click='set({"preferences.hair.color": option})')
+            .color-bangs.sprite.customize-option(:class="`hair_bangs_1_${option}`")
        .col-12.customize-options(v-if='editing && set.key !== "undefined"', v-for='set in seasonalHairColors')
          .option(v-for='option in set.options',
-            :class='{active: option.active, locked: option.locked, hide: option.hide}')
-            .skin.sprite.customize-option(:class="`hair_bangs_1_${option.key}`", @click='option.click')
+            :class='{active: option.active, locked: option.locked, hide: option.hide}',
+            @click='option.click')
+            .skin.sprite.customize-option(:class="`hair_bangs_1_${option.key}`")
            .gem-lock(v-if='option.locked')
              .svg-icon.gem(v-html='icons.gem')
              span 2
@@ -116,8 +124,9 @@ b-modal#avatar-modal(title="", :size='editing ? "lg" : "md"', :hide-header='true
        .col-12.customize-options(v-if='editing')
          .head_0.option(@click='set({"preferences.hair.base": 0})', :class="[{ active: user.preferences.hair.base === 0 }, 'hair_base_0_' + user.preferences.hair.color]")
          .option(v-for='option in baseHair3',
-            :class='{active: option.active, locked: option.locked}')
-            .base.sprite.customize-option(:class="`hair_base_${option.key}_${user.preferences.hair.color}`", @click='option.click')
+            :class='{active: option.active, locked: option.locked}',
+            @click='option.click')
+            .base.sprite.customize-option(:class="`hair_base_${option.key}_${user.preferences.hair.color}`")
            .gem-lock(v-if='option.locked')
              .svg-icon.gem(v-html='icons.gem')
              span 2
@@ -128,8 +137,9 @@ b-modal#avatar-modal(title="", :size='editing ? "lg" : "md"', :hide-header='true
            button.btn.btn-secondary.purchase-all(@click='unlock(`hair.base.${baseHair3Keys.join(",hair.base.")}`)') {{ $t('purchaseAll') }}
        .col-12.customize-options(v-if='editing')
          .option(v-for='option in baseHair4',
-            :class='{active: option.active, locked: option.locked}')
-            .base.sprite.customize-option(:class="`hair_base_${option.key}_${user.preferences.hair.color}`", @click='option.click')
+            :class='{active: option.active, locked: option.locked}',
+            @click='option.click')
+            .base.sprite.customize-option(:class="`hair_base_${option.key}_${user.preferences.hair.color}`")
            .gem-lock(v-if='option.locked')
              .svg-icon.gem(v-html='icons.gem')
              span 2
@@ -141,12 +151,14 @@ b-modal#avatar-modal(title="", :size='editing ? "lg" : "md"', :hide-header='true
        .col-12.customize-options
          .head_0.option(v-if="!editing", @click='set({"preferences.hair.base": 0})', :class="[{ active: user.preferences.hair.base === 0 }, 'hair_base_0_' + user.preferences.hair.color]")
          .option(v-for='option in baseHair1',
-            :class='{active: user.preferences.hair.base === option}')
-            .base.sprite.customize-option(:class="`hair_base_${option}_${user.preferences.hair.color}`", @click='set({"preferences.hair.base": option})')
+            :class='{active: user.preferences.hair.base === option}',
+            @click='set({"preferences.hair.base": option})')
+            .base.sprite.customize-option(:class="`hair_base_${option}_${user.preferences.hair.color}`")
        .col-12.customize-options(v-if='editing')
          .option(v-for='option in baseHair2',
-            :class='{active: option.active, locked: option.locked}')
-            .base.sprite.customize-option(:class="`hair_base_${option.key}_${user.preferences.hair.color}`", @click='option.click')
+            :class='{active: option.active, locked: option.locked}',
+            @click='option.click')
+            .base.sprite.customize-option(:class="`hair_base_${option.key}_${user.preferences.hair.color}`")
            .gem-lock(v-if='option.locked')
              .svg-icon.gem(v-html='icons.gem')
              span 2
@@ -160,22 +172,25 @@ b-modal#avatar-modal(title="", :size='editing ? "lg" : "md"', :hide-header='true
          .head_0.option(@click='set({"preferences.hair.bangs": 0})',
            :class="[{ active: user.preferences.hair.bangs === 0 }, 'hair_bangs_0_' + user.preferences.hair.color]")
          .option(v-for='option in [1, 2, 3, 4]',
-            :class='{active: user.preferences.hair.bangs === option}')
-            .bangs.sprite.customize-option(:class="`hair_bangs_${option}_${user.preferences.hair.color}`", @click='set({"preferences.hair.bangs": option})')
+            :class='{active: user.preferences.hair.bangs === option}',
+            @click='set({"preferences.hair.bangs": option})')
+            .bangs.sprite.customize-option(:class="`hair_bangs_${option}_${user.preferences.hair.color}`")
      #facialhair.row(v-if='activeSubPage === "facialhair"')
        .col-12.customize-options(v-if='editing')
          .head_0.option(@click='set({"preferences.hair.mustache": 0})', :class="[{ active: user.preferences.hair.mustache === 0 }, 'hair_base_0_' + user.preferences.hair.color]")
          .option(v-for='option in baseHair5',
-            :class='{active: option.active, locked: option.locked}')
-            .base.sprite.customize-option(:class="`hair_mustache_${option.key}_${user.preferences.hair.color}`", @click='option.click')
+            :class='{active: option.active, locked: option.locked}',
+            @click='option.click')
+            .base.sprite.customize-option(:class="`hair_mustache_${option.key}_${user.preferences.hair.color}`")
            .gem-lock(v-if='option.locked')
              .svg-icon.gem(v-html='icons.gem')
              span 2
        .col-12.customize-options(v-if='editing')
          .head_0.option(@click='set({"preferences.hair.beard": 0})', :class="[{ active: user.preferences.hair.beard === 0 }, 'hair_base_0_' + user.preferences.hair.color]")
          .option(v-for='option in baseHair6',
-            :class='{active: option.active, locked: option.locked}')
-            .base.sprite.customize-option(:class="`hair_beard_${option.key}_${user.preferences.hair.color}`", @click='option.click')
+            :class='{active: option.active, locked: option.locked}',
+            @click='option.click')
+            .base.sprite.customize-option(:class="`hair_beard_${option.key}_${user.preferences.hair.color}`")
            .gem-lock(v-if='option.locked')
              .svg-icon.gem(v-html='icons.gem')
              span 2
@@ -201,13 +216,16 @@ b-modal#avatar-modal(title="", :size='editing ? "lg" : "md"', :hide-header='true
          strong(v-once) {{ $t('headband') }}
      #glasses.row(v-if='activeSubPage === "glasses"')
        .col-12.customize-options
-          .option(v-for='option in eyewear', :class='{active: option.active}')
-            .sprite.customize-option(:class="`eyewear_special_${option.key}`", @click='option.click')
+          .option(v-for='option in eyewear', 
+            :class='{active: option.active}',
+            @click='option.click')
+            .sprite.customize-option(:class="`eyewear_special_${option.key}`")
      #animal-ears.row(v-if='activeSubPage === "ears"')
        .section.col-12.customize-options
          .option(v-for='option in animalItems("headAccessory")',
-            :class='{active: option.active, locked: option.locked}')
-            .sprite.customize-option(:class="`headAccessory_special_${option.key}`", @click='option.click')
+            :class='{active: option.active, locked: option.locked}',
+            @click='option.click')
+            .sprite.customize-option(:class="`headAccessory_special_${option.key}`")
            .gem-lock(v-if='option.gemLocked')
              .svg-icon.gem(v-html='icons.gem')
              span 2
@@ -222,8 +240,9 @@ b-modal#avatar-modal(title="", :size='editing ? "lg" : "md"', :hide-header='true
      #animal-tails.row(v-if='activeSubPage === "tails"')
        .section.col-12.customize-options
          .option(v-for='option in animalItems("back")',
-            :class='{active: option.active, locked: option.locked}')
-            .sprite.customize-option(:class="`icon_back_special_${option.key}`", @click='option.click')
+            :class='{active: option.active, locked: option.locked}',
+            @click='option.click')
+            .sprite.customize-option(:class="`icon_back_special_${option.key}`")
            .gem-lock(v-if='option.gemLocked')
              .svg-icon.gem(v-html='icons.gem')
              span 2
@@ -237,21 +256,25 @@ b-modal#avatar-modal(title="", :size='editing ? "lg" : "md"', :hide-header='true
            button.btn.btn-secondary.purchase-all(@click='unlock(animalItemsUnlockString("back"))') {{ $t('purchaseAll') }}
      #headband.row(v-if='activeSubPage === "headband"')
        .col-12.customize-options
-          .option(v-for='option in headbands', :class='{active: option.active}')
-            .sprite.customize-option(:class="`headAccessory_special_${option.key}`", @click='option.click')
+          .option(v-for='option in headbands', 
+            :class='{active: option.active}',
+            @click='option.click')
+            .sprite.customize-option(:class="`headAccessory_special_${option.key}`")
      #wheelchairs.row(v-if='activeSubPage === "wheelchair"')
        .col-12.customize-options
          .option(@click='set({"preferences.chair": "none"})', :class='{active: user.preferences.chair === "none"}')
            | None
          .option(v-for='option in chairKeys',
-            :class='{active: user.preferences.chair === option}')
-            .chair.sprite.customize-option(:class="`button_chair_${option}`", @click='set({"preferences.chair": option})')
+            :class='{active: user.preferences.chair === option}',
+            @click='set({"preferences.chair": option})')
+            .chair.sprite.customize-option(:class="`button_chair_${option}`")
      #flowers.row(v-if='activeSubPage === "flower"')
        .col-12.customize-options
          .head_0.option(@click='set({"preferences.hair.flower":0})', :class='{active: user.preferences.hair.flower === 0}')
          .option(v-for='option in [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]',
-            :class='{active: user.preferences.hair.flower === option}')
-            .sprite.customize-option(:class="`hair_flower_${option}`", @click='set({"preferences.hair.flower": option})')
+            :class='{active: user.preferences.hair.flower === option}',
+            @click='set({"preferences.hair.flower": option})')
+            .sprite.customize-option(:class="`hair_flower_${option}`")
      .row(v-if='activeSubPage === "flower"')
        .col-12.customize-options
          // button.customize-option(ng-repeat='item in ::getGearArray("animal")', class='{{::item.key}}',
@@ -41,6 +41,7 @@
      :type="column",
      :key="column",
      :taskListOverride='tasksByType[column]',
+      :showOptions="showOptions"
      v-on:editTask="editTask",
      v-on:loadGroupCompletedTodos="loadGroupCompletedTodos",
      v-on:taskDestroyed="taskDestroyed",
@@ -176,6 +177,9 @@ export default {
      if (!this.group) return false;
      return this.group.leader && this.group.leader._id === this.user._id || this.group.managers && Boolean(this.group.managers[this.user._id]);
    },
+    showOptions () {
+      return this.canCreateTasks;
+    },
  },
  methods: {
    async load () {
@@ -90,12 +90,8 @@
        tbody
          tr(v-for='(hero, index) in heroes')
            td
-              span(v-if='hero.contributor && hero.contributor.admin', :popover="$t('gamemaster')", popover-trigger='mouseenter', popover-placement='right')
-                .label.label-default(:class='userLevelStyle(hero)')
-                  | {{hero.profile.name}}&nbsp;
-                  //- span(v-class='userAdminGlyphiconStyle(hero)')
-              span(v-if='!hero.contributor || !hero.contributor.admin')
-                .label.label-default(v-if='hero.profile', v-class='userLevelStyle(hero)') {{hero.profile.name}}
+              user-link(v-if='hero.contributor && hero.contributor.admin', :user='hero', :popover="$t('gamemaster')", popover-trigger='mouseenter', popover-placement='right')
+              user-link(v-if='!hero.contributor || !hero.contributor.admin', :user='hero')
            td(v-if='user.contributor.admin', @click='populateContributorInput(hero._id, index)').btn-link {{hero._id}}
            td {{hero.contributor.level}}
            td {{hero.contributor.text}}
@@ -120,9 +116,13 @@ import { mountInfo, petInfo } from 'common/script/content/stable';
 import { food, hatchingPotions, special } from 'common/script/content';
 import gear from 'common/script/content/gear';
 import notifications from 'client/mixins/notifications';
+import userLink from '../userLink';

 export default {
  mixins: [notifications, styleHelper],
+  components: {
+    userLink,
+  },
  data () {
    return {
      heroes: [],
@@ -5,7 +5,7 @@ menu-dropdown.item-user(:right="true")
      message-count(v-if='user.inbox.newMessages > 0', :count="user.inbox.newMessages", :top="true")
      .top-menu-icon.svg-icon.user(v-html="icons.user")
  .user-dropdown(slot="dropdown-content")
-    a.dropdown-item.edit-avatar.dropdown-separated(@click='showAvatar()')
+    a.dropdown-item.edit-avatar.dropdown-separated(@click='showAvatar("body", "size")')
      h3 {{ user.profile.name }}
      span.small-text {{ $t('editAvatar') }}
    a.nav-link.dropdown-item.dropdown-separated.d-flex.justify-content-between.align-items-center(@click.prevent='showInbox()')
@@ -1,6 +1,6 @@
 <template lang="pug">
 b-dropdown.create-dropdown(:text="text", no-flip)
-  b-dropdown-form(:disabled='true')
+  b-dropdown-form(:disabled='false', v-on:submit.prevent="onSubmit")
    input.form-control(type='text', v-model='searchTerm')
  b-dropdown-item(v-for="member in memberResults", :key="member._id", @click="selectMember(member)")
    | {{ member.profile.name }}
@@ -165,6 +165,16 @@ const NOTIFICATIONS = {
    label: ($t) => `${$t('achievement')}: ${$t('achievementBackToBasics')}`,
    modalId: 'generic-achievement',
  },
+  ACHIEVEMENT_DUST_DEVIL: {
+    achievement: true,
+    label: ($t) => `${$t('achievement')}: ${$t('achievementDustDevil')}`,
+    modalId: 'generic-achievement',
+  },
+  ACHIEVEMENT_ARID_AUTHORITY: {
+    achievement: true,
+    label: ($t) => `${$t('achievement')}: ${$t('achievementAridAuthority')}`,
+    modalId: 'generic-achievement',
+  },
 };

 export default {
@@ -220,7 +230,7 @@ export default {
      'ULTIMATE_GEAR_ACHIEVEMENT', 'REBIRTH_ACHIEVEMENT', 'GUILD_JOINED_ACHIEVEMENT',
      'CHALLENGE_JOINED_ACHIEVEMENT', 'INVITED_FRIEND_ACHIEVEMENT', 'NEW_CONTRIBUTOR_LEVEL',
      'CRON', 'SCORED_TASK', 'LOGIN_INCENTIVE', 'ACHIEVEMENT_ALL_YOUR_BASE', 'ACHIEVEMENT_BACK_TO_BASICS',
-      'GENERIC_ACHIEVEMENT',
+      'ACHIEVEMENT_DUST_DEVIL', 'ACHIEVEMENT_ARID_AUTHORITY', 'GENERIC_ACHIEVEMENT',
    ].forEach(type => {
      handledNotifications[type] = true;
    });
@@ -595,6 +605,8 @@ export default {
          case 'NEW_CONTRIBUTOR_LEVEL':
          case 'ACHIEVEMENT_ALL_YOUR_BASE':
          case 'ACHIEVEMENT_BACK_TO_BASICS':
+          case 'ACHIEVEMENT_DUST_DEVIL':
+          case 'ACHIEVEMENT_ARID_AUTHORITY':
          case 'GENERIC_ACHIEVEMENT':
            this.showNotificationWithModal(notification);
            break;
@@ -25,10 +25,12 @@
      hr

      .form-horizontal
-        h5 {{ $t('audioTheme') }}
-        select.form-control(v-model='user.preferences.sound',
-          @change='set("sound")')
-          option(v-for='sound in availableAudioThemes', :value='sound') {{ $t(`audioTheme_${sound}`) }}
+        .form-group
+          h5 {{ $t('audioTheme') }}
+          select.form-control(v-model='user.preferences.sound',
+            @change='changeAudioTheme')
+            option(v-for='sound in availableAudioThemes', :value='sound') {{ $t(`audioTheme_${sound}`) }}
+        button.btn.btn-primary.btn-xs(@click='playAudio', v-once) {{ $t('demo') }}
      hr

      .form-horizontal(v-if='hasClass')
@@ -215,6 +217,7 @@ import deleteModal from './deleteModal';
 import { SUPPORTED_SOCIAL_NETWORKS } from '../../../common/script/constants';
 import changeClass from  '../../../common/script/ops/changeClass';
 import notificationsMixin from '../../mixins/notifications';
+import sounds from '../../libs/sounds';
 // @TODO: this needs our window.env fix
 // import { availableLanguages } from '../../../server/libs/i18n';

@@ -267,6 +270,7 @@ export default {
    this.temporaryDisplayName = this.user.profile.name;
    this.emailUpdates.newEmail = this.user.auth.local.email || null;
    this.localAuth.username = this.user.auth.local.username || null;
+    this.soundIndex = 0;
    hello.init({
      facebook: process.env.FACEBOOK_KEY, // eslint-disable-line no-process-env
      google: process.env.GOOGLE_CLIENT_ID, // eslint-disable-line no-process-env
@@ -511,6 +515,14 @@ export default {
        this.usernameUpdates.username = this.user.auth.local.username;
      }
    },
+    changeAudioTheme () {
+      this.soundIndex = 0;
+      this.set('sound');
+    },
+    playAudio () {
+      this.$root.$emit('playSound', sounds[this.soundIndex]);
+      this.soundIndex = (this.soundIndex + 1) % sounds.length;
+    },
  },
 };
 </script>
@@ -300,13 +300,18 @@
  import Avatar from 'client/components/avatar';

  import seasonalShopConfig from 'common/script/libs/shops-seasonal.config';
+  import { drops as dropEggs } from 'common/script/content/eggs';

+  import keys from 'lodash/keys';
+  import reduce from 'lodash/reduce';
  import moment from 'moment';

+  const dropEggKeys = keys(dropEggs);
+
  const hideAmountSelectionForPurchaseTypes = [
    'gear', 'backgrounds', 'mystery_set', 'card',
    'rebirth_orb', 'fortify', 'armoire', 'keys',
-    'debuffPotion',
+    'debuffPotion', 'pets', 'mounts',
  ];

  export default {
@@ -402,6 +407,25 @@
          return;
        }

+        if (this.item.pinType === 'premiumHatchingPotion' || this.item.pinType === 'eggs' && dropEggKeys.indexOf(this.item.key) === -1) {
+          let petsRemaining = 20 - this.selectedAmountToBuy;
+          petsRemaining -= reduce(this.user.items.pets, (sum, petValue, petKey) => {
+            if (petKey.indexOf(this.item.key) !== -1 && petValue > 0) return sum + 1;
+            return sum;
+          }, 0);
+          petsRemaining -= reduce(this.user.items.mounts, (sum, mountValue, mountKey) => {
+            if (mountKey.indexOf(this.item.key) !== -1 && mountValue === true) return sum + 1;
+            return sum;
+          }, 0);
+          if (this.item.pinType === 'premiumHatchingPotion') {
+            petsRemaining -= this.user.items.hatchingPotions[this.item.key] + 2 || 2;
+          } else {
+            petsRemaining -= this.user.items.eggs[this.item.key] || 0;
+          }
+
+          if (petsRemaining < 0 && !confirm(this.$t('purchasePetItemConfirm', {itemText: this.item.text}))) return;
+        }
+
        const shouldConfirmPurchase = this.item.currency === 'gems' || this.item.currency === 'hourglasses';
        if (shouldConfirmPurchase && !this.confirmPurchase(this.item.currency, this.item.value * this.selectedAmountToBuy)) {
          return;
@@ -21,7 +21,7 @@

        h4.title {{ itemContextToSell.itemName }}

-        div(v-if="item.sellWarningNote")
+        div(v-if="item.key === 'Saddle'")
          div.text {{ item.sellWarningNote() }}
          br

@@ -23,7 +23,7 @@
            strong {{ $t('howManyToBuy') }}
          .box
            input(type='number', min='0', step='1', v-model.number='selectedAmountToBuy')
-          span.svg-icon.inline.icon-32(aria-hidden="true", v-html="(priceType  === 'gems') ? icons.gem : icons.gold")
+          span.svg-icon.inline.icon-32(aria-hidden="true", v-html="currencyIcon")
          span.value(:class="priceType") {{ item.value }}

        button.btn.btn-primary(
@@ -44,6 +44,7 @@
    div.clearfix(slot="modal-footer")
      span.balance.float-left {{ $t('yourBalance') }}
      balanceInfo(
+        :withHourglass="priceType === 'hourglasses'",
        :currencyNeeded="priceType",
        :amountNeeded="item.value"
      ).float-right
@@ -202,6 +203,7 @@
  import svgGem from 'assets/svg/gem.svg';
  import svgPin from 'assets/svg/pin.svg';
  import svgExperience from 'assets/svg/experience.svg';
+  import svgHourglasses from 'assets/svg/hourglass.svg';

  import BalanceInfo  from '../balanceInfo.vue';
  import currencyMixin from '../_currencyMixin';
@@ -229,6 +231,7 @@
          gem: svgGem,
          pin: svgPin,
          experience: svgExperience,
+          hourglass: svgHourglasses,
        }),

        isPinned: false,
@@ -258,6 +261,11 @@
          return this.item.notes;
        }
      },
+      currencyIcon () {
+        if (this.priceType === 'gold') return this.icons.gold;
+        if (this.priceType === 'hourglasses') return this.icons.hourglass;
+        return this.icons.gem;
+      },
    },
    methods: {
      onChange ($event) {
@@ -11,6 +11,8 @@
      span.icon
        div(:class="getDropIcon(drop)")
      span.reward-text {{ getDropName(drop) }}
+    div.reward-item.text-center(v-if='item.drop.unlock')
+      span.reward-text {{ item.drop.unlock() }}
    h3.text-center(v-if='getDropsList(item.drop.items, true).length > 0') {{$t('questOwnerRewards')}}
    div.reward-item(v-for='drop in getDropsList(item.drop.items, true)')
      span.icon
@@ -24,7 +24,6 @@

 .row {
  display: table;
-  color: #E1E0E3;
  margin: 0;
 }

@@ -68,9 +68,13 @@
              :emptyItem="false",
              @click="selectItemToBuy(ctx.item)"
            )
-              span(slot="popoverContent", slot-scope="ctx")
+              span(slot="popoverContent", slot-scope="ctx", v-if="category !== 'quests'")
                div
                  h4.popover-content-title {{ ctx.item.text }}
+              span(slot="popoverContent", slot-scope="ctx", v-if="category === 'quests'")
+                div.questPopover
+                  h4.popover-content-title {{ item.text }}
+                  questInfo(:quest="item")

              template(slot="itemBadge", slot-scope="ctx")
                span.badge.badge-pill.badge-item.badge-svg(
@@ -79,6 +83,18 @@
                  @click.prevent.stop="togglePinned(ctx.item)"
                )
                  span.svg-icon.inline.icon-12.color(v-html="icons.pin")
+    buyQuestModal(
+      :item="selectedItemToBuy || {}",
+      :priceType="selectedItemToBuy ? selectedItemToBuy.currency : ''",
+      :withPin="true",
+      @change="resetItemToBuy($event)",
+    )
+      template(slot="item", slot-scope="ctx")
+        item.flat(
+          :item="ctx.item",
+          :itemContentClass="ctx.item.class",
+          :showPopover="false"
+        )
 </template>

 <style lang="scss">
@@ -225,8 +241,10 @@
  import ItemRows from 'client/components/ui/itemRows';
  import toggleSwitch from 'client/components/ui/toggleSwitch';
  import Avatar from 'client/components/avatar';
+  import QuestInfo from '../quests/questInfo.vue';

  import BuyModal from '../buyModal.vue';
+  import BuyQuestModal from '../quests/buyQuestModal.vue';

  import svgPin from 'assets/svg/pin.svg';
  import svgHourglass from 'assets/svg/hourglass.svg';
@@ -250,9 +268,11 @@
      CountBadge,
      ItemRows,
      toggleSwitch,
+      QuestInfo,

      Avatar,
      BuyModal,
+      BuyQuestModal,
    },
    watch: {
      searchText: _throttle(function throttleSearch () {
@@ -274,6 +294,8 @@
        sortItemsBy: ['AZ', 'sortByNumber'],
        selectedSortItemsBy: 'AZ',

+        selectedItemToBuy: null,
+
        hidePinned: false,

        backgroundUpdate: new Date(),
@@ -303,11 +325,11 @@
        let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line

        let normalGroups = _filter(apiCategories, (c) => {
-          return c.identifier === 'mounts' || c.identifier === 'pets';
+          return c.identifier === 'mounts' || c.identifier === 'pets' || c.identifier === 'quests';
        });

        let setGroups = _filter(apiCategories, (c) => {
-          return c.identifier !== 'mounts' && c.identifier !== 'pets';
+          return c.identifier !== 'mounts' && c.identifier !== 'pets' && c.identifier !== 'quests';
        });

        let setCategory = {
@@ -375,7 +397,18 @@
        return _groupBy(entries, 'group');
      },
      selectItemToBuy (item) {
-        this.$root.$emit('buyModal::showItem', item);
+        if (item.purchaseType === 'quests') {
+          this.selectedItemToBuy = item;
+
+          this.$root.$emit('bv::show::modal', 'buy-quest-modal');
+        } else {
+          this.$root.$emit('buyModal::showItem', item);
+        }
+      },
+      resetItemToBuy ($event) {
+        if (!$event) {
+          this.selectedItemToBuy = null;
+        }
      },
    },
    created () {
@@ -111,7 +111,7 @@ div
      background-image: url('~assets/images/auth/seamless_mountains_demo.png');
      background-repeat: repeat-x;
      width: 100%;
-      height: 500px;
+      height: 300px;
      position: absolute;
      z-index: 0;
      bottom: 0;
@@ -25,7 +25,7 @@
    )
    transition(name="quick-add-tip-slide")
      .quick-add-tip.small-text(v-show="quickAddFocused", v-html="$t('addMultipleTip', {taskType: $t(typeLabel)})")
-    clear-completed-todos(v-if="activeFilter.label === 'complete2' && isUser === true")
+    clear-completed-todos(v-if="activeFilter.label === 'complete2' && isUser === true && taskList.length > 0")
    .column-background(
      v-if="isUser === true",
      :class="{'initial-description': initialColumnDescription}",
@@ -45,6 +45,7 @@
        v-for="task in taskList",
        :key="task.id", :task="task",
        :isUser="isUser",
+        :showOptions="showOptions"
        @editTask="editTask",
        @moveTo="moveTo",
        :group='group',
@@ -207,6 +208,7 @@
    position: absolute;
    width: 100%;
    bottom: 32px;
+    margin-left: -8px;

    &.initial-description {
      top: 30%;
@@ -310,6 +312,10 @@ export default {
    selectedTags: {},
    taskListOverride: {},
    group: {},
+    showOptions: {
+      type: Boolean,
+      default: true,
+    },
  }, // @TODO: maybe we should store the group on state?
  data () {
    const icons = Object.freeze({
@@ -481,7 +487,7 @@ export default {
      const newIndexOnServer = originTasks.findIndex(taskId => taskId === taskIdToReplace);

      let newOrder;
-      if (taskToMove.group.id) {
+      if (taskToMove.group.id && !this.isUser) {
        newOrder = await this.$store.dispatch('tasks:moveGroupTask', {
          taskId: taskIdToMove,
          position: newIndexOnServer,
@@ -19,7 +19,7 @@
          .d-flex.justify-content-between
            h3.task-title(:class="{ 'has-notes': task.notes }", v-markdown="task.text")
            menu-dropdown.task-dropdown(
-              v-if="!isRunningYesterdailies",
+              v-if="!isRunningYesterdailies && showOptions",
              :right="task.type === 'reward'",
              ref="taskDropdown",
              v-b-tooltip.hover.top="$t('options')"
@@ -67,9 +67,9 @@
              :checked="item.completed",
              @change="toggleChecklistItem(item)",
              :disabled="castingSpell || !isUser",
-              :id="`checklist-${item.id}`"
+              :id="`checklist-${item.id}-${random}`"
            )
-            label.custom-control-label(v-markdown="item.text", :for="`checklist-${item.id}`")
+            label.custom-control-label(v-markdown="item.text", :for="`checklist-${item.id}-${random}`")
        .icons.small-text.d-flex.align-items-center
          .d-flex.align-items-center(v-if="task.type === 'todo' && task.date", :class="{'due-overdue': isDueOverdue}")
            .svg-icon.calendar(v-html="icons.calendar", v-b-tooltip.hover.bottom="$t('dueDate')")
@@ -543,6 +543,7 @@ import notifications from 'client/mixins/notifications';
 import approvalHeader from './approvalHeader';
 import approvalFooter from './approvalFooter';
 import MenuDropdown from '../ui/customMenuDropdown';
+import uuid from 'uuid';

 export default {
  mixins: [notifications],
@@ -554,9 +555,10 @@ export default {
  directives: {
    markdown: markdownDirective,
  },
-  props: ['task', 'isUser', 'group', 'dueDate'], // @TODO: maybe we should store the group on state?
+  props: ['task', 'isUser', 'group', 'dueDate', 'showOptions'], // @TODO: maybe we should store the group on state?
  data () {
    return {
+      random: uuid.v4(), // used to avoid conflicts between checkboxes ids
      icons: Object.freeze({
        positive: positiveIcon,
        negative: negativeIcon,
@@ -704,7 +706,7 @@ export default {
      this.$emit('taskDestroyed', this.task);
    },
    castEnd (e, task) {
-      this.$root.$emit('castEnd', task, 'task', e);
+      setTimeout(() => this.$root.$emit('castEnd', task, 'task', e), 0);
    },
    async score (direction) {
      if (this.castingSpell) return;
@@ -1,29 +1,29 @@
 <template lang="pug">
-  form(v-if="task", @submit.stop.prevent="submit()", @click="handleClick($event)")
-    b-modal#task-modal(v-bind:no-close-on-esc="showTagsSelect", v-bind:no-close-on-backdrop="showTagsSelect", size="sm", @hidden="onClose()", @show="handleOpen()", @shown="focusInput()")
-      .task-modal-header(slot="modal-header", :class="cssClass('bg')", @click="handleClick($event)")
-        .clearfix
-          h1.float-left {{ title }}
-          .float-right.d-flex.align-items-center
-            span.cancel-task-btn.mr-2(v-once, @click="cancel()") {{ $t('cancel') }}
-            button.btn.btn-secondary(type="submit", v-once) {{ $t('save') }}
-        .form-group
-          label(v-once) {{ `${$t('text')}*` }}
-          input.form-control.title-input(
-            type="text",
-            required, v-model="task.text",
-            ref="inputToFocus",
-            spellcheck="true",
-            :disabled="groupAccessRequiredAndOnPersonalPage || challengeAccessRequired"
-          )
-        .form-group
-          label.d-flex.align-items-center.justify-content-between(v-once)
-            span {{ $t('notes') }}
-            small(v-once)
-              a(target="_blank", href="http://habitica.fandom.com/wiki/Markdown_Cheat_Sheet") {{ $t('markdownHelpLink') }}
+  b-modal#task-modal(v-bind:no-close-on-esc="showTagsSelect", v-bind:no-close-on-backdrop="showTagsSelect", size="sm", @hidden="onClose()", @show="handleOpen()", @shown="focusInput()")
+    .task-modal-header(slot="modal-header", :class="cssClass('bg')", @click="handleClick($event)", v-if="task")
+      .clearfix
+        h1.float-left {{ title }}
+        .float-right.d-flex.align-items-center
+          span.cancel-task-btn.mr-2(v-once, @click="cancel()") {{ $t('cancel') }}
+          button.btn.btn-secondary(@click="submit()", v-once) {{ $t('save') }}
+      .form-group
+        label(v-once) {{ `${$t('text')}*` }}
+        input.form-control.title-input(
+          type="text",
+          required, v-model="task.text",
+          ref="inputToFocus",
+          spellcheck="true",
+          :disabled="groupAccessRequiredAndOnPersonalPage || challengeAccessRequired"
+        )
+      .form-group
+        label.d-flex.align-items-center.justify-content-between(v-once)
+          span {{ $t('notes') }}
+          small(v-once)
+            a(target="_blank", href="http://habitica.fandom.com/wiki/Markdown_Cheat_Sheet") {{ $t('markdownHelpLink') }}

-          textarea.form-control(v-model="task.notes", rows="3")
-      .task-modal-content(@click="handleClick($event)")
+        textarea.form-control(v-model="task.notes", rows="3")
+    .task-modal-content(@click="handleClick($event)")
+      form(v-if="task", @submit.stop.prevent="submit()", @click="handleClick($event)")
        .option.mt-0(v-if="task.type === 'reward'")
          .form-group
            label(v-once) {{ $t('cost') }}
@@ -242,9 +242,9 @@
          .svg-icon.d-inline-b(v-html="icons.destroy")
          span {{ $t('deleteTask') }}

-      .task-modal-footer.d-flex.justify-content-center.align-items-center(slot="modal-footer", @click="handleClick($event)")
-        .cancel-task-btn(v-once, @click="cancel()") {{ $t('cancel') }}
-        button.btn.btn-primary(type="submit", v-once) {{ $t('save') }}
+    .task-modal-footer.d-flex.justify-content-center.align-items-center(slot="modal-footer", @click="handleClick($event)")
+      .cancel-task-btn(v-once, @click="cancel()") {{ $t('cancel') }}
+      button.btn.btn-primary(@click="submit()", v-once) {{ $t('save') }}
 </template>

 <style lang="scss">
--- a/Show More
+++ b/Show More