4.115.1

This reverts commit 70b6501135.

Dockerfile

@@ -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
 

README.md

@@ -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!

migrations/archive/2019/20190917_pet_color_achievements.js

@@ -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
+  }
+};

migrations/users/mystery-items.js

@@ -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';
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.109.1",
+  "version": "4.115.1",
   "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",

test/api/unit/libs/payments/stripe/edit-subscription.test.js

@@ -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 }
       );

test/api/v3/integration/groups/POST-group_remove_manager.test.js

@@ -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',

test/api/v3/integration/tasks/groups/GET-approvals_group_id.test.js

@@ -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);
   });
 });

test/api/v3/integration/tasks/groups/POST-tasks_group_id_assign_user_id.test.js

@@ -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}`);
 

test/api/v3/integration/tasks/groups/PUT-group_task_id.test.js

@@ -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',

test/api/v3/integration/webhook/GET-user-webhook.test.js

@@ -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;
+    }));
+  });
+});

test/api/v4/inbox/GET-inbox-conversations.test.js

@@ -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 () => {

test/client/unit/specs/store/getters/tasks/getTaskClasses.js

@@ -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',
+    });
+  });
 });

test/common/ops/buy/hourglassPurchase.js

@@ -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});

test/common/ops/feed.js

@@ -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;

test/common/ops/hatch.js

@@ -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);
+      });
     });
   });
 });

test/common/ops/rebirth.js

@@ -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);
   });
 

test/common/ops/sell.js

@@ -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 } });
 

website/client/app.vue

@@ -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>

website/client/assets/css/sprites/spritesmith-largeSprites-0.css

@@ -1,42 +1,72 @@
-.promo_armoire_backgrounds_201908 {
+.promo_armoire_backgrounds_201909 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -223px;
+  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 -371px;
+  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_mystery_201909 {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -361px -343px;
+  width: 282px;
+  height: 147px;
+}
+.promo_rocking_reptiles_bundle {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: 0px -681px;
   width: 420px;
   height: 147px;
 }
-.promo_mystery_201908 {
+.promo_seasonal_shop_fall {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -659px 0px;
-  width: 282px;
+  background-position: -653px -392px;
+  width: 162px;
+  height: 138px;
+}
+.promo_shadow_spooky_potions {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -424px -533px;
+  width: 423px;
   height: 147px;
 }
 .promo_take_this {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -840px -148px;
+  background-position: -864px -181px;
   width: 96px;
   height: 69px;
 }
-.promo_unconventional_armor {
-  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -659px -148px;
-  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_families {
+.scene_medal {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -313px 0px;
-  width: 345px;
-  height: 195px;
+  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;
 }

website/client/assets/css/sprites/spritesmith-main-12.css

@@ -1,8 +1,74 @@
-.quest_TEMPLATE_FOR_MISSING_IMAGE {
+.quest_armadillo {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -502px -1543px;
-  width: 221px;
-  height: 39px;
+  background-position: -220px 0px;
+  width: 219px;
+  height: 219px;
+}
+.quest_atom1 {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1333px -1332px;
+  width: 250px;
+  height: 150px;
+}
+.quest_atom2 {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -642px -1534px;
+  width: 207px;
+  height: 138px;
+}
+.quest_atom3 {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -211px -1534px;
+  width: 216px;
+  height: 180px;
+}
+.quest_axolotl {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -220px -232px;
+  width: 219px;
+  height: 219px;
+}
+.quest_badger {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -440px -232px;
+  width: 219px;
+  height: 219px;
+}
+.quest_basilist {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -191px -1721px;
+  width: 189px;
+  height: 141px;
+}
+.quest_beetle {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: 0px -1332px;
+  width: 204px;
+  height: 201px;
+}
+.quest_bronze {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: 0px -452px;
+  width: 219px;
+  height: 219px;
+}
+.quest_bunny {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: 0px -1534px;
+  width: 210px;
+  height: 186px;
+}
+.quest_butterfly {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -440px -452px;
+  width: 219px;
+  height: 219px;
+}
+.quest_cheetah {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -660px -452px;
+  width: 219px;
+  height: 219px;
 }
 .quest_cow {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
@@ -12,43 +78,43 @@
 }
 .quest_dilatory {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -892px;
+  background-position: -880px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_dilatoryDistress1 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1332px;
+  background-position: -1540px -1082px;
   width: 210px;
   height: 210px;
 }
 .quest_dilatoryDistress2 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1762px -875px;
+  background-position: -1762px -422px;
   width: 150px;
   height: 150px;
 }
 .quest_dilatoryDistress3 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -232px;
+  background-position: -440px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_dilatory_derby {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px 0px;
+  background-position: -880px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_dolphin {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -232px;
+  background-position: -660px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_dustbunnies {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px 0px;
+  background-position: -880px -672px;
   width: 219px;
   height: 219px;
 }
@@ -60,25 +126,25 @@
 }
 .quest_evilsanta {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1762px -1026px;
+  background-position: -1762px -724px;
   width: 118px;
   height: 131px;
 }
 .quest_evilsanta2 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -452px;
+  background-position: -1100px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_falcon {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -452px;
+  background-position: -1100px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_ferret {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -452px;
+  background-position: 0px -892px;
   width: 219px;
   height: 219px;
 }
@@ -90,19 +156,19 @@
 }
 .quest_ghost_stag {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -220px;
+  background-position: -440px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight1 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -440px;
+  background-position: -660px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight2 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -251px -1543px;
+  background-position: -1082px -1332px;
   width: 250px;
   height: 150px;
 }
@@ -114,67 +180,67 @@
 }
 .quest_gryphon {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1305px -1332px;
+  background-position: -865px -1332px;
   width: 216px;
   height: 177px;
 }
 .quest_guineapig {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -672px;
+  background-position: -1320px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_harpy {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -672px;
+  background-position: -1320px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_hedgehog {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -211px -1332px;
+  background-position: -205px -1332px;
   width: 219px;
   height: 186px;
 }
 .quest_hippo {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px 0px;
+  background-position: -1320px -880px;
   width: 219px;
   height: 219px;
 }
 .quest_horse {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -220px;
+  background-position: 0px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_kangaroo {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -440px;
+  background-position: -220px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_kraken {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -871px -1332px;
+  background-position: -648px -1332px;
   width: 216px;
   height: 177px;
 }
 .quest_lostMasterclasser1 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -660px;
+  background-position: -660px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_lostMasterclasser2 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -892px;
+  background-position: -880px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_lostMasterclasser3 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px 0px;
+  background-position: -1100px -1112px;
   width: 219px;
   height: 219px;
 }
@@ -186,73 +252,73 @@
 }
 .quest_mayhemMistiflying2 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -892px;
+  background-position: -1320px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_mayhemMistiflying3 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -892px;
+  background-position: -440px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_monkey {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -892px;
+  background-position: -1320px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_moon1 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1540px -1082px;
+  background-position: -1540px -431px;
   width: 216px;
   height: 216px;
 }
 .quest_moon2 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px -220px;
+  background-position: -1320px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_moon3 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px -440px;
+  background-position: -880px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone1 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px -660px;
+  background-position: -220px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone2 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px -880px;
+  background-position: -1100px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone3 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1112px;
+  background-position: -1100px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_nudibranch {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1540px -648px;
+  background-position: -1540px -865px;
   width: 216px;
   height: 216px;
 }
 .quest_octopus {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -431px -1332px;
+  background-position: -425px -1332px;
   width: 222px;
   height: 177px;
 }
 .quest_owl {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -1112px;
+  background-position: -220px -672px;
   width: 219px;
   height: 219px;
 }
@@ -264,139 +330,67 @@
 }
 .quest_penguin {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1694px;
+  background-position: 0px -1721px;
   width: 190px;
   height: 183px;
 }
 .quest_pterodactyl {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -1112px;
+  background-position: 0px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_rat {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -1112px;
+  background-position: -880px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_robot {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -1112px;
+  background-position: -220px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_rock {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1540px -431px;
+  background-position: -1540px -648px;
   width: 216px;
   height: 216px;
 }
 .quest_rooster {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1522px -1332px;
+  background-position: -428px -1534px;
   width: 213px;
   height: 174px;
 }
 .quest_sabretooth {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -1112px;
+  background-position: -660px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_seaserpent {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -672px;
+  background-position: -660px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_sheep {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px 0px;
+  background-position: 0px -232px;
   width: 219px;
   height: 219px;
 }
 .quest_silver {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -220px;
+  background-position: -440px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_slime {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px 0px;
+  background-position: -1100px -892px;
   width: 219px;
   height: 219px;
 }
-.quest_sloth {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -672px;
-  width: 219px;
-  height: 219px;
-}
-.quest_snail {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px -1112px;
-  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: 0px -1543px;
-  width: 250px;
-  height: 150px;
-}
-.quest_squirrel {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -892px;
-  width: 219px;
-  height: 219px;
-}
-.quest_stoikalmCalamity1 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1762px -422px;
-  width: 150px;
-  height: 150px;
-}
-.quest_stoikalmCalamity2 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -672px;
-  width: 219px;
-  height: 219px;
-}
-.quest_stoikalmCalamity3 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -452px;
-  width: 219px;
-  height: 219px;
-}
-.quest_taskwoodsTerror1 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1762px -724px;
-  width: 150px;
-  height: 150px;
-}
-.quest_taskwoodsTerror2 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1540px -865px;
-  width: 216px;
-  height: 216px;
-}
-.quest_taskwoodsTerror3 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -232px;
-  width: 219px;
-  height: 219px;
-}
-.quest_treeling {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1088px -1332px;
-  width: 216px;
-  height: 177px;
-}

website/client/assets/css/sprites/spritesmith-main-26.css

@@ -0,0 +1,528 @@
+.Pet-Whale-Red {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -82px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -328px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Skeleton {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -164px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-White {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -82px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Aquatic {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -164px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Base {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -246px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Bronze {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -246px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Celestial {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-CottonCandyBlue {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -82px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-CottonCandyPink {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -164px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Cupid {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -246px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Desert {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -328px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Ember {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -328px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Fairy {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -328px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Floral {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Frost {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -82px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Ghost {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -164px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Glass {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -246px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Glow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -328px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Golden {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -410px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Holly {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -410px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-IcySnow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -410px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Peppermint {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -410px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Rainbow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -492px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Red {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -492px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-RoseQuartz {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -492px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-RoyalPurple {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -492px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shadow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -82px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shimmer {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -164px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Silver {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -246px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Skeleton {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -328px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Spooky {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -410px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-StarryNight {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -492px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Sunshine {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -574px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Thunderstorm {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -574px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veggie {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -574px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veteran {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -574px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Watery {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -574px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-White {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -82px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Base {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -164px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-CottonCandyBlue {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -246px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-CottonCandyPink {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Desert {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -410px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Golden {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -492px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Red {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -574px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -656px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Skeleton {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -656px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-White {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -656px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -656px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet_HatchingPotion_Aquatic {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -656px -469px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Base {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -414px -669px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Bronze {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -600px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Celestial {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -69px -600px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_CottonCandyBlue {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -138px -600px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_CottonCandyPink {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -207px -600px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Cupid {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -276px -600px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Desert {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -345px -600px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Ember {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -414px -600px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Fairy {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -483px -600px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Floral {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -552px -600px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Frost {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -621px -600px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Ghost {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -669px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Glass {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -69px -669px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Glow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -138px -669px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Golden {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -207px -669px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Holly {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -276px -669px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_IcySnow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -345px -669px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Peppermint {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -656px -400px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Purple {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -483px -669px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Rainbow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -552px -669px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Red {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -621px -669px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_RoseQuartz {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px 0px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_RoyalPurple {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px -69px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px -138px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shadow {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px -207px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shimmer {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px -276px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Silver {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px -345px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Skeleton {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px -414px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Spooky {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px -483px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_StarryNight {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px -552px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Sunshine {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -738px -621px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Thunderstorm {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: 0px -738px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Watery {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -69px -738px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_White {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -138px -738px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-26.png');
+  background-position: -207px -738px;
+  width: 68px;
+  height: 68px;
+}

website/client/assets/scss/button.scss

@@ -74,10 +74,10 @@
 }
 
 .btn-success {
-  background: $green-10;
+  background: $green-100;
 
   &:disabled {
-    background: $green-10;
+    background: $green-100;
   }
 
   &:hover:not(:disabled), &:active, &.active {

website/client/assets/scss/colors.scss

@@ -78,3 +78,5 @@ $wizard-color: #2995CD;
 $gems-color: #24CC8F;
 $gold-color: #FFA624;
 $hourglass-color: #2995CD;
+
+$purple-task: #925cf3;

website/client/assets/scss/task.scss

@@ -8,6 +8,9 @@
           .daily-todo-control { background: rgba(255, 255, 255, 0.72) !important; }
         }
       }
+      &-bg-noninteractive {
+        background: $maroon-100 !important;
+      }
       &-inner-habit { background: rgba(26, 24, 29, 0.24) !important; }
       &-inner-daily-todo { background: $maroon-500 !important; }
       &-checkbox { color: $maroon-100 !important; }
@@ -38,6 +41,9 @@
           .daily-todo-control { background: rgba(255, 255, 255, 0.72) !important; }
         }
       }
+      &-bg-noninteractive {
+        background: $red-100 !important;
+      }
       &-inner-habit { background: rgba(26, 24, 29, 0.24) !important; }
       &-inner-daily-todo { background: $red-500 !important; }
       &-checkbox { color: $red-100 !important; }
@@ -69,6 +75,9 @@
           .daily-todo-control { background: rgba(255, 255, 255, 0.72) !important; }
         }
       }
+      &-bg-noninteractive {
+        background: $orange-100 !important;
+      }
       &-inner-habit { background: rgba(183, 90, 28, 0.4) !important; }
       &-inner-daily-todo { background: $orange-500 !important; }
       &-checkbox { color: $orange-100 !important; }
@@ -109,6 +118,9 @@
           .daily-todo-control { background: rgba(255, 255, 255, 0.72) !important; }
         }
       }
+      &-bg-noninteractive {
+        background: $yellow-100 !important;
+      }
       &-inner-habit { background: rgba(183, 90, 28, 0.32) !important; }
       &-inner-daily-todo { background: $yellow-500 !important; }
       &-checkbox { color: $yellow-100 !important; }
@@ -149,6 +161,9 @@
           .daily-todo-control { background: rgba(255, 255, 255, 0.72) !important; }
         }
       }
+      &-bg-noninteractive {
+        background: $green-100 !important;
+      }
       &-inner-habit { background: rgba(26, 24, 29, 0.24) !important; }
       &-inner-daily-todo { background: #77f4c7 !important; }
       &-checkbox { color: $green-10 !important; }
@@ -179,6 +194,9 @@
           .daily-todo-control { background: rgba(255, 255, 255, 0.72) !important; }
         }
       }
+      &-bg-noninteractive {
+        background: $teal-100 !important;
+      }
       &-inner-habit { background: rgba(26, 24, 29, 0.24) !important; }
       &-inner-daily-todo { background: #8dedf6 !important; }
       &-checkbox { color: $teal-100 !important; }
@@ -209,6 +227,9 @@
           .daily-todo-control { background: rgba(255, 255, 255, 0.72) !important; }
         }
       }
+      &-bg-noninteractive {
+        background: $blue-100 !important;
+      }
       &-inner-habit { background: rgba(26, 24, 29, 0.24) !important; }
       &-inner-daily-todo { background: $blue-500 !important; }
       &-checkbox { color: $blue-100 !important; }
@@ -231,6 +252,19 @@
   }
 
   &-purple { // purple, only used in modals
+    &-control {
+      &-bg {
+        background: $purple-task !important;
+        &:hover {
+          .habit-control { background: rgba(26, 24, 29, 0.48) !important; }
+          .daily-todo-control { background: rgba(255, 255, 255, 0.72) !important; }
+        }
+      }
+      &-inner-habit { background: rgba(26, 24, 29, 0.24) !important; }
+      &-inner-daily-todo { background: #ffffff80 !important; }
+      &-checkbox { color: $purple-task !important; }
+    }
+
     &-modal {
       &-bg { background: $purple-300 !important; }
       &-icon { color: $purple-300 !important; }
@@ -254,6 +288,10 @@
 
         &:hover { background: rgba(255, 217, 160, 0.48) !important; }
       }
+      &-bg-noninteractive {
+        background: rgba(255, 217, 160, 0.32) !important;
+        .small-text { color: $orange-10 !important; }
+      }
     }
   }
 

website/client/assets/scss/variables.scss

@@ -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';

website/client/assets/svg/arrow_left.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+    <path fill="#A5A1AC" fill-rule="evenodd" d="M16 0h-4v32h4V0zm16 8H16v16h16V8zM12 4H8v24h4V4zM8 8H4v16h4V8zm-4 4H0v8h4v-8z"/>
+</svg>

website/client/assets/svg/arrow_right.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+    <path fill="#A5A1AC" fill-rule="evenodd" d="M16 0h4v32h-4V0zM0 8h16v16H0V8zm20-4h4v24h-4V4zm4 4h4v16h-4V8zm4 4h4v8h-4v-8z"/>
+</svg>

website/client/assets/svg/logo-purple.svg

@@ -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>

website/client/components/achievements/chooseClass.vue

@@ -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',
         };
       }
     },

website/client/components/avatarModal/body-settings.vue

@@ -0,0 +1,92 @@
+<template lang="pug">
+  #body.section.customize-section
+    sub-menu.text-center(:items="items", :activeSubPage="activeSubPage", @changeSubPage="changeSubPage($event)")
+    div(v-if='activeSubPage === "size"')
+      customize-options(
+        :items="sizes",
+        :currentValue="user.preferences.size"
+      )
+    div(v-if='activeSubPage === "shirt"')
+      customize-options(
+        :items="freeShirts",
+        :currentValue="user.preferences.shirt"
+      )
+      customize-options(
+        v-if='editing',
+        :items='specialShirts',
+        :currentValue="user.preferences.shirt",
+        :fullSet='!userOwnsSet("shirt", specialShirtKeys)',
+        @unlock='unlock(`shirt.${specialShirtKeys.join(",shirt.")}`)'
+      )
+</template>
+
+<script>
+  import appearance from 'common/script/content/appearance';
+  import {subPageMixin} from '../../mixins/subPage';
+  import {userStateMixin} from '../../mixins/userState';
+  import {avatarEditorUtilies} from '../../mixins/avatarEditUtilities';
+  import subMenu from './sub-menu';
+  import customizeOptions from './customize-options';
+  import gem from 'assets/svg/gem.svg';
+
+  const freeShirtKeys = Object.keys(appearance.shirt).filter(k => appearance.shirt[k].price === 0);
+  const specialShirtKeys = Object.keys(appearance.shirt).filter(k => appearance.shirt[k].price !== 0);
+
+
+  export default {
+    props: [
+      'editing',
+    ],
+    components: {
+      subMenu,
+      customizeOptions,
+    },
+    mixins: [
+      subPageMixin,
+      userStateMixin,
+      avatarEditorUtilies,
+    ],
+    data () {
+      return {
+        specialShirtKeys,
+        icons: Object.freeze({
+          gem,
+        }),
+        items: [
+          {
+            id: 'size',
+            label: this.$t('size'),
+          },
+          {
+            id: 'shirt',
+            label: this.$t('shirt'),
+          },
+        ],
+      };
+    },
+    computed: {
+      sizes () {
+        return ['slim', 'broad'].map(s => this.mapKeysToFreeOption(s, 'size'));
+      },
+      freeShirts () {
+        return freeShirtKeys.map(s => this.mapKeysToFreeOption(s, 'shirt'));
+      },
+      specialShirts () {
+        let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line
+        let keys = this.specialShirtKeys;
+        let options = keys.map(key => this.mapKeysToOption(key, 'shirt'));
+        return options;
+      },
+    },
+    mounted () {
+      this.changeSubPage('size');
+    },
+    methods: {
+
+    },
+  };
+</script>
+
+<style scoped>
+
+</style>

website/client/components/avatarModal/customize-options.vue

@@ -0,0 +1,304 @@
+<template lang="pug">
+  .customize-options(:class="{'background-set': fullSet}")
+    .outer-option-background(
+      v-for='option in items',
+      :key='option.key',
+      @click='option.click(option)',
+      :class='{locked: option.gemLocked || option.goldLocked, premium: Boolean(option.gem), active: option.active || currentValue === option.key, none: option.none, hide: option.hide }'
+    )
+      .option
+        .sprite.customize-option(:class='option.class')
+          .redline-outer(v-if="option.none")
+            .redline
+      .gem-lock(v-if='option.gemLocked')
+        .svg-icon.gem(v-html='icons.gem')
+        span {{ option.gem }}
+      .gold-lock(v-if='option.goldLocked')
+        .svg-icon.gold(v-html='icons.gold')
+        span {{ option.gold }}
+    .purchase-set(v-if='fullSet', @click='unlock()')
+      span.label {{ $t('purchaseAll') }}
+      .svg-icon.gem(v-html='icons.gem')
+      span.price 5
+</template>
+
+<script>
+  import gem from 'assets/svg/gem.svg';
+  import gold from 'assets/svg/gold.svg';
+  import {avatarEditorUtilies} from '../../mixins/avatarEditUtilities';
+
+  export default {
+    props: ['items', 'currentValue', 'fullSet'],
+    mixins: [
+      avatarEditorUtilies,
+    ],
+    data () {
+      return {
+        icons: Object.freeze({
+          gem,
+          gold,
+        }),
+      };
+    },
+    methods: {
+      unlock () {
+        this.$emit('unlock');
+      },
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  @import '~client/assets/scss/colors.scss';
+
+  .customize-options {
+    width: 100%;
+  }
+
+  .hide {
+    display: none !important;
+  }
+
+  .outer-option-background {
+    display: inline-block;
+    vertical-align: top;
+    pointer-events: visible;
+    cursor: pointer;
+
+    &.premium {
+      height: 112px;
+      width: 96px;
+      margin-left: 8px;
+      margin-right: 8px;
+      margin-bottom: 8px;
+
+      .option {
+        margin: 12px 16px;
+      }
+    }
+
+    &.locked {
+      border-radius: 2px;
+      border: 1px solid transparent;
+      box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
+      background-color: $white;
+
+      .option {
+        border: none;
+        border-radius: 2px;
+        padding-left: 6px;
+        padding-top: 4px;
+      }
+
+      &:hover {
+        box-shadow: 0 4px 4px 0 rgba($black, 0.16), 0 1px 8px 0 rgba($black, 0.12);
+        border: 1px solid $purple-500;
+      }
+    }
+
+    &:not(.locked):not(.active) {
+      .option:hover {
+        background-color: rgba(213, 200, 255, .32);
+      }
+    }
+
+    &.premium:not(.locked):not(.active) {
+      border-radius: 2px;
+      background-color: rgba(59, 202, 215, 0.1);
+    }
+
+    &.none .option {
+      .sprite {
+        opacity: 0.24;
+      }
+
+      .redline-outer {
+        height: 60px;
+        width: 60px;
+        position: absolute;
+        bottom: 0;
+        margin: 0 auto 0 0;
+
+        .redline {
+          width: 60px;
+          height: 4px;
+          display: block;
+          background: red;
+          transform: rotate(-45deg);
+          position: absolute;
+          top: 0;
+          margin-top: 30px;
+          margin-bottom: 20px;
+          margin-left: -1px;
+        }
+      }
+    }
+
+    &.active .option {
+      background: white;
+      border: solid 4px $purple-300;
+    }
+
+    &.premium:not(.active) .option {
+      border-radius: 8px;
+    }
+  }
+  .option {
+    vertical-align: bottom;
+    height: 64px;
+    width: 64px;
+
+    margin: 12px 8px;
+    border: 4px solid transparent;
+    border-radius: 10px;
+    position: relative;
+
+    &:hover {
+      cursor: pointer;
+    }
+  }
+
+  .outer-option-background:not(.none) {
+
+    .sprite.customize-option {
+      // margin: 0 auto;
+      //margin-left: -3px;
+      //margin-top: -7px;
+      margin-top: 0;
+      margin-left: 0;
+
+      &.size, &.shirt {
+        margin-top: -8px;
+        margin-left: -4px;
+      }
+
+      &.color-bangs {
+        margin-top: 3px;
+      }
+      &.skin {
+        margin-top: -4px;
+        margin-left: -4px;
+      }
+      &.chair {
+        margin-left: -1px;
+        margin-top: -1px;
+
+        &.button_chair_black {
+          // different sprite margin?
+          margin-top: -3px;
+        }
+
+        &.handleless {
+          margin-left: -5px;
+          margin-top: -5px;
+        }
+      }
+      &.color, &.bangs {
+          margin-top: 4px;
+          margin-left: -3px;
+      }
+
+      &.hair.base {
+          margin-top: 0px;
+          margin-left: -5px;
+      }
+
+      &.headAccessory {
+        margin-top: 0;
+        margin-left: -4px;
+      }
+
+      &.headband {
+        margin-top: -6px;
+        margin-left: -27px;
+      }
+    }
+  }
+
+  .text-center {
+    .gem-lock, .gold-lock {
+      display: inline-block;
+      margin: 0 auto 8px;
+      vertical-align: bottom;
+    }
+  }
+
+  .gem-lock, .gold-lock {
+    .svg-icon {
+      width: 16px;
+    }
+
+    span {
+      font-weight: bold;
+      margin-left: .5em;
+    }
+
+    .svg-icon, span {
+      display: inline-block;
+      vertical-align: bottom;
+    }
+  }
+
+  .gem-lock span {
+    color: $green-10
+  }
+
+  .purchase-set {
+    background: #fff;
+    padding: 0.5em;
+    border-radius: 0 0 2px 2px;
+    box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
+    cursor: pointer;
+
+    span {
+      font-weight: bold;
+      font-size: 12px;
+    }
+
+    span.price {
+      color: #24cc8f;
+    }
+
+    .gem, .coin {
+      width: 16px;
+    }
+
+    &.single {
+      width: 141px;
+    }
+
+    width: 100%;
+
+    span {
+      font-size: 14px;
+    }
+
+    .gem, .coin {
+      width: 20px;
+      margin: 0 .5em;
+      display: inline-block;
+      vertical-align: bottom;
+    }
+  }
+
+  .background-set {
+    background-color: #edecee;
+    border-radius: 2px;
+
+    padding-top: 12px;
+    margin-left: 12px;
+    margin-right: 12px;
+    margin-bottom: 12px;
+
+
+    width: calc(100% - 24px);
+
+    padding-left: 0;
+    padding-right: 0;
+
+    max-width: unset; // disable col12 styling
+    flex: unset;
+  }
+
+
+</style>

website/client/components/avatarModal/extra-settings.vue

@@ -0,0 +1,272 @@
+<template lang="pug">
+  #extra.section.container.customize-section
+    sub-menu.text-center(:items="extraSubMenuItems", :activeSubPage="activeSubPage", @changeSubPage="changeSubPage($event)")
+
+    #hair-color(v-if='activeSubPage === "glasses"')
+      customize-options(
+        :items="eyewear"
+      )
+
+    #animal-ears(v-if='activeSubPage === "ears"')
+      customize-options(
+        :items="animalItems('headAccessory')",
+        :fullSet='!animalItemsOwned("headAccessory")',
+        @unlock='unlock(animalItemsUnlockString("headAccessory"))'
+      )
+
+    #animal-tails(v-if='activeSubPage === "tails"')
+      customize-options(
+        :items="animalItems('back')",
+        :fullSet='!animalItemsOwned("back")',
+        @unlock='unlock(animalItemsUnlockString("back"))'
+      )
+    #headband(v-if='activeSubPage === "headband"')
+      customize-options(
+        :items="headbands",
+      )
+
+    #wheelchairs(v-if='activeSubPage === "wheelchair"')
+      customize-options(
+        :items="chairs",
+      )
+    #flowers(v-if='activeSubPage === "flower"')
+      customize-options(
+        :items="flowers",
+      )
+</template>
+
+<script>
+  import appearance from 'common/script/content/appearance';
+  import {subPageMixin} from '../../mixins/subPage';
+  import {userStateMixin} from '../../mixins/userState';
+  import {avatarEditorUtilies} from '../../mixins/avatarEditUtilities';
+  import subMenu from './sub-menu';
+  import customizeOptions from './customize-options';
+  import gem from 'assets/svg/gem.svg';
+
+  const freeShirtKeys = Object.keys(appearance.shirt).filter(k => appearance.shirt[k].price === 0);
+  const specialShirtKeys = Object.keys(appearance.shirt).filter(k => appearance.shirt[k].price !== 0);
+
+
+  export default {
+    props: [
+      'editing',
+    ],
+    components: {
+      subMenu,
+      customizeOptions,
+    },
+    mixins: [
+      subPageMixin,
+      userStateMixin,
+      avatarEditorUtilies,
+    ],
+    data () {
+      return {
+        animalItemKeys: {
+          back: ['bearTail', 'cactusTail', 'foxTail', 'lionTail', 'pandaTail', 'pigTail', 'tigerTail', 'wolfTail'],
+          headAccessory: ['bearEars', 'cactusEars', 'foxEars', 'lionEars', 'pandaEars', 'pigEars', 'tigerEars', 'wolfEars'],
+        },
+        chairKeys: ['none', 'black', 'blue', 'green', 'pink', 'red', 'yellow', 'handleless_black', 'handleless_blue', 'handleless_green', 'handleless_pink', 'handleless_red', 'handleless_yellow'],
+        specialShirtKeys,
+        icons: Object.freeze({
+          gem,
+        }),
+        items: [
+          {
+            id: 'size',
+            label: this.$t('size'),
+          },
+          {
+            id: 'shirt',
+            label: this.$t('shirt'),
+          },
+        ],
+      };
+    },
+    computed: {
+      extraSubMenuItems () {
+        const items = [];
+
+        if (this.editing) {
+          items.push({
+            id: 'glasses',
+            label: this.$t('glasses'),
+          });
+        }
+
+        items.push(
+          {
+            id: 'wheelchair',
+            label: this.$t('wheelchair'),
+          },
+          {
+            id: 'flower',
+            label: this.$t('accent'),
+          },
+        );
+
+        if (this.editing) {
+          items.push({
+            id: 'ears',
+            label: this.$t('animalEars'),
+          });
+
+          items.push({
+            id: 'tails',
+            label: this.$t('animalTails'),
+          });
+
+          items.push({
+            id: 'headband',
+            label: this.$t('headband'),
+          });
+        }
+
+        return items;
+      },
+      eyewear () {
+        let keys = [
+          'blackTopFrame', 'blueTopFrame', 'greenTopFrame', 'pinkTopFrame', 'redTopFrame', 'whiteTopFrame', 'yellowTopFrame',
+          'blackHalfMoon', 'blueHalfMoon', 'greenHalfMoon', 'pinkHalfMoon', 'redHalfMoon', 'whiteHalfMoon', 'yellowHalfMoon',
+        ];
+        let options = keys.map(key => {
+          let newKey = `eyewear_special_${key}`;
+          let option = {};
+          option.key = key;
+          option.active = this.user.preferences.costume ? this.user.items.gear.costume.eyewear === newKey : this.user.items.gear.equipped.eyewear === newKey;
+          option.class = `eyewear_special_${key}`;
+          option.click = () => {
+            let type = this.user.preferences.costume ? 'costume' : 'equipped';
+
+            return this.equip(newKey, type);
+          };
+          return option;
+        });
+        return options;
+      },
+      freeShirts () {
+        return freeShirtKeys.map(s => this.mapKeysToFreeOption(s, 'shirt'));
+      },
+      specialShirts () {
+        let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line
+        let keys = this.specialShirtKeys;
+        let options = keys.map(key => this.mapKeysToOption(key, 'shirt'));
+        return options;
+      },
+      headbands () {
+        let keys = ['blackHeadband', 'blueHeadband', 'greenHeadband', 'pinkHeadband', 'redHeadband', 'whiteHeadband', 'yellowHeadband'];
+        let options = keys.map(key => {
+          let newKey = `headAccessory_special_${key}`;
+          let option = {};
+          option.key = key;
+          option.active = this.user.preferences.costume ? this.user.items.gear.costume.headAccessory === newKey : this.user.items.gear.equipped.headAccessory === newKey;
+          option.class = `headAccessory_special_${option.key} headband`;
+          option.click = () => {
+            let type = this.user.preferences.costume ? 'costume' : 'equipped';
+            return this.equip(newKey, type);
+          };
+          return option;
+        });
+        return options;
+      },
+      chairs () {
+        let options = this.chairKeys.map(key => {
+          let option = {};
+          option.key = key;
+          if (key === 'none') {
+            option.none = true;
+          }
+          option.active = this.user.preferences.chair === key;
+          option.class = `button_chair_${key} chair ${key.includes('handleless_') ? 'handleless' : ''}`;
+          option.click = () => {
+            return this.set({'preferences.chair': key});
+          };
+          return option;
+        });
+        return options;
+      },
+      flowers () {
+        let keys = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16];
+        let options = keys.map(key => {
+          let option = {};
+          option.key = key;
+          if (key === 0) {
+            option.none = true;
+          }
+          option.active = this.user.preferences.hair.flower === key;
+          option.class = `hair_flower_${key} flower`;
+          option.click = () => {
+            return this.set({'preferences.hair.flower': key});
+          };
+          return option;
+        });
+        return options;
+      },
+    },
+    mounted () {
+      this.changeSubPage(this.extraSubMenuItems[0].id);
+    },
+    methods: {
+      animalItems (category) {
+        // @TODO: For some resonse when I use $set on the user purchases object, this is not recomputed. Hack for now
+        let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line
+        let keys = this.animalItemKeys[category];
+        let options = keys.map(key => {
+          let newKey = `${category}_special_${key}`;
+          let userPurchased = this.user.items.gear.owned[newKey];
+
+          let option = {};
+          option.key = key;
+          option.active = this.user.preferences.costume ? this.user.items.gear.costume[category] === newKey : this.user.items.gear.equipped[category] === newKey;
+          option.class = `headAccessory_special_${option.key} ${category}`;
+          if (category === 'back') {
+            option.class = `icon_back_special_${option.key} back`;
+          }
+          option.gemLocked = userPurchased === undefined;
+          option.goldLocked = userPurchased === false;
+          if (option.goldLocked) {
+            option.gold = 20;
+          }
+          if (option.gemLocked) {
+            option.gem = 2;
+          }
+          option.locked = option.gemLocked || option.goldLocked;
+          option.click = () => {
+            if (option.gemLocked) {
+              return this.unlock(`items.gear.owned.${newKey}`);
+            } else if (option.goldLocked) {
+              return this.buy(newKey);
+            } else {
+              let type = this.user.preferences.costume ? 'costume' : 'equipped';
+              return this.equip(newKey, type);
+            }
+          };
+          return option;
+        });
+        return options;
+      },
+      animalItemsUnlockString (category) {
+        const keys = this.animalItemKeys[category].map(key => {
+          return `items.gear.owned.${category}_special_${key}`;
+        });
+
+        return keys.join(',');
+      },
+      animalItemsOwned (category) {
+        // @TODO: For some resonse when I use $set on the user purchases object, this is not recomputed. Hack for now
+        let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line
+
+        let own = true;
+        this.animalItemKeys[category].forEach(key => {
+          if (this.user.items.gear.owned[`${category}_special_${key}`] === undefined) own = false;
+        });
+        return own;
+      },
+    },
+  };
+</script>
+
+<style scoped>
+
+</style>

website/client/components/avatarModal/hair-settings.vue

@@ -0,0 +1,341 @@
+<template lang="pug">
+  #hair.section.customize-section
+    sub-menu.text-center(:items="hairSubMenuItems", :activeSubPage="activeSubPage", @changeSubPage="changeSubPage($event)")
+
+    #hair-color(v-if='activeSubPage === "color"')
+      customize-options(
+        :items="freeHairColors",
+        :currentValue="user.preferences.hair.color"
+      )
+
+      div(v-if='editing && set.key !== "undefined"', v-for='set in seasonalHairColors')
+        customize-options(
+          :items='set.options',
+          :currentValue="user.preferences.skin",
+          :fullSet='!hideSet(set) && !userOwnsSet("hair", set.keys, "color")',
+          @unlock='unlock(`hair.color.${set.keys.join(",hair.color.")}`)'
+        )
+
+    #style(v-if='activeSubPage === "style"')
+      div(v-for='set in styleSets')
+        customize-options(
+          :items='set.options',
+          :fullSet='set.fullSet',
+          @unlock='set.unlock()'
+        )
+    #bangs(v-if='activeSubPage === "bangs"')
+      customize-options(
+        :items='hairBangs',
+        :currentValue="user.preferences.hair.bangs"
+      )
+    #facialhair(v-if='activeSubPage === "facialhair"')
+      customize-options(
+        v-if='editing',
+        :items='mustacheList'
+      )
+      customize-options(
+        v-if='editing',
+        :items='beardList',
+        :fullSet='isPurchaseAllNeeded("hair", ["baseHair5", "baseHair6"], ["mustache", "beard"])',
+        @unlock='unlock(`hair.mustache.${baseHair5Keys.join(",hair.mustache.")},hair.beard.${baseHair6Keys.join(",hair.beard.")}`)'
+      )
+</template>
+
+<script>
+  import appearance from 'common/script/content/appearance';
+  import {subPageMixin} from '../../mixins/subPage';
+  import {userStateMixin} from '../../mixins/userState';
+  import {avatarEditorUtilies} from '../../mixins/avatarEditUtilities';
+  import subMenu from './sub-menu';
+  import customizeOptions from './customize-options';
+  import gem from 'assets/svg/gem.svg';
+  import appearanceSets from 'common/script/content/appearance/sets';
+  import groupBy from 'lodash/groupBy';
+
+  const hairColorBySet = groupBy(appearance.hair.color, 'set.key');
+  const freeHairColorKeys = hairColorBySet[undefined].map(s => s.key);
+
+  export default {
+    props: [
+      'editing',
+    ],
+    components: {
+      subMenu,
+      customizeOptions,
+    },
+    mixins: [
+      subPageMixin,
+      userStateMixin,
+      avatarEditorUtilies,
+    ],
+    data () {
+      return {
+        freeHairColorKeys,
+        icons: Object.freeze({
+          gem,
+        }),
+        baseHair1: [1, 3],
+        baseHair2Keys: [2, 4, 5, 6, 7, 8],
+        baseHair3Keys: [9, 10, 11, 12, 13, 14],
+        baseHair4Keys: [15, 16, 17, 18, 19, 20],
+        baseHair5Keys: [1, 2],
+        baseHair6Keys: [1, 2, 3],
+      };
+    },
+    computed: {
+      hairSubMenuItems () {
+        const items = [
+          {
+            id: 'color',
+            label: this.$t('color'),
+          },
+          {
+            id: 'bangs',
+            label: this.$t('bangs'),
+          },
+          {
+            id: 'style',
+            label: this.$t('style'),
+          },
+        ];
+
+        if (this.editing) {
+          items.push({
+            id: 'facialhair',
+            label: this.$t('facialhair'),
+          });
+        }
+
+        return items;
+      },
+      freeHairColors () {
+        return freeHairColorKeys.map(s => this.mapKeysToFreeOption(s, 'hair', 'color'));
+      },
+      seasonalHairColors () {
+        // @TODO: For some resonse when I use $set on the user purchases object, this is not recomputed. Hack for now
+        let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line
+
+        let seasonalHairColors = [];
+        for (let key in hairColorBySet) {
+          let set = hairColorBySet[key];
+
+          let keys = set.map(item => {
+            return item.key;
+          });
+
+          let options = keys.map(optionKey => {
+            const option = this.mapKeysToOption(optionKey, 'hair', 'color', key);
+            return option;
+          });
+
+          let text = this.$t(key);
+          if (appearanceSets[key] && appearanceSets[key].text) {
+            text = appearanceSets[key].text();
+          }
+
+          let compiledSet = {
+            key,
+            options,
+            keys,
+            text,
+          };
+          seasonalHairColors.push(compiledSet);
+        }
+
+        return seasonalHairColors;
+      },
+      premiumHairColors () {
+        // @TODO: For some resonse when I use $set on the user purchases object, this is not recomputed. Hack for now
+        let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line
+        let keys = this.premiumHairColorKeys;
+        let options = keys.map(key => {
+          return this.mapKeysToOption(key, 'hair', 'color');
+        });
+        return options;
+      },
+      baseHair2 () {
+        // @TODO: For some resonse when I use $set on the user purchases object, this is not recomputed. Hack for now
+        let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line
+        let keys = this.baseHair2Keys;
+        let options = keys.map(key => {
+          return this.mapKeysToOption(key, 'hair', 'base');
+        });
+        return options;
+      },
+      baseHair3 () {
+        // @TODO: For some resonse when I use $set on the user purchases object, this is not recomputed. Hack for now
+        let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line
+        let keys = this.baseHair3Keys;
+        let options = keys.map(key => {
+          const option = this.mapKeysToOption(key, 'hair', 'base');
+          return option;
+        });
+        return options;
+      },
+      baseHair4 () {
+        // @TODO: For some resonse when I use $set on the user purchases object, this is not recomputed. Hack for now
+        let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line
+        let keys = this.baseHair4Keys;
+        let options = keys.map(key => {
+          return this.mapKeysToOption(key, 'hair', 'base');
+        });
+        return options;
+      },
+      baseHair5 () {
+        // @TODO: For some resonse when I use $set on the user purchases object, this is not recomputed. Hack for now
+        let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line
+        let keys = this.baseHair5Keys;
+        let options = keys.map(key => {
+          return this.mapKeysToOption(key, 'hair', 'mustache');
+        });
+        return options;
+      },
+      baseHair6 () {
+        // @TODO: For some resonse when I use $set on the user purchases object, this is not recomputed. Hack for now
+        let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line
+        let keys = this.baseHair6Keys;
+        let options = keys.map(key => {
+          return this.mapKeysToOption(key, 'hair', 'beard');
+        });
+        return options;
+      },
+      hairBangs () {
+        const none = this.mapKeysToFreeOption(0, 'hair', 'bangs');
+        none.none = true;
+
+        const options = [1, 2, 3, 4].map(s => this.mapKeysToFreeOption(s, 'hair', 'bangs'));
+
+        return [none, ...options];
+      },
+      mustacheList () {
+        const noneOption = this.mapKeysToFreeOption(0, 'hair', 'mustache');
+        noneOption.none = true;
+
+        return [noneOption, ...this.baseHair5];
+      },
+      beardList () {
+        const noneOption = this.mapKeysToFreeOption(0, 'hair', 'beard');
+        noneOption.none = true;
+
+        return [noneOption, ...this.baseHair6];
+      },
+      styleSets () {
+        const sets = [];
+
+        const emptyHairBase = {
+          ...this.mapKeysToFreeOption(0, 'hair', 'base'),
+          none: true,
+        };
+
+        if (this.editing) {
+          sets.push({
+            fullSet: !this.userOwnsSet('hair', this.baseHair3Keys, 'base'),
+            unlock: () => this.unlock(`hair.base.${this.baseHair3Keys.join(',hair.base.')}`),
+            options: [
+              emptyHairBase,
+              ...this.baseHair3,
+            ],
+          });
+
+          sets.push({
+            fullSet: !this.userOwnsSet('hair', this.baseHair4Keys, 'base'),
+            unlock: () => this.unlock(`hair.base.${this.baseHair4Keys.join(',hair.base.')}`),
+            options: [
+              ...this.baseHair4,
+            ],
+          });
+        }
+
+        sets.push({
+          options: [
+            emptyHairBase,
+            ...this.baseHair1.map(key => this.mapKeysToFreeOption(key, 'hair', 'base')),
+          ],
+        });
+
+        if (this.editing) {
+          sets.push({
+            fullSet: !this.userOwnsSet('hair', this.baseHair2Keys, 'base'),
+            unlock: () => this.unlock(`hair.base.${this.baseHair2Keys.join(',hair.base.')}`),
+            options: [
+              ...this.baseHair2,
+            ],
+          });
+        }
+
+        return sets;
+      },
+    },
+    mounted () {
+      this.changeSubPage('color');
+    },
+    methods: {
+      /**
+       * Allows you to find out whether you need the "Purchase All" button or not. If there are more than 2 unpurchased items, returns true, otherwise returns false.
+       * @param {string} category - The selected category.
+       * @param {string[]} keySets - The items keySets.
+       * @param {string[]} [types] - The items types (subcategories). Optional.
+       * @returns {boolean} - Determines whether the "Purchase All" button is needed (true) or not (false).
+       */
+      isPurchaseAllNeeded (category, keySets, types) {
+        const purchasedItemsLengths = [];
+        // If item types are specified, count them
+        if (types && types.length > 0) {
+          // Types can be undefined, so we must check them.
+          types.forEach((type) => {
+            if (this.user.purchased[category][type]) {
+              purchasedItemsLengths
+                .push(Object.keys(this.user.purchased[category][type]).length);
+            }
+          });
+        } else {
+          let purchasedItemsCounter = 0;
+
+          // If types are not specified, recursively
+          // search for purchased items in the category
+          const findPurchasedItems = (item) => {
+            if (typeof item === 'object') {
+              Object.values(item)
+                .forEach((innerItem) => {
+                  if (typeof innerItem === 'boolean' && innerItem === true) {
+                    purchasedItemsCounter += 1;
+                  }
+                  return findPurchasedItems(innerItem);
+                });
+            }
+            return purchasedItemsCounter;
+          };
+
+          findPurchasedItems(this.user.purchased[category]);
+          if (purchasedItemsCounter > 0) {
+            purchasedItemsLengths.push(purchasedItemsCounter);
+          }
+        }
+
+        // We don't need to count the key sets (below)
+        // if there are no purchased items at all.
+        if (purchasedItemsLengths.length === 0) {
+          return true;
+        }
+
+        const allItemsLengths = [];
+        // Key sets must be specify correctly.
+        keySets.forEach((keySet) => {
+          allItemsLengths.push(Object.keys(this[keySet]).length);
+        });
+
+        // Simply sum all the length values and
+        // write them into variables for the convenience.
+        const allItems = allItemsLengths.reduce((acc, val) => acc + val);
+        const purchasedItems = purchasedItemsLengths.reduce((acc, val) => acc + val);
+
+        const unpurchasedItems = allItems - purchasedItems;
+        return unpurchasedItems > 2;
+      },
+    },
+  };
+</script>
+
+<style scoped>
+
+</style>

website/client/components/avatarModal/skin-settings.vue

@@ -0,0 +1,114 @@
+<template lang="pug">
+  #skin.section.customize-section
+    sub-menu.text-center(:items="skinSubMenuItems", :activeSubPage="activeSubPage", @changeSubPage="changeSubPage($event)")
+    customize-options(
+      :items="freeSkins",
+      :currentValue="user.preferences.skin"
+    )
+
+    div(v-if='editing && set.key !== "undefined"', v-for='set in seasonalSkins')
+      customize-options(
+        :items='set.options',
+        :currentValue="user.preferences.skin",
+        :fullSet='!hideSet(set) && !userOwnsSet("skin", set.keys)',
+        @unlock='unlock(`skin.${set.keys.join(",skin.")}`)'
+      )
+</template>
+
+<script>
+  import appearance from 'common/script/content/appearance';
+  import {subPageMixin} from '../../mixins/subPage';
+  import {userStateMixin} from '../../mixins/userState';
+  import {avatarEditorUtilies} from '../../mixins/avatarEditUtilities';
+  import appearanceSets from 'common/script/content/appearance/sets';
+  import subMenu from './sub-menu';
+  import customizeOptions from './customize-options';
+  import gem from 'assets/svg/gem.svg';
+
+  import groupBy from 'lodash/groupBy';
+
+  const skinsBySet = groupBy(appearance.skin, 'set.key');
+
+  const freeSkinKeys = skinsBySet[undefined].map(s => s.key);
+
+  // const specialSkinKeys = Object.keys(appearance.shirt).filter(k => appearance.shirt[k].price !== 0);
+
+
+  export default {
+    props: [
+      'editing',
+    ],
+    components: {
+      subMenu,
+      customizeOptions,
+    },
+    mixins: [
+      subPageMixin,
+      userStateMixin,
+      avatarEditorUtilies,
+    ],
+    data () {
+      return {
+        freeSkinKeys,
+        icons: Object.freeze({
+          gem,
+        }),
+        skinSubMenuItems: [
+          {
+            id: 'color',
+            label: this.$t('color'),
+          },
+        ],
+      };
+    },
+    computed: {
+      freeSkins () {
+        return freeSkinKeys.map(s => this.mapKeysToFreeOption(s, 'skin'));
+      },
+      seasonalSkins () {
+        // @TODO: For some resonse when I use $set on the user purchases object, this is not recomputed. Hack for now
+        let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line
+
+        let seasonalSkins = [];
+        for (let setKey in skinsBySet) {
+          let set = skinsBySet[setKey];
+
+          let keys = set.map(item => {
+            return item.key;
+          });
+
+          let options = keys.map(optionKey => {
+            const option = this.mapKeysToOption(optionKey, 'skin', '', setKey);
+
+            return option;
+          });
+
+          let text = this.$t(setKey);
+          if (appearanceSets[setKey] && appearanceSets[setKey].text) {
+            text = appearanceSets[setKey].text();
+          }
+
+          let compiledSet = {
+            key: setKey,
+            options,
+            keys,
+            text,
+          };
+          seasonalSkins.push(compiledSet);
+        }
+
+        return seasonalSkins;
+      },
+    },
+    mounted () {
+      this.changeSubPage('color');
+    },
+    methods: {
+
+    },
+  };
+</script>
+
+<style scoped>
+
+</style>

website/client/components/avatarModal/sub-menu.vue

@@ -0,0 +1,52 @@
+<template lang="pug">
+  .sub-menu.text-center
+    .sub-menu-item(
+      v-for="item of items",
+      :key="item.id",
+      @click='$emit("changeSubPage", item.id)',
+      :class='{active: activeSubPage === item.id}'
+    )
+      strong(v-once) {{ item.label }}
+</template>
+
+<script>
+    export default {
+      props: ['items', 'activeSubPage'],
+    };
+</script>
+
+<style scoped lang="scss">
+  @import '~client/assets/scss/colors.scss';
+
+  .sub-menu {
+    display: flex;
+    justify-content: center;
+    margin-bottom: 10px;
+    padding-top: 12px;
+    flex-wrap: wrap;
+  }
+
+  .sub-menu:hover {
+    cursor: pointer;
+  }
+
+  .sub-menu-item {
+    padding: 6px 16px;
+    text-align: center;
+    border-bottom: 2px solid #f9f9f9;
+    height: 32px;
+    font-size: 12px;
+    font-weight: bold;
+    font-style: normal;
+    font-stretch: normal;
+    line-height: 1.67;
+    letter-spacing: normal;
+    text-align: center;
+    color: $gray-100;
+  }
+
+  .sub-menu .sub-menu-item:hover, .sub-menu .sub-menu-item.active {
+    color: $purple-200;
+    border-bottom: 2px solid $purple-200;
+  }
+</style>

website/client/components/challenges/challengeDetail.vue

@@ -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;

website/client/components/chat/chatCard.vue

@@ -167,7 +167,7 @@ export default {
     },
     date (value) {
       // @TODO: Vue doesn't support this so we cant user preference
-      return moment(value).toDate();
+      return moment(value).toDate().toString();
     },
   },
   computed: {