4.117.0

chore(sprites): compile
feat(content): Zombie color bingo achievements
2026-05-12 11:39:44 -05:00 · 2019-10-22 10:19:17 -05:00 · 2019-10-22 10:19:10 -05:00 · 2019-10-22 10:19:02 -05:00 · 2019-10-18 15:17:29 -05:00 · 2019-10-17 15:24:15 -05:00
2274 changed files with 333325 additions and 35769 deletions
@@ -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

@@ -5,8 +5,12 @@ Habitica [![Build Status](https://travis-ci.org/HabitRPG/habitica.svg?branch=dev

 [Habitica](https://habitica.com) is an open source habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.

-We need more programmers! Your assistance will be greatly appreciated.
+**We need more programmers!** Your assistance will be greatly appreciated. The wiki pages below and the additional pages they link to will tell you how to get started on contributing code and where you can go to seek further help or ask questions:
+* [Guidance for Blacksmiths](http://habitica.fandom.com/wiki/Guidance_for_Blacksmiths) - an introduction to the technologies used and how the software is organized.
+* [Setting up Habitica Locally](http://habitica.fandom.com/wiki/Setting_up_Habitica_Locally) - how to set up a local install of Habitica for development and testing on various platforms.

-For an introduction to the technologies used and how the software is organized, refer to [Guidance for Blacksmiths](http://habitica.fandom.com/wiki/Guidance_for_Blacksmiths).
+Habitica's code is licensed as described at https://github.com/HabitRPG/habitica/blob/develop/LICENSE

-To set up a local install of Habitica for development and testing on various platforms, see [Setting up Habitica Locally](http://habitica.fandom.com/wiki/Setting_up_Habitica_Locally).
+**Found a bug?** Please report it in the [Report a Bug guild](https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) rather than creating an issue (an admin will advise you if a new issue is necessary; usually it is not).
+
+**Have any questions about Habitica or its community?** See the links in the [habitica.com](https://habitica.com) website's Help menu or drop in to [Guilds > Tavern Chat](https://habitica.com/groups/tavern) to ask questions or chat socially!
@@ -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
+  }
+};
@@ -0,0 +1,67 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20190927_kickstarter';
+import { v4 as uuid } from 'uuid';
+
+import { model as User } from '../../../website/server/models/user';
+
+const progressCount = 1000;
+let count = 0;
+
+async function updateUser (user) {
+  count++;
+
+  const set = {};
+  let push = {pinnedItems: {$each: []}};
+
+  set.migration = MIGRATION_NAME;
+  set['achievements.ks2019'] = true;
+
+  // set['items.gear.owned.armor_special_ks2019'] = false;
+  // push.pinnedItems.$each.push({type: 'marketGear', path: 'gear.flat.armor_special_ks2019', _id: uuid()});
+  set['items.gear.owned.head_special_ks2019'] = false;
+  push.pinnedItems.$each.push({type: 'marketGear', path: 'gear.flat.head_special_ks2019', _id: uuid()});
+  // set['items.gear.owned.shield_special_ks2019'] = false;
+  // push.pinnedItems.$each.push({type: 'marketGear', path: 'gear.flat.shield_special_ks2019', _id: uuid()});
+  // set['items.gear.owned.weapon_special_ks2019'] = false;
+  // push.pinnedItems.$each.push({type: 'marketGear', path: 'gear.flat.weapon_special_ks2019', _id: uuid()});
+  set['items.gear.owned.eyewear_special_ks2019'] = false;
+  push.pinnedItems.$each.push({type: 'marketGear', path: 'gear.flat.eyewear_special_ks2019', _id: uuid()});
+  // set['items.pets.Gryphon-Gryphatrice'] = 5;
+  // set['items.mounts.Gryphon-Gryphatrice'] = true;
+
+  return await User.update({_id: user._id}, {$set: set, $push: push}).exec();
+}
+
+module.exports = async function processUsers () {
+  let query = {
+    migration: {$ne: MIGRATION_NAME},
+    'auth.local.lowerCaseUsername': {$in: []},
+  };
+
+  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],
+      };
+    }
+
+    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
+  }
+};
@@ -0,0 +1,82 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20191022_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-Zombie'] > 0
+      && pets['TigerCub-Zombie'] > 0
+      && pets['PandaCub-Zombie'] > 0
+      && pets['LionCub-Zombie'] > 0
+      && pets['Fox-Zombie'] > 0
+      && pets['FlyingPig-Zombie'] > 0
+      && pets['Dragon-Zombie'] > 0
+      && pets['Cactus-Zombie'] > 0
+      && pets['BearCub-Zombie'] > 0) {
+        set['achievements.monsterMagus'] = true;
+      }
+  }
+
+  if (user && user.items && user.items.mounts) {
+    const mounts = user.items.mounts;
+    if (mounts['Wolf-Zombie']
+      && mounts['TigerCub-Zombie']
+      && mounts['PandaCub-Zombie']
+      && mounts['LionCub-Zombie']
+      && mounts['Fox-Zombie']
+      && mounts['FlyingPig-Zombie']
+      && mounts['Dragon-Zombie']
+      && mounts['Cactus-Zombie']
+      && mounts['BearCub-Zombie'] ) {
+        set['achievements.undeadUndertaker'] = 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-10-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,6 +1,6 @@
 /* eslint-disable no-console */
-const MIGRATION_NAME = 'mystery_items_201908';
-const MYSTERY_ITEMS = ['armor_mystery_201908', 'headAccessory_mystery_201908'];
+const MIGRATION_NAME = 'mystery_items_201909';
+const MYSTERY_ITEMS = ['armor_mystery_201909', 'head_mystery_201909'];
 import { model as User } from '../../website/server/models/user';
 import { model as UserNotification } from '../../website/server/models/userNotification';

@@ -1,7 +1,7 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.110.1",
+  "version": "4.117.0",
  "main": "./website/server/index.js",
  "dependencies": {
    "@google-cloud/trace-agent": "^4.0.0",
@@ -31,11 +31,11 @@
    "bcrypt": "^3.0.6",
    "body-parser": "^1.18.3",
    "bootstrap": "^4.1.1",
-    "bootstrap-vue": "^2.0.0-rc.18",
+    "bootstrap-vue": "^2.0.2",
    "compression": "^1.7.4",
    "cookie-session": "^1.3.3",
    "coupon-code": "^0.4.5",
-    "cross-env": "^5.2.0",
+    "cross-env": "^6.0.0",
    "css-loader": "^0.28.11",
    "csv-stringify": "^5.1.0",
    "cwait": "^1.1.1",
@@ -53,8 +53,9 @@
    "gulp.spritesmith": "^6.9.0",
    "habitica-markdown": "^1.3.0",
    "hellojs": "^1.18.1",
+    "helmet": "^3.21.0",
    "html-webpack-plugin": "^3.2.0",
-    "image-size": "^0.7.0",
+    "image-size": "^0.8.0",
    "in-app-purchase": "^1.11.3",
    "intro.js": "^2.9.3",
    "jquery": ">=3.0.0",
@@ -72,7 +73,8 @@
    "ora": "^3.2.0",
    "pageres": "^5.1.0",
    "passport": "^0.4.0",
-    "passport-facebook": "^2.0.0",
+    "passport-facebook": "^3.0.0",
+    "passport-google-oauth2": "^0.2.0",
    "passport-google-oauth20": "1.0.0",
    "paypal-ipn": "3.0.0",
    "paypal-rest-sdk": "^1.8.1",
@@ -86,7 +88,7 @@
    "shelljs": "^0.8.2",
    "short-uuid": "^3.0.0",
    "smartbanner.js": "^1.11.0",
-    "stripe": "^5.9.0",
+    "stripe": "^7.9.0",
    "superagent": "^5.0.2",
    "svg-inline-loader": "^0.8.0",
    "svg-url-loader": "^3.0.0",
@@ -152,9 +154,9 @@
    "chai": "^4.1.2",
    "chai-as-promised": "^7.1.1",
    "chalk": "^2.4.1",
-    "chromedriver": "^76.0.0",
+    "chromedriver": "^77.0.0",
    "connect-history-api-fallback": "^1.1.0",
-    "cross-spawn": "^6.0.5",
+    "cross-spawn": "^7.0.0",
    "eslint": "^4.19.1",
    "eslint-config-habitrpg": "^4.0.0",
    "eslint-friendly-formatter": "^4.0.1",
@@ -163,12 +165,12 @@
    "eslint-plugin-mocha": "^5.0.0",
    "eventsource-polyfill": "^0.9.6",
    "expect.js": "^0.3.1",
-    "http-proxy-middleware": "^0.19.0",
+    "http-proxy-middleware": "^0.20.0",
    "istanbul": "^1.1.0-alpha.1",
    "karma": "^4.0.1",
    "karma-babel-preprocessor": "^7.0.0",
    "karma-chai-plugins": "^0.9.0",
-    "karma-chrome-launcher": "^2.2.0",
+    "karma-chrome-launcher": "^3.0.0",
    "karma-coverage": "^1.1.2",
    "karma-mocha": "^1.3.0",
    "karma-mocha-reporter": "^2.2.5",
@@ -1,27 +1,11 @@
 import {
  translations,
-  localePath,
  langCodes,
+  approvedLanguages,
 } from '../../../../website/server/libs/i18n';
-import fs from 'fs';
-import path from 'path';

 describe('i18n', () => {
-  let listOfLocales = [];
-
-  before((done) => {
-    fs.readdir(localePath, (err, files) => {
-      if (err) return done(err);
-
-      files.forEach((file) => {
-        if (fs.statSync(path.join(localePath, file)).isDirectory() === false) return;
-        listOfLocales.push(file);
-      });
-
-      listOfLocales = listOfLocales.sort();
-      done();
-    });
-  });
+  let listOfLocales = approvedLanguages.sort();

  describe('translations', () => {
    it('includes a translation object for each locale', () => {
@@ -100,14 +100,23 @@ describe('Items Utils', () => {
    });

    it('converts values for mounts paths to numbers', () => {
-      expect(castItemVal('items.mounts.Cactus-Base', '5')).to.equal(5);
-      expect(castItemVal('items.mounts.Aether-Invisible', '5')).to.equal(5);
-      expect(castItemVal('items.mounts.Aether-Invalid', '5')).to.equal(5);
+      expect(castItemVal('items.mounts.Cactus-Base', 'true')).to.equal(true);
+      expect(castItemVal('items.mounts.Aether-Invisible', 'false')).to.equal(false);
+      expect(castItemVal('items.mounts.Aether-Invalid', 'true')).to.equal(true);
+      expect(castItemVal('items.mounts.Aether-Invalid', 'truish')).to.equal(true);
+      expect(castItemVal('items.mounts.Aether-Invalid', 0)).to.equal(false);
    });

    it('converts values for quests paths to numbers', () => {
      expect(castItemVal('items.quests.atom3', '5')).to.equal(5);
      expect(castItemVal('items.quests.invalid', '5')).to.equal(5);
    });
+
+    it('converts values for owned gear', () => {
+      expect(castItemVal('items.gear.owned.shield_warrior_0', 'true')).to.equal(true);
+      expect(castItemVal('items.gear.owned.invalid', 'false')).to.equal(false);
+      expect(castItemVal('items.gear.owned.invalid', 'thruthy')).to.equal(true);
+      expect(castItemVal('items.gear.owned.invalid', 0)).to.equal(false);
+    });
  });
 });
@@ -97,17 +97,17 @@ describe('edit subscription', () => {

    beforeEach(() => {
      subscriptionId = 'subId';
-      stripeListSubscriptionStub = sinon.stub(stripe.customers, 'listSubscriptions')
+      stripeListSubscriptionStub = sinon.stub(stripe.subscriptions, 'list')
        .resolves({
          data: [{id: subscriptionId}],
        });

-      stripeUpdateSubscriptionStub = sinon.stub(stripe.customers, 'updateSubscription').resolves({});
+      stripeUpdateSubscriptionStub = sinon.stub(stripe.subscriptions, 'update').resolves({});
    });

    afterEach(() => {
-      stripe.customers.listSubscriptions.restore();
-      stripe.customers.updateSubscription.restore();
+      stripe.subscriptions.list.restore();
+      stripe.subscriptions.update.restore();
    });

    it('edits a user subscription', async () => {
@@ -118,10 +118,9 @@ describe('edit subscription', () => {
      }, stripe);

      expect(stripeListSubscriptionStub).to.be.calledOnce;
-      expect(stripeListSubscriptionStub).to.be.calledWith(user.purchased.plan.customerId);
+      expect(stripeListSubscriptionStub).to.be.calledWith({customer: user.purchased.plan.customerId});
      expect(stripeUpdateSubscriptionStub).to.be.calledOnce;
      expect(stripeUpdateSubscriptionStub).to.be.calledWith(
-        user.purchased.plan.customerId,
        subscriptionId,
        { card: token }
      );
@@ -135,10 +134,9 @@ describe('edit subscription', () => {
      }, stripe);

      expect(stripeListSubscriptionStub).to.be.calledOnce;
-      expect(stripeListSubscriptionStub).to.be.calledWith(group.purchased.plan.customerId);
+      expect(stripeListSubscriptionStub).to.be.calledWith({customer: group.purchased.plan.customerId});
      expect(stripeUpdateSubscriptionStub).to.be.calledOnce;
      expect(stripeUpdateSubscriptionStub).to.be.calledWith(
-        group.purchased.plan.customerId,
        subscriptionId,
        { card: token }
      );
@@ -21,13 +21,13 @@ describe('POST /group/:groupId/remove-manager', () => {
        type: groupType,
        privacy: 'public',
      },
-      members: 1,
+      members: 2,
    });

    groupToUpdate = group;
    leader = groupLeader;
    nonLeader = members[0];
-    nonManager = members[0];
+    nonManager = members[1];
  });

  it('returns an error when a non group leader tries to add member', async () => {
@@ -71,10 +71,10 @@ describe('POST /group/:groupId/remove-manager', () => {
      type: 'todo',
      requiresApproval: true,
    });
-    await nonLeader.post(`/tasks/${task._id}/assign/${leader._id}`);
-    let memberTasks = await leader.get('/tasks/user');
+    await nonLeader.post(`/tasks/${task._id}/assign/${nonManager._id}`);
+    let memberTasks = await nonManager.get('/tasks/user');
    let syncedTask = find(memberTasks, findAssignedTask);
-    await expect(leader.post(`/tasks/${syncedTask._id}/score/up`))
+    await expect(nonManager.post(`/tasks/${syncedTask._id}/score/up`))
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
@@ -1,11 +1,10 @@
 import {
  createAndPopulateGroup,
-  translate as t,
 } from '../../../../../helpers/api-integration/v3';
 import { find } from 'lodash';

 describe('GET /approvals/group/:groupId', () => {
-  let user, guild, member, task, syncedTask;
+  let user, guild, member, addlMember, task, syncedTask, addlSyncedTask;

  function findAssignedTask (memberTask) {
    return memberTask.group.id === guild._id;
@@ -17,12 +16,13 @@ describe('GET /approvals/group/:groupId', () => {
        name: 'Test Guild',
        type: 'guild',
      },
-      members: 1,
+      members: 2,
    });

    guild = group;
    user = groupLeader;
    member = members[0];
+    addlMember = members[1];

    task = await user.post(`/tasks/group/${guild._id}`, {
      text: 'test todo',
@@ -31,37 +31,46 @@ describe('GET /approvals/group/:groupId', () => {
    });

    await user.post(`/tasks/${task._id}/assign/${member._id}`);
+    await user.post(`/tasks/${task._id}/assign/${addlMember._id}`);

    let memberTasks = await member.get('/tasks/user');
    syncedTask = find(memberTasks, findAssignedTask);

+    let addlMemberTasks = await addlMember.get('/tasks/user');
+    addlSyncedTask = find(addlMemberTasks, findAssignedTask);
+
    try {
      await member.post(`/tasks/${syncedTask._id}/score/up`);
    } catch (e) {
      // eslint-disable-next-line no-empty
    }
+
+    try {
+      await addlMember.post(`/tasks/${addlSyncedTask._id}/score/up`);
+    } catch (e) {
+      // eslint-disable-next-line no-empty
+    }
  });

-  it('errors when user is not the group leader', async () => {
-    await expect(member.get(`/approvals/group/${guild._id}`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('onlyGroupLeaderCanEditTasks'),
-      });
+  it('provides only user\'s own tasks when user is not the group leader', async () => {
+    let approvals = await member.get(`/approvals/group/${guild._id}`);
+    expect(approvals[0]._id).to.equal(syncedTask._id);
+    expect(approvals[1]).to.not.exist;
  });

-  it('gets a list of task that need approval', async () => {
+  it('allows group leaders to get a list of tasks that need approval', async () => {
    let approvals = await user.get(`/approvals/group/${guild._id}`);
    expect(approvals[0]._id).to.equal(syncedTask._id);
+    expect(approvals[1]._id).to.equal(addlSyncedTask._id);
  });

-  it('allows managers to get a list of task that need approval', async () => {
+  it('allows managers to get a list of tasks that need approval', async () => {
    await user.post(`/groups/${guild._id}/add-manager`, {
      managerId: member._id,
    });

    let approvals = await member.get(`/approvals/group/${guild._id}`);
    expect(approvals[0]._id).to.equal(syncedTask._id);
+    expect(approvals[1]._id).to.equal(addlSyncedTask._id);
  });
 });
@@ -93,6 +93,25 @@ describe('POST /tasks/:taskId/assign/:memberId', () => {
    expect(syncedTask).to.exist;
  });

+  it('sends notifications to group leader and managers when a task is claimed', async () => {
+    await user.post(`/groups/${guild._id}/add-manager`, {
+      managerId: member2._id,
+    });
+    await member.post(`/tasks/${task._id}/assign/${member._id}`);
+    await user.sync();
+    await member2.sync();
+    let groupTask = await user.get(`/tasks/group/${guild._id}`);
+
+    expect(user.notifications.length).to.equal(2); // includes Guild Joined achievement
+    expect(user.notifications[1].type).to.equal('GROUP_TASK_CLAIMED');
+    expect(user.notifications[1].data.taskId).to.equal(groupTask[0]._id);
+    expect(user.notifications[1].data.groupId).to.equal(guild._id);
+    expect(member2.notifications.length).to.equal(1);
+    expect(member2.notifications[0].type).to.equal('GROUP_TASK_CLAIMED');
+    expect(member2.notifications[0].data.taskId).to.equal(groupTask[0]._id);
+    expect(member2.notifications[0].data.groupId).to.equal(guild._id);
+  });
+
  it('assigns a task to a user', async () => {
    await user.post(`/tasks/${task._id}/assign/${member._id}`);

@@ -56,11 +56,11 @@ describe('PUT /tasks/:id', () => {
      requiresApproval: true,
    });

-    let memberTasks = await member.get('/tasks/user');
+    let memberTasks = await member2.get('/tasks/user');
    let syncedTask = find(memberTasks, (memberTask) => memberTask.group.taskId === task._id);

    // score up to trigger approval
-    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+    await expect(member2.post(`/tasks/${syncedTask._id}/score/up`))
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
@@ -0,0 +1,33 @@
+import { generateUser } from '../../../../helpers/api-integration/v3';
+
+describe('GET /user/webhook', () => {
+  let user;
+
+  beforeEach(async () => {
+    user = await generateUser();
+
+    await user.post('/user/webhook', {
+      url: 'http://some-url.com',
+      label: 'Label',
+      enabled: true,
+      type: 'taskActivity',
+      options: { created: true, scored: true },
+    });
+    await user.post('/user/webhook', {
+      url: 'http://some-other-url.com',
+      enabled: false,
+    });
+
+    await user.sync();
+  });
+
+  it('returns users webhooks', async () => {
+    let response = await user.get('/user/webhook');
+
+    expect(response).to.eql(user.webhooks.map(w => {
+      w.createdAt = w.createdAt.toISOString();
+      w.updatedAt = w.updatedAt.toISOString();
+      return w;
+    }));
+  });
+});
@@ -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 () => {
@@ -78,9 +78,9 @@ context('avatar.vue', () => {
      };
    });

-    it('defaults to 28px', () => {
+    it('defaults to 27px', () => {
      vm.avatarOnly = true;
-      expect(vm.paddingTop).to.equal('28px');
+      expect(vm.paddingTop).to.equal('27px');
    });

    it('is 24px if user has a pet', () => {
@@ -109,12 +109,13 @@ describe('getTaskClasses getter', () => {
    });
  });

-  xit('returns good todo classes', () => {
+  it('returns good todo classes', () => {
    const task = {type: 'todo', value: 2};
    expect(getTaskClasses(task, 'control')).to.deep.equal({
      bg: 'task-good-control-bg',
      checkbox: 'task-good-control-checkbox',
-      inner: 'task-good-control-inner-daily-todo`',
+      inner: 'task-good-control-inner-daily-todo',
+      icon: 'task-good-control-icon',
    });
  });

@@ -140,4 +141,14 @@ describe('getTaskClasses getter', () => {
      },
    });
  });
+
+  it('returns noninteractive classes and padlock icons for group board tasks', () => {
+    const task = {type: 'todo', value: 2, group: {id: 'group-id'}};
+    expect(getTaskClasses(task, 'control')).to.deep.equal({
+      bg: 'task-good-control-bg-noninteractive',
+      checkbox: 'task-good-control-checkbox',
+      inner: 'task-good-control-inner-daily-todo',
+      icon: 'task-good-control-icon',
+    });
+  });
 });
@@ -49,6 +49,15 @@ describe('shared.ops.buyQuestGems', () => {

      buyQuest(user, {params: {key}});

+      expect(user.items.quests[key]).to.equal(1);
+      expect(pinnedGearUtils.removeItemByPath.notCalled).to.equal(true);
+    });
+    it('if a user\'s count of a quest scroll is negative, it will be reset to 0 before incrementing when they buy a new one.', () => {
+      let key = 'dustbunnies';
+      user.items.quests[key] = -1;
+
+      buyQuest(user, {params: {key}});
+
      expect(user.items.quests[key]).to.equal(1);
      expect(pinnedGearUtils.removeItemByPath.notCalled).to.equal(true);
    });
@@ -1,7 +1,7 @@
 import {
  generateUser,
 } from '../../../helpers/common.helper';
-import {BuyQuestWithGoldOperation} from '../../../../website/common/script/ops/buy/buyQuest';
+import {BuyQuestWithGoldOperation} from '../../../../website/common/script/ops/buy/buyQuestGold';
 import {
  BadRequest,
  NotAuthorized,
@@ -43,6 +43,18 @@ describe('shared.ops.buyQuest', () => {
    expect(analytics.track).to.be.calledOnce;
  });

+  it('if a user\'s count of a quest scroll is negative, it will be reset to 0 before incrementing when they buy a new one.', () => {
+    user.stats.gp = 205;
+    let key = 'dilatoryDistress1';
+    user.items.quests[key] = -1;
+    buyQuest(user, {
+      params: {key},
+    }, analytics);
+    expect(user.items.quests[key]).to.equal(1);
+    expect(user.stats.gp).to.equal(5);
+    expect(analytics.track).to.be.calledOnce;
+  });
+
  it('buys a Quest scroll with the right quantity if a string is passed for quantity', () => {
    user.stats.gp = 1000;
    buyQuest(user, {
@@ -9,11 +9,18 @@ import {
  generateUser,
 } from '../../../helpers/common.helper';
 import errorMessage from '../../../../website/common/script/libs/errorMessage';
+import {BuyHourglassMountOperation} from '../../../../website/common/script/ops/buy/buyMount';

 describe('common.ops.hourglassPurchase', () => {
  let user;
  let analytics = {track () {}};

+  function buyMount (_user, _req, _analytics) {
+    const buyOp = new BuyHourglassMountOperation(_user, _req, _analytics);
+
+    return buyOp.purchase();
+  }
+
  beforeEach(() => {
    user = generateUser();
    sinon.stub(analytics, 'track');
@@ -66,7 +73,7 @@ describe('common.ops.hourglassPurchase', () => {

    it('does not grant to mounts without Mystic Hourglasses', (done) => {
      try {
-        hourglassPurchase(user, {params: {type: 'mounts', key: 'MantisShrimp-Base'}});
+        buyMount(user, {params: {key: 'MantisShrimp-Base'}});
      } catch (err) {
        expect(err).to.be.an.instanceof(NotAuthorized);
        expect(err.message).to.eql(i18n.t('notEnoughHourglasses'));
@@ -90,7 +97,7 @@ describe('common.ops.hourglassPurchase', () => {
      user.purchased.plan.consecutive.trinkets = 1;

      try {
-        hourglassPurchase(user, {params: {type: 'mounts', key: 'Orca-Base'}});
+        buyMount(user, {params: {key: 'Orca-Base'}});
      } catch (err) {
        expect(err).to.be.an.instanceof(NotAuthorized);
        expect(err.message).to.eql(i18n.t('notAllowedHourglass'));
@@ -120,7 +127,7 @@ describe('common.ops.hourglassPurchase', () => {
      };

      try {
-        hourglassPurchase(user, {params: {type: 'mounts', key: 'MantisShrimp-Base'}});
+        buyMount(user, {params: {key: 'MantisShrimp-Base'}});
      } catch (err) {
        expect(err).to.be.an.instanceof(NotAuthorized);
        expect(err.message).to.eql(i18n.t('mountsAlreadyOwned'));
@@ -144,7 +151,7 @@ describe('common.ops.hourglassPurchase', () => {
    it('buys a mount', () => {
      user.purchased.plan.consecutive.trinkets = 2;

-      let [, message] = hourglassPurchase(user, {params: {type: 'mounts', key: 'MantisShrimp-Base'}});
+      let [, message] = buyMount(user, {params: {key: 'MantisShrimp-Base'}});
      expect(message).to.eql(i18n.t('hourglassPurchase'));
      expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
      expect(user.items.mounts).to.eql({'MantisShrimp-Base': true});
@@ -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);
+      });
    });
  });
 });
@@ -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 } });

@@ -161,7 +161,7 @@ div
    overflow-y: scroll !important;
  }

-  .modal-backdrop.show {
+  .modal-backdrop {
    opacity: .9 !important;
    background-color: $purple-100 !important;
  }
@@ -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>
@@ -96,6 +96,52 @@
  background: url("~assets/images/BackerOnly-Pet-CerberusPup.gif") no-repeat;
 }

+.broad_armor_special_ks2019, .slim_armor_special_ks2019, .eyewear_special_ks2019, .head_special_ks2019, .shield_special_ks2019 {
+  width: 117px;
+  height: 120px;
+}
+
+.broad_armor_special_ks2019, .slim_armor_special_ks2019 {
+  background: url("~assets/images/BackerOnly-Equip-MythicGryphonArmor.gif") no-repeat;
+}
+
+.eyewear_special_ks2019 {
+  background: url("~assets/images/BackerOnly-Equip-MythicGryphonVisor.gif") no-repeat;
+}
+
+.head_special_ks2019 {
+  background: url("~assets/images/BackerOnly-Equip-MythicGryphonHelm.gif") no-repeat;
+}
+
+.shield_special_ks2019 {
+  background: url("~assets/images/BackerOnly-Equip-MythicGryphonShield.gif") no-repeat;
+}
+
+.weapon_special_ks2019 {
+  background: url("~assets/images/BackerOnly-Equip-MythicGryphonGlaive.gif") no-repeat;
+  width: 120px;
+  height: 120px;
+}
+
+.Pet-Gryphon-Gryphatrice {
+  background: url("~assets/images/BackerOnly-Pet-Gryphatrice.gif") no-repeat;
+  width: 81px;
+  height: 99px;
+}
+
+.Mount_Head_Gryphon-Gryphatrice, .Mount_Body_Gryphon-Gryphatrice {
+  width: 135px;
+  height: 135px;
+}
+
+.Mount_Head_Gryphon-Gryphatrice {
+  background: url("~assets/images/BackerOnly-Mount-Head-Gryphatrice.gif") no-repeat;
+}
+
+.Mount_Body_Gryphon-Gryphatrice {
+  background: url("~assets/images/BackerOnly-Mount-Body-Gryphatrice.gif") no-repeat;
+}
+
 /* FIXME figure out how to handle customize menu!!
 .customize-menu .f_head_0 {
  width: 60px;
@@ -1,18 +1,96 @@
-.promo_armoire_backgrounds_201909 {
+.promo_armoire_backgrounds_201910 {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px 0px;
+  background-position: 0px -576px;
+  width: 423px;
+  height: 147px;
+}
+.promo_costume_achievement {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -376px -190px;
+  width: 144px;
+  height: 156px;
+}
+.promo_desert_pet_achievements {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -373px -395px;
+  width: 204px;
+  height: 102px;
+}
+.promo_fall_festival_2018 {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: 0px -395px;
+  width: 372px;
+  height: 180px;
+}
+.promo_fall_festival_2019 {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -376px 0px;
+  width: 360px;
+  height: 189px;
+}
+.promo_fall_skins {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: 0px -187px;
+  width: 336px;
+  height: 207px;
+}
+.customize-option.promo_fall_skins {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -25px -202px;
+  width: 60px;
+  height: 60px;
+}
+.promo_mystery_201909 {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -737px -444px;
+  width: 282px;
+  height: 147px;
+}
+.promo_seasonal_shop_fall {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -521px -190px;
+  width: 162px;
+  height: 138px;
+}
+.promo_shadow_spooky_potions {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -737px -148px;
+  width: 423px;
+  height: 147px;
+}
+.promo_spooky_sparkles {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -737px -296px;
  width: 423px;
  height: 147px;
 }
 .promo_take_this {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -211px -148px;
+  background-position: -1020px -444px;
  width: 96px;
  height: 69px;
 }
-.scene_medal {
+.promo_witchy_familiars {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -148px;
-  width: 210px;
-  height: 210px;
+  background-position: -737px 0px;
+  width: 423px;
+  height: 147px;
+}
+.promo_zombie_achievements {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -930px -592px;
+  width: 204px;
+  height: 102px;
+}
+.scene_quest_shop {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: 0px 0px;
+  width: 375px;
+  height: 186px;
+}
+.scene_strength {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -737px -592px;
+  width: 192px;
+  height: 129px;
 }
@@ -1,396 +1,402 @@
+.npc_justin {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1844px -856px;
+  width: 84px;
+  height: 120px;
+}
+.npc_matt {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -214px -1535px;
+  width: 195px;
+  height: 138px;
+}
+.background_dysheartener {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: 0px 0px;
+  width: 306px;
+  height: 202px;
+}
+.banner_flair_dysheartener {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1929px -856px;
+  width: 69px;
+  height: 18px;
+}
+.phobia_dysheartener {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1187px -880px;
+  width: 201px;
+  height: 195px;
+}
+.quest_alligator {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1627px -1079px;
+  width: 201px;
+  height: 213px;
+}
+.quest_armadillo {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -220px -435px;
+  width: 219px;
+  height: 219px;
+}
+.quest_atom1 {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -885px -1315px;
+  width: 250px;
+  height: 150px;
+}
+.quest_atom2 {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1387px -1315px;
+  width: 207px;
+  height: 138px;
+}
+.quest_atom3 {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -747px -440px;
+  width: 216px;
+  height: 180px;
+}
+.quest_axolotl {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: 0px -655px;
+  width: 219px;
+  height: 219px;
+}
+.quest_badger {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -220px -655px;
+  width: 219px;
+  height: 219px;
+}
+.quest_basilist {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -191px -1710px;
+  width: 189px;
+  height: 141px;
+}
+.quest_beetle {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1627px -1293px;
+  width: 204px;
+  height: 201px;
+}
+.quest_bronze {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -967px 0px;
+  width: 219px;
+  height: 219px;
+}
 .quest_bunny {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1543px;
+  background-position: -967px -660px;
  width: 210px;
  height: 186px;
 }
 .quest_butterfly {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px -440px;
+  background-position: -967px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_cheetah {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -892px;
+  background-position: 0px -875px;
  width: 219px;
  height: 219px;
 }
 .quest_cow {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1762px -175px;
+  background-position: -1844px 0px;
  width: 174px;
  height: 213px;
 }
 .quest_dilatory {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -232px;
+  background-position: -440px -875px;
  width: 219px;
  height: 219px;
 }
 .quest_dilatoryDistress1 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1332px;
+  background-position: -1627px -868px;
  width: 210px;
  height: 210px;
 }
 .quest_dilatoryDistress2 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1762px -932px;
+  background-position: -1844px -573px;
  width: 150px;
  height: 150px;
 }
 .quest_dilatoryDistress3 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -220px;
+  background-position: -1187px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_dilatory_derby {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -232px;
+  background-position: -220px -875px;
  width: 219px;
  height: 219px;
 }
 .quest_dolphin {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -452px;
+  background-position: -1187px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_dustbunnies {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -452px;
+  background-position: -1187px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_egg {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1762px -573px;
+  background-position: -1844px -214px;
  width: 165px;
  height: 207px;
 }
 .quest_evilsanta {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1762px -1385px;
+  background-position: -1844px -724px;
  width: 118px;
  height: 131px;
 }
 .quest_evilsanta2 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px 0px;
+  background-position: -220px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_falcon {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -220px;
+  background-position: -307px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_ferret {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -440px;
+  background-position: -660px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_frog {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1540px 0px;
+  background-position: -440px -1315px;
  width: 221px;
  height: 213px;
 }
 .quest_ghost_stag {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -672px;
+  background-position: -1100px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_goldenknight1 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -672px;
+  background-position: -440px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_goldenknight2 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1305px -1332px;
+  background-position: -1136px -1315px;
  width: 250px;
  height: 150px;
 }
 .quest_goldenknight3 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px 0px;
+  background-position: 0px -203px;
  width: 219px;
  height: 231px;
 }
 .quest_gryphon {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1088px -1332px;
+  background-position: -527px -220px;
  width: 216px;
  height: 177px;
 }
 .quest_guineapig {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -220px;
+  background-position: -1407px -880px;
  width: 219px;
  height: 219px;
 }
 .quest_harpy {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -440px;
+  background-position: 0px -1315px;
  width: 219px;
  height: 219px;
 }
 .quest_hedgehog {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -211px -1332px;
+  background-position: -1407px -1100px;
  width: 219px;
  height: 186px;
 }
 .quest_hippo {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -892px;
+  background-position: -1407px -660px;
  width: 219px;
  height: 219px;
 }
 .quest_horse {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px 0px;
+  background-position: -1407px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_kangaroo {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -892px;
+  background-position: -1407px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_kraken {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -871px -1332px;
+  background-position: -307px -220px;
  width: 216px;
  height: 177px;
 }
 .quest_lostMasterclasser1 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -892px;
+  background-position: -880px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_lostMasterclasser2 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -892px;
+  background-position: -1187px -660px;
  width: 219px;
  height: 219px;
 }
 .quest_lostMasterclasser3 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px 0px;
+  background-position: -660px -875px;
  width: 219px;
  height: 219px;
 }
 .quest_mayhemMistiflying1 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1762px -1083px;
+  background-position: -1844px -422px;
  width: 150px;
  height: 150px;
 }
 .quest_mayhemMistiflying2 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -672px;
+  background-position: -967px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_mayhemMistiflying3 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px -660px;
+  background-position: -660px -655px;
  width: 219px;
  height: 219px;
 }
 .quest_monkey {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px -880px;
+  background-position: -747px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_moon1 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1540px -431px;
+  background-position: -1627px -217px;
  width: 216px;
  height: 216px;
 }
 .quest_moon2 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -1112px;
+  background-position: -440px -435px;
  width: 219px;
  height: 219px;
 }
 .quest_moon3 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -1112px;
+  background-position: 0px -435px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone1 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -1112px;
+  background-position: -527px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone2 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -1112px;
+  background-position: -1407px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone3 {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -1112px;
+  background-position: -220px -1315px;
  width: 219px;
  height: 219px;
 }
 .quest_nudibranch {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1540px -214px;
+  background-position: -1627px -651px;
  width: 216px;
  height: 216px;
 }
 .quest_octopus {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -431px -1332px;
+  background-position: -662px -1315px;
  width: 222px;
  height: 177px;
 }
 .quest_owl {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1112px;
+  background-position: 0px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_peacock {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1540px -648px;
+  background-position: -1627px -434px;
  width: 216px;
  height: 216px;
 }
 .quest_penguin {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1762px -389px;
+  background-position: 0px -1710px;
  width: 190px;
  height: 183px;
 }
 .quest_pterodactyl {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -672px;
+  background-position: -880px -875px;
  width: 219px;
  height: 219px;
 }
 .quest_rat {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -452px;
+  background-position: -440px -655px;
  width: 219px;
  height: 219px;
 }
 .quest_robot {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -232px;
+  background-position: -747px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_rock {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1540px -865px;
+  background-position: -1627px 0px;
  width: 216px;
  height: 216px;
 }
 .quest_rooster {
  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1762px 0px;
+  background-position: 0px -1535px;
  width: 213px;
  height: 174px;
 }
-.quest_sabretooth {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_seaserpent {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -660px;
-  width: 219px;
-  height: 219px;
-}
-.quest_sheep {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px -220px;
-  width: 219px;
-  height: 219px;
-}
-.quest_silver {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -892px;
-  width: 219px;
-  height: 219px;
-}
-.quest_slime {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px 0px;
-  width: 219px;
-  height: 219px;
-}
-.quest_sloth {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -672px;
-  width: 219px;
-  height: 219px;
-}
-.quest_snail {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1540px -1082px;
-  width: 219px;
-  height: 213px;
-}
-.quest_snake {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -654px -1332px;
-  width: 216px;
-  height: 177px;
-}
-.quest_spider {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -211px -1543px;
-  width: 250px;
-  height: 150px;
-}
-.quest_squirrel {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -452px;
-  width: 219px;
-  height: 219px;
-}
-.quest_stoikalmCalamity1 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1762px -781px;
-  width: 150px;
-  height: 150px;
-}
-.quest_stoikalmCalamity2 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px 0px;
-  width: 219px;
-  height: 219px;
-}
-.quest_stoikalmCalamity3 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px 0px;
-  width: 219px;
-  height: 219px;
-}
-.quest_taskwoodsTerror1 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1762px -1234px;
-  width: 150px;
-  height: 150px;
-}
@@ -0,0 +1,708 @@
+.Pet-Turtle-Red {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -82px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -410px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-Skeleton {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -164px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-White {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -82px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Base {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -164px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-CottonCandyBlue {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -246px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-CottonCandyPink {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -246px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Desert {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Golden {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -82px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Red {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -164px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -246px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Skeleton {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -328px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-White {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -328px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -328px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Velociraptor-Base {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Velociraptor-CottonCandyBlue {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -82px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Velociraptor-CottonCandyPink {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -164px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Velociraptor-Desert {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -246px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Velociraptor-Golden {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -328px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Velociraptor-Red {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -410px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Velociraptor-Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -410px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Velociraptor-Skeleton {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -410px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Velociraptor-White {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -410px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Velociraptor-Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -492px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Base {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -492px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-CottonCandyBlue {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -492px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-CottonCandyPink {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -492px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Desert {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Golden {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -82px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Red {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -164px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -246px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Skeleton {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -328px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-White {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -410px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -492px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Aquatic {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -574px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Base {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -574px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Bronze {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -574px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Celestial {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -574px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-CottonCandyBlue {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -574px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-CottonCandyPink {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Cupid {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -82px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Desert {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -164px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Ember {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -246px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Fairy {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -328px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Floral {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -410px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Frost {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -492px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Ghost {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -574px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Glass {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -656px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Glow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -656px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Golden {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -656px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Holly {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -656px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-IcySnow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -656px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Peppermint {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -656px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Rainbow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Red {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -82px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-RoseQuartz {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -164px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-RoyalPurple {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -246px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -328px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shadow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shimmer {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -492px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Silver {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -574px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Skeleton {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -656px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Spooky {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-StarryNight {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Sunshine {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Thunderstorm {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veggie {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veteran {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Watery {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-White {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -82px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Base {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -164px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-CottonCandyBlue {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -246px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-CottonCandyPink {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -328px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Desert {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -410px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Golden {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -492px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Red {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -574px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -656px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Skeleton {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-White {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -820px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -820px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet_HatchingPotion_Aquatic {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -820px -269px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Base {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -690px -800px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Bronze {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -820px -338px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Celestial {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -820px -407px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_CottonCandyBlue {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -820px -476px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_CottonCandyPink {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -820px -545px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Cupid {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -820px -614px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Desert {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -820px -683px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Ember {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -800px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Fairy {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -69px -800px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Floral {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -138px -800px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Frost {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -207px -800px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Ghost {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -276px -800px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Glass {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -345px -800px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Glow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -414px -800px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Golden {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -483px -800px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Holly {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -552px -800px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_IcySnow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -621px -800px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Peppermint {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -820px -200px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Purple {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -759px -800px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Rainbow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -828px -800px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Red {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -902px 0px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_RoseQuartz {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -902px -69px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_RoyalPurple {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -902px -138px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -902px -207px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shadow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -902px -276px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shimmer {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -902px -345px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Silver {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -902px -414px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Skeleton {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -902px -483px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Spooky {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -902px -552px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_StarryNight {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -902px -621px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Sunshine {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -902px -690px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Thunderstorm {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -902px -759px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Watery {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -869px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_White {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -69px -869px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -138px -869px;
+  width: 68px;
+  height: 68px;
+}
@@ -74,10 +74,10 @@
 }

 .btn-success {
-  background: $green-10;
+  background: $green-100;

  &:disabled {
-    background: $green-10;
+    background: $green-100;
  }

  &:hover:not(:disabled), &:active, &.active {
--- a/Show More
+++ b/Show More