4.184.1

Currently translated at 100.0% (111 of 111 strings)

Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/bs/

Translated using Weblate (Greek)

Currently translated at 6.6% (12 of 181 strings)

Translation: Habitica/Front
Translate-URL: https://translate.habitica.com/projects/habitica/front/el/

Translated using Weblate (Greek)

Currently translated at 87.4% (111 of 127 strings)

Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/el/

Translated using Weblate (Bosnian)

Currently translated at 86.6% (110 of 127 strings)

Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/bs/

Translated using Weblate (Greek)

Currently translated at 100.0% (8 of 8 strings)

Translation: Habitica/Inventory
Translate-URL: https://translate.habitica.com/projects/habitica/inventory/el/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (56 of 56 strings)

Translation: Habitica/Spells
Translate-URL: https://translate.habitica.com/projects/habitica/spells/pt_BR/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (197 of 197 strings)

Translation: Habitica/Limited
Translate-URL: https://translate.habitica.com/projects/habitica/limited/pt_BR/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (197 of 197 strings)

Translation: Habitica/Limited
Translate-URL: https://translate.habitica.com/projects/habitica/limited/pt_BR/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (368 of 368 strings)

Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/pt_BR/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (203 of 203 strings)

Translation: Habitica/Generic
Translate-URL: https://translate.habitica.com/projects/habitica/generic/pt_BR/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (203 of 203 strings)

Translation: Habitica/Generic
Translate-URL: https://translate.habitica.com/projects/habitica/generic/pt_BR/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (203 of 203 strings)

Translation: Habitica/Generic
Translate-URL: https://translate.habitica.com/projects/habitica/generic/pt_BR/

Translated using Weblate (Greek)

Currently translated at 4.5% (5 of 111 strings)

Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/el/

Translated using Weblate (Bosnian)

Currently translated at 60.3% (67 of 111 strings)

Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/bs/

Translated using Weblate (Bosnian)

Currently translated at 100.0% (56 of 56 strings)

Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/bs/

Translated using Weblate (Bosnian)

Currently translated at 100.0% (85 of 85 strings)

Translation: Habitica/Quests
Translate-URL: https://translate.habitica.com/projects/habitica/quests/bs/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (197 of 197 strings)

Translation: Habitica/Limited
Translate-URL: https://translate.habitica.com/projects/habitica/limited/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (368 of 368 strings)

Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/en@pirate/

Translated using Weblate (Japanese)

Currently translated at 100.0% (2245 of 2245 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ja/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (2245 of 2245 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (203 of 203 strings)

Translation: Habitica/Generic
Translate-URL: https://translate.habitica.com/projects/habitica/generic/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (181 of 181 strings)

Translation: Habitica/Front
Translate-URL: https://translate.habitica.com/projects/habitica/front/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (724 of 724 strings)

Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (47 of 47 strings)

Translation: Habitica/Contrib
Translate-URL: https://translate.habitica.com/projects/habitica/contrib/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (102 of 102 strings)

Translation: Habitica/Challenge
Translate-URL: https://translate.habitica.com/projects/habitica/challenge/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (104 of 104 strings)

Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (181 of 181 strings)

Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/en@pirate/

Translated using Weblate (Greek)

Currently translated at 100.0% (8 of 8 strings)

Translation: Habitica/Inventory
Translate-URL: https://translate.habitica.com/projects/habitica/inventory/el/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (56 of 56 strings)

Translation: Habitica/Spells
Translate-URL: https://translate.habitica.com/projects/habitica/spells/pt_BR/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (61 of 61 strings)

Translation: Habitica/Messages
Translate-URL: https://translate.habitica.com/projects/habitica/messages/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (368 of 368 strings)

Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (56 of 56 strings)

Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/en@pirate/

Translated using Weblate (Turkish)

Currently translated at 100.0% (104 of 104 strings)

Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/tr/

Translated using Weblate (Turkish)

Currently translated at 100.0% (104 of 104 strings)

Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/tr/

Translated using Weblate (Turkish)

Currently translated at 97.2% (176 of 181 strings)

Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/tr/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (104 of 104 strings)

Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/pt_BR/

Translated using Weblate (Greek)

Currently translated at 75.0% (439 of 585 strings)

Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/el/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (182 of 182 strings)

Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (368 of 368 strings)

Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (2245 of 2245 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/en@pirate/

Translated using Weblate (Ukrainian)

Currently translated at 75.9% (1705 of 2245 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/uk/

Translated using Weblate (Bosnian)

Currently translated at 100.0% (56 of 56 strings)

Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/bs/

Translated using Weblate (Greek)

Currently translated at 74.7% (437 of 585 strings)

Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/el/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (56 of 56 strings)

Translation: Habitica/Spells
Translate-URL: https://translate.habitica.com/projects/habitica/spells/pt_BR/

Translated using Weblate (Bosnian)

Currently translated at 73.2% (41 of 56 strings)

Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/bs/

Translated using Weblate (Greek)

Currently translated at 74.3% (435 of 585 strings)

Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/el/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (134 of 134 strings)

Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/en@pirate/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (182 of 182 strings)

Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/pt_BR/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (182 of 182 strings)

Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (13 of 13 strings)

Translation: Habitica/Rebirth
Translate-URL: https://translate.habitica.com/projects/habitica/rebirth/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (111 of 111 strings)

Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (127 of 127 strings)

Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (197 of 197 strings)

Translation: Habitica/Limited
Translate-URL: https://translate.habitica.com/projects/habitica/limited/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (368 of 368 strings)

Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (203 of 203 strings)

Translation: Habitica/Generic
Translate-URL: https://translate.habitica.com/projects/habitica/generic/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (181 of 181 strings)

Translation: Habitica/Front
Translate-URL: https://translate.habitica.com/projects/habitica/front/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (56 of 56 strings)

Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (724 of 724 strings)

Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (123 of 123 strings)

Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (47 of 47 strings)

Translation: Habitica/Contrib
Translate-URL: https://translate.habitica.com/projects/habitica/contrib/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (104 of 104 strings)

Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/en@pirate/

Translated using Weblate (English (Pirate))

Currently translated at 100.0% (181 of 181 strings)

Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/en@pirate/

migrations/archive/2020/20201229_nye.js

@@ -0,0 +1,126 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20201229_nye';
+import { model as User } from '../../../website/server/models/user';
+import { v4 as uuid } from 'uuid';
+
+const progressCount = 1000;
+let count = 0;
+
+async function updateUser (user) {
+  count++;
+
+  const set = { migration: MIGRATION_NAME };
+  let push;
+
+  if (typeof user.items.gear.owned.head_special_nye2019 !== 'undefined') {
+    set['items.gear.owned.head_special_nye2020'] = false;
+    push = [
+      {
+        type: 'marketGear',
+        path: 'gear.flat.head_special_nye2020',
+        _id: uuid(),
+      },
+    ];
+  } else if (typeof user.items.gear.owned.head_special_nye2018 !== 'undefined') {
+    set['items.gear.owned.head_special_nye2019'] = false;
+    push = [
+      {
+        type: 'marketGear',
+        path: 'gear.flat.head_special_nye2019',
+        _id: uuid(),
+      },
+    ];
+  } else if (typeof user.items.gear.owned.head_special_nye2017 !== 'undefined') {
+    set['items.gear.owned.head_special_nye2018'] = false;
+    push = [
+      {
+        type: 'marketGear',
+        path: 'gear.flat.head_special_nye2018',
+        _id: uuid(),
+      },
+    ];
+  } else if (typeof user.items.gear.owned.head_special_nye2016 !== 'undefined') {
+    set['items.gear.owned.head_special_nye2017'] = false;
+    push = [
+      {
+        type: 'marketGear',
+        path: 'gear.flat.head_special_nye2017',
+        _id: uuid(),
+      },
+    ];
+  } else if (typeof user.items.gear.owned.head_special_nye2015 !== 'undefined') {
+    set['items.gear.owned.head_special_nye2016'] = false;
+    push = [
+      {
+        type: 'marketGear',
+        path: 'gear.flat.head_special_nye2016',
+        _id: uuid(),
+      },
+    ];
+  } else if (typeof user.items.gear.owned.head_special_nye2014 !== 'undefined') {
+    set['items.gear.owned.head_special_nye2015'] = false;
+    push = [
+      {
+        type: 'marketGear',
+        path: 'gear.flat.head_special_nye2015',
+        _id: uuid(),
+      },
+    ];
+  } else if (typeof user.items.gear.owned.head_special_nye !== 'undefined') {
+    set['items.gear.owned.head_special_nye2014'] = false;
+    push = [
+      {
+        type: 'marketGear',
+        path: 'gear.flat.head_special_nye2014',
+        _id: uuid(),
+      },
+    ];
+  } else {
+    set['items.gear.owned.head_special_nye'] = false;
+    push = [
+      {
+        type: 'marketGear',
+        path: 'gear.flat.head_special_nye',
+        _id: uuid(),
+      },
+    ];
+  }
+
+  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+
+  return await User.update({_id: user._id}, {$set: set, $push: {pinnedItems: {$each: push}}}).exec();
+}
+
+export default async function processUsers () {
+  let query = {
+    'auth.timestamps.loggedin': {$gt: new Date('2020-12-01')},
+    migration: {$ne: MIGRATION_NAME},
+  };
+
+  const fields = {
+    _id: 1,
+    items: 1,
+  };
+
+  while (true) { // eslint-disable-line no-constant-condition
+    const users = await User // eslint-disable-line no-await-in-loop
+      .find(query)
+      .limit(250)
+      .sort({_id: 1})
+      .select(fields)
+      .lean()
+      .exec();
+
+    if (users.length === 0) {
+      console.warn('All appropriate users found and modified.');
+      console.warn(`\n${count} users processed\n`);
+      break;
+    } else {
+      query._id = {
+        $gt: users[users.length - 1],
+      };
+    }
+
+    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
+  }
+};

migrations/archive/2021/20210129_habit_birthday.js

@@ -0,0 +1,94 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20210129_habit_birthday';
+import { v4 as uuid } from 'uuid';
+
+import { model as User } from '../../../website/server/models/user';
+
+const progressCount = 1000;
+let count = 0;
+
+async function updateUser (user) {
+  count++;
+
+  const inc = {
+    'items.food.Cake_Skeleton': 1,
+    'items.food.Cake_Base': 1,
+    'items.food.Cake_CottonCandyBlue': 1,
+    'items.food.Cake_CottonCandyPink': 1,
+    'items.food.Cake_Shade': 1,
+    'items.food.Cake_White': 1,
+    'items.food.Cake_Golden': 1,
+    'items.food.Cake_Zombie': 1,
+    'items.food.Cake_Desert': 1,
+    'items.food.Cake_Red': 1,
+    'achievements.habitBirthdays': 1,
+  };
+  const set = {};
+  let push;
+
+  set.migration = MIGRATION_NAME;
+
+  if (typeof user.items.gear.owned.armor_special_birthday2020 !== 'undefined') {
+    set['items.gear.owned.armor_special_birthday2021'] = false;
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2021', _id: uuid()}};
+  } else if (typeof user.items.gear.owned.armor_special_birthday2019 !== 'undefined') {
+    set['items.gear.owned.armor_special_birthday2020'] = false;
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2020', _id: uuid()}};
+  } else if (typeof user.items.gear.owned.armor_special_birthday2018 !== 'undefined') {
+    set['items.gear.owned.armor_special_birthday2019'] = false;
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2019', _id: uuid()}};
+  } else if (typeof user.items.gear.owned.armor_special_birthday2017 !== 'undefined') {
+    set['items.gear.owned.armor_special_birthday2018'] = false;
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2018', _id: uuid()}};
+  } else if (typeof user.items.gear.owned.armor_special_birthday2016 !== 'undefined') {
+    set['items.gear.owned.armor_special_birthday2017'] = false;
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2017', _id: uuid()}};
+  } else if (typeof user.items.gear.owned.armor_special_birthday2015 !== 'undefined') {
+    set['items.gear.owned.armor_special_birthday2016'] = false;
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2016', _id: uuid()}};
+  } else if (typeof user.items.gear.owned.armor_special_birthday !== 'undefined') {
+    set['items.gear.owned.armor_special_birthday2015'] = false;
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2015', _id: uuid()}};
+  } else {
+    set['items.gear.owned.armor_special_birthday'] = false;
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday', _id: uuid()}};
+  }
+
+  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+
+  return await User.update({_id: user._id}, {$inc: inc, $set: set, $push: push}).exec();
+}
+
+export default async function processUsers () {
+  let query = {
+    // migration: {$ne: MIGRATION_NAME},
+    'auth.timestamps.loggedin': {$gt: new Date('2021-01-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],
+      };
+    }
+
+    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
+  }
+};

migrations/archive/2021/20210216_pet_group_achievements.js

@@ -0,0 +1,108 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20210216_pet_group_achievements';
+import { model as User } from '../../../website/server/models/user';
+
+const progressCount = 1000;
+let count = 0;
+
+async function updateUser (user) {
+  count++;
+
+  const set = {
+    migration: MIGRATION_NAME,
+  };
+
+  if (user && user.items && user.items.pets) {
+    const pets = user.items.pets;
+    if (pets['Dragon-Base']
+      && pets['Dragon-CottonCandyBlue']
+      && pets['Dragon-CottonCandyPink']
+      && pets['Dragon-Desert']
+      && pets['Dragon-Golden']
+      && pets['Dragon-Red']
+      && pets['Dragon-Shade']
+      && pets['Dragon-Skeleton']
+      && pets['Dragon-White']
+      && pets['Dragon-Zombie']
+      && pets['FlyingPig-Base']
+      && pets['FlyingPig-CottonCandyBlue']
+      && pets['FlyingPig-CottonCandyPink']
+      && pets['FlyingPig-Desert']
+      && pets['FlyingPig-Golden']
+      && pets['FlyingPig-Red']
+      && pets['FlyingPig-Shade']
+      && pets['FlyingPig-Skeleton']
+      && pets['FlyingPig-White']
+      && pets['FlyingPig-Zombie']
+      && pets['Gryphon-Base']
+      && pets['Gryphon-CottonCandyBlue']
+      && pets['Gryphon-CottonCandyPink']
+      && pets['Gryphon-Desert']
+      && pets['Gryphon-Golden']
+      && pets['Gryphon-Red']
+      && pets['Gryphon-Shade']
+      && pets['Gryphon-Skeleton']
+      && pets['Gryphon-White']
+      && pets['Gryphon-Zombie']
+      && pets['SeaSerpent-Base']
+      && pets['SeaSerpent-CottonCandyBlue']
+      && pets['SeaSerpent-CottonCandyPink']
+      && pets['SeaSerpent-Desert']
+      && pets['SeaSerpent-Golden']
+      && pets['SeaSerpent-Red']
+      && pets['SeaSerpent-Shade']
+      && pets['SeaSerpent-Skeleton']
+      && pets['SeaSerpent-White']
+      && pets['SeaSerpent-Zombie']
+      && pets['Unicorn-Base']
+      && pets['Unicorn-CottonCandyBlue']
+      && pets['Unicorn-CottonCandyPink']
+      && pets['Unicorn-Desert']
+      && pets['Unicorn-Golden']
+      && pets['Unicorn-Red']
+      && pets['Unicorn-Shade']
+      && pets['Unicorn-Skeleton']
+      && pets['Unicorn-White']
+      && pets['Unicorn-Zombie']) {
+        set['achievements.legendaryBestiary'] = true;
+      }
+  }
+
+  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+
+  return await User.update({ _id: user._id }, { $set: set }).exec();
+}
+
+export default async function processUsers () {
+  let query = {
+    migration: { $ne: MIGRATION_NAME },
+    'auth.timestamps.loggedin': { $gt: new Date('2021-02-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
+  }
+};

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.175.8",
+  "version": "4.184.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1365,9 +1365,9 @@
       "integrity": "sha512-FyD2meJpDPjyNQejSjvnhpgI/azsQkA4lGbuu5BQZfjvJ9cbRZXzeWL2HceCekW4lixO9JPesIIQkSoLjeJHNQ=="
     },
     "@sinonjs/commons": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz",
-      "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz",
+      "integrity": "sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==",
       "dev": true,
       "requires": {
         "type-detect": "4.0.8"
@@ -1382,20 +1382,10 @@
         "@sinonjs/commons": "^1.7.0"
       }
     },
-    "@sinonjs/formatio": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-5.0.1.tgz",
-      "integrity": "sha512-KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ==",
-      "dev": true,
-      "requires": {
-        "@sinonjs/commons": "^1",
-        "@sinonjs/samsam": "^5.0.2"
-      }
-    },
     "@sinonjs/samsam": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.0.tgz",
-      "integrity": "sha512-hXpcfx3aq+ETVBwPlRFICld5EnrkexXuXDwqUNhDdr5L8VjvMeSRwyOa0qL7XFmR+jVWR4rUZtnxlG7RX72sBg==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.1.tgz",
+      "integrity": "sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg==",
       "dev": true,
       "requires": {
         "@sinonjs/commons": "^1.6.0",
@@ -1415,23 +1405,13 @@
       "integrity": "sha512-tA7GG7Tj479vojfV3AoxbckalA48aK6giGjNtgH6ihpLwTyHE3fIgRrvt8TWfLwW8X8dyu7vgmAsGLRG7hWWOg=="
     },
     "@slack/webhook": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/@slack/webhook/-/webhook-5.0.3.tgz",
-      "integrity": "sha512-51vnejJ2zABNumPVukOLyerpHQT39/Lt0TYFtOEz/N2X77bPofOgfPj2atB3etaM07mxWHLT9IRJ4Zuqx38DkQ==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@slack/webhook/-/webhook-5.0.4.tgz",
+      "integrity": "sha512-IC1dpVSc2F/pmwCxOb0QzH2xnGKmyT7MofPGhNkeaoiMrLMU+Oc7xV/AxGnz40mURtCtaDchZSM3tDo9c9x6BA==",
       "requires": {
         "@slack/types": "^1.2.1",
         "@types/node": ">=8.9.0",
-        "axios": "^0.19.0"
-      },
-      "dependencies": {
-        "axios": {
-          "version": "0.19.2",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
-          "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
-          "requires": {
-            "follow-redirects": "1.5.10"
-          }
-        }
+        "axios": "^0.21.1"
       }
     },
     "@szmarczak/http-timer": {
@@ -1509,9 +1489,9 @@
       }
     },
     "@types/express-serve-static-core": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.15.tgz",
-      "integrity": "sha512-pb71P0BrBAx7cQE+/7QnA1HTQUkdBKMlkPY7lHUMn0YvPJkL2UA+KW3BdWQ309IT+i9En/qm45ZxpjIcpgEhNQ==",
+      "version": "4.17.17",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.17.tgz",
+      "integrity": "sha512-YYlVaCni5dnHc+bLZfY908IG1+x5xuibKZMGv8srKkvtul3wUuanYvpIj9GXXoWkQbaAdR+kgX46IETKUALWNQ==",
       "requires": {
         "@types/node": "*",
         "@types/qs": "*",
@@ -1773,9 +1753,9 @@
       }
     },
     "apidoc": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/apidoc/-/apidoc-0.25.0.tgz",
-      "integrity": "sha512-5g9fp8OffXZOdBTzm4BBvV5Vw54s+NmKnGZIUKuH+gRTqqJuRJpcGN6sz6WnjJ+NcvXhB7rIRp6FhtJahazx2Q==",
+      "version": "0.26.0",
+      "resolved": "https://registry.npmjs.org/apidoc/-/apidoc-0.26.0.tgz",
+      "integrity": "sha512-IEw/Z7HMMbjeVjK2sZvZSwAln8AqalLzf3qLDtkcedXVhdxGm6W7UgIW6fshegqNTMLzm8CFEMi4Lxbeu0xKTw==",
       "requires": {
         "apidoc-core": "^0.12.0",
         "commander": "^2.20.0",
@@ -1795,15 +1775,10 @@
             "uc.micro": "^1.0.1"
           }
         },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
-        },
         "markdown-it": {
-          "version": "11.0.0",
-          "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-11.0.0.tgz",
-          "integrity": "sha512-+CvOnmbSubmQFSA9dKz1BRiaSMV7rhexl3sngKqFyXSagoA3fBdJQ8oZWtRy2knXdpDXaBw44euz37DeJQ9asg==",
+          "version": "11.0.1",
+          "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-11.0.1.tgz",
+          "integrity": "sha512-aU1TzmBKcWNNYvH9pjq6u92BML+Hz3h5S/QpfTFwiQF852pLT+9qHsrhM9JYipkOXZxGn+sGH8oyJE9FD9WezQ==",
           "requires": {
             "argparse": "^1.0.7",
             "entities": "~2.0.0",
@@ -1827,15 +1802,13 @@
         "semver": "~7.3.2"
       },
       "dependencies": {
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
-        },
         "semver": {
-          "version": "7.3.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="
+          "version": "7.3.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
         }
       }
     },
@@ -1857,23 +1830,13 @@
       }
     },
     "apple-auth": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/apple-auth/-/apple-auth-1.0.6.tgz",
-      "integrity": "sha512-dICsYIHBTX+7/1xdJZ4y4U08zOxEnL67GQ77l/HSKqEx9uC1wsY5dNjgbZf2F/1QnzAxDbAAHo0DgUCrA1k7zQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/apple-auth/-/apple-auth-1.0.7.tgz",
+      "integrity": "sha512-vfJqy4KtT5KHflxBSemc0mkWuy2GU2wHWaZ6xVWUjPmiXkJcLj5jB3IeCbDLF4wN+ZStjOQXZWfGwccBjclVlA==",
       "requires": {
-        "axios": "^0.19.0",
+        "axios": "^0.21.1",
         "express": "^4.17.1",
         "jsonwebtoken": "^8.5.1"
-      },
-      "dependencies": {
-        "axios": {
-          "version": "0.19.2",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
-          "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
-          "requires": {
-            "follow-redirects": "1.5.10"
-          }
-        }
       }
     },
     "aproba": {
@@ -2177,17 +2140,17 @@
       "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="
     },
     "axios": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz",
-      "integrity": "sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==",
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
       "requires": {
         "follow-redirects": "^1.10.0"
       },
       "dependencies": {
         "follow-redirects": {
-          "version": "1.13.0",
-          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
-          "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz",
+          "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="
         }
       }
     },
@@ -4042,9 +4005,9 @@
       }
     },
     "csv-stringify": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-5.5.3.tgz",
-      "integrity": "sha512-JKG8vIHpWPzdilp2SAmvjmAiIhD+XGKGdhZBGi8QIECgJAsFr7k5CmJIW2QkSxBBsctvmojM25s+UINzQ5NLTg=="
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-5.6.1.tgz",
+      "integrity": "sha512-JlQlNZMiuRGSFbLXFNGoBtsORXlkqf4Dfq8Ee0Jo4RVJj3YAUzevagUx24mDrQJLDF7aYz6Ne8kqA8WWBaYt2A=="
     },
     "currently-unhandled": {
       "version": "0.4.1",
@@ -5909,29 +5872,6 @@
       "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
       "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
     },
-    "follow-redirects": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
-      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
-      "requires": {
-        "debug": "=3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -7232,9 +7172,9 @@
       "dev": true
     },
     "helmet": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/helmet/-/helmet-4.2.0.tgz",
-      "integrity": "sha512-aoiSxXMd0ks1ojYpSCFoCRzgv4rY/uB9jKStaw8PkXwsdLYa/Gq+Nc5l0soH0cwBIsLAlujPnx4HLQs+LaXCrQ=="
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/helmet/-/helmet-4.4.1.tgz",
+      "integrity": "sha512-G8tp0wUMI7i8wkMk2xLcEvESg5PiCitFMYgGRc/PwULB0RVhTP5GFdxOwvJwp9XVha8CuS8mnhmE8I/8dx/pbw=="
     },
     "hex2dec": {
       "version": "1.1.2",
@@ -8226,12 +8166,19 @@
       }
     },
     "jsonfile": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
-      "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "requires": {
         "graceful-fs": "^4.1.6",
-        "universalify": "^1.0.0"
+        "universalify": "^2.0.0"
+      },
+      "dependencies": {
+        "universalify": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
+        }
       }
     },
     "jsonwebtoken": {
@@ -8310,12 +8257,12 @@
       }
     },
     "jwks-rsa": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-1.12.0.tgz",
-      "integrity": "sha512-6zKwlhnGQo+KivArZQThGoxrliRZgyC8s6yXDFSNRiMEVm+4jv07nBkVPFoaN/rEX0b47GKm5MSyBmuzGjj6wg==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-1.12.2.tgz",
+      "integrity": "sha512-6gPo/mQUxXJt75oPtjhM3Jm3FSXnmwg73QDA8dpgP7YmIKlIY+2StngFxt4w4Y1podtSbtV3jttNOdctuxAX1Q==",
       "requires": {
         "@types/express-jwt": "0.0.42",
-        "axios": "^0.19.2",
+        "axios": "^0.21.1",
         "debug": "^4.1.0",
         "http-proxy-agent": "^4.0.1",
         "https-proxy-agent": "^5.0.0",
@@ -8324,16 +8271,6 @@
         "lru-memoizer": "^2.1.2",
         "ms": "^2.1.2",
         "proxy-from-env": "^1.1.0"
-      },
-      "dependencies": {
-        "axios": {
-          "version": "0.19.2",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
-          "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
-          "requires": {
-            "follow-redirects": "1.5.10"
-          }
-        }
       }
     },
     "jws": {
@@ -8678,9 +8615,9 @@
       }
     },
     "lru-memoizer": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.3.tgz",
-      "integrity": "sha512-DcAptVUrKHbyKfSpvthwHwD42bFBLSAhTXJf5PQunu4F0/Hzy41WTamvavUWqsOPps26D0l5534aFvcwEcYzDw==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.4.tgz",
+      "integrity": "sha512-IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==",
       "requires": {
         "lodash.clonedeep": "^4.5.0",
         "lru-cache": "~4.0.0"
@@ -9371,16 +9308,16 @@
       }
     },
     "mongoose": {
-      "version": "5.11.8",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.11.8.tgz",
-      "integrity": "sha512-RRfrYLg7pyuyx7xu5hwadjIZZJB9W2jqIMkL1CkTmk/uOCX3MX2tl4BVIi2rJUtgMNwn6dy3wBD3soB8I9Nlog==",
+      "version": "5.11.13",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.11.13.tgz",
+      "integrity": "sha512-rXbaxSJfLnKKO2RTm8MKt65glrtfKDc4ATEb6vEbbzsVGCiLut753K5axdpyvE7KeTH7GOh4LzmuQLOvaaWOmA==",
       "requires": {
         "@types/mongodb": "^3.5.27",
         "bson": "^1.1.4",
         "kareem": "2.3.2",
         "mongodb": "3.6.3",
         "mongoose-legacy-pluralize": "1.0.2",
-        "mpath": "0.8.1",
+        "mpath": "0.8.3",
         "mquery": "3.2.3",
         "ms": "2.1.2",
         "regexp-clone": "1.0.0",
@@ -9557,9 +9494,9 @@
       }
     },
     "mpath": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.8.1.tgz",
-      "integrity": "sha512-norEinle9aFc05McBawVPwqgFZ7npkts9yu17ztIVLwPwO9rq0OTp89kGVTqvv5rNLMz96E5iWHpVORjI411vA=="
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.8.3.tgz",
+      "integrity": "sha512-eb9rRvhDltXVNL6Fxd2zM9D4vKBxjVVQNLNijlj7uoXUy19zNDsIif5zR+pWmPCWNKwAtqyo4JveQm4nfD5+eA=="
     },
     "mquery": {
       "version": "3.2.3",
@@ -9638,9 +9575,9 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
     },
     "nconf": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/nconf/-/nconf-0.11.0.tgz",
-      "integrity": "sha512-c4W7QqYF6p5BC7J/eVTOvtUlQgvS5CgbJ11xgjhSr8yyius7km7xgdIYHkFLR4TWY1HjsFkia/3l5OprGqCHvA==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/nconf/-/nconf-0.11.1.tgz",
+      "integrity": "sha512-2XY+7x3GwkkTnmkEVxsKykg0GUqCAtBZUA87FwbcUSaYBfaGCeVSf+82zap16j93B21J2AhpxrsF57jio36t0w==",
       "requires": {
         "async": "^1.4.0",
         "ini": "^1.3.0",
@@ -9718,9 +9655,9 @@
           "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg=="
         },
         "yargs": {
-          "version": "16.1.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.1.1.tgz",
-          "integrity": "sha512-hAD1RcFP/wfgfxgMVswPE+z3tlPFtxG8/yWUrG2i17sTWGCGqWnxKcLTF4cUKDUK8fzokwsmO9H0TDkRbMHy8w==",
+          "version": "16.2.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
           "requires": {
             "cliui": "^7.0.2",
             "escalade": "^3.1.1",
@@ -11173,9 +11110,9 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "rate-limiter-flexible": {
-      "version": "2.1.15",
-      "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.1.15.tgz",
-      "integrity": "sha512-vIU5X20id7objPJ4lQh05Pd9C4qZ4i/K2xY07kHJ0suzsOjBGv43VozrbqRRCJ5TpmRXcGP/yNlwgehzL80wvQ=="
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.2.1.tgz",
+      "integrity": "sha512-rxCP6kDDdn0cZmVqVlF06yLU+mG3TuwaHV/fUIw3OQyYhza7pzVBtdMhUmfXbBzMS+O464XP+x33pfTDGRGYVA=="
     },
     "raw-body": {
       "version": "2.4.0",
@@ -11709,9 +11646,9 @@
       "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
     },
     "run-rs": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/run-rs/-/run-rs-0.7.3.tgz",
-      "integrity": "sha512-/JmHX4rhHNeLn+F/RqhPwYUmcnbX2Qjm8g77flhKbL6Ak9wpyq+d/a87qb1nBR72r15LT0IRf87sbLWZ/x39QA==",
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/run-rs/-/run-rs-0.7.4.tgz",
+      "integrity": "sha512-6VP6zOPvl6uiC+Qe+yXY0G5BbLcelO6lhkMlAuM+syOSUIsiI2mQB2NBhqv1g1I0k8bPQ2KgIa4qe6nTuXYU+g==",
       "dev": true,
       "requires": {
         "chalk": "2.4.1",
@@ -12041,15 +11978,14 @@
       }
     },
     "sinon": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.2.tgz",
-      "integrity": "sha512-9Owi+RisvCZpB0bdOVFfL314I6I4YoRlz6Isi4+fr8q8YQsDPoCe5UnmNtKHRThX3negz2bXHWIuiPa42vM8EQ==",
+      "version": "9.2.4",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz",
+      "integrity": "sha512-zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg==",
       "dev": true,
       "requires": {
         "@sinonjs/commons": "^1.8.1",
         "@sinonjs/fake-timers": "^6.0.1",
-        "@sinonjs/formatio": "^5.0.1",
-        "@sinonjs/samsam": "^5.3.0",
+        "@sinonjs/samsam": "^5.3.1",
         "diff": "^4.0.2",
         "nise": "^4.0.4",
         "supports-color": "^7.1.0"
@@ -12734,18 +12670,18 @@
       }
     },
     "stripe": {
-      "version": "8.129.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.129.0.tgz",
-      "integrity": "sha512-73b49GQg2+ig6Cet11QhN1WgBab+2xtHy57W4ZLRd9dq146vz+vik+kMQ7UAcTSF5vYyTM5Zo6POMZDPXqzWUg==",
+      "version": "8.132.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.132.0.tgz",
+      "integrity": "sha512-VFKQJWgPt2X0r/jh4wS6Kgx6/VH1IHw1466wIwahgWzgSANme5iNaJ+1AW45hvRUZJ+T15f2hTfQkQGyP73ZCg==",
       "requires": {
         "@types/node": ">=8.1.0",
         "qs": "^6.6.0"
       },
       "dependencies": {
         "qs": {
-          "version": "6.9.4",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
-          "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="
+          "version": "6.9.6",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz",
+          "integrity": "sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="
         }
       }
     },

package.json

@@ -1,26 +1,26 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.175.8",
+  "version": "4.184.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.12.10",
     "@babel/preset-env": "^7.12.11",
     "@babel/register": "^7.12.10",
     "@google-cloud/trace-agent": "^5.1.1",
-    "@slack/webhook": "^5.0.3",
     "@parse/node-apn": "^4.0.0",
+    "@slack/webhook": "^5.0.4",
     "accepts": "^1.3.5",
     "amazon-payments": "^0.2.8",
     "amplitude": "^5.1.4",
-    "apidoc": "^0.25.0",
-    "apple-auth": "^1.0.6",
+    "apidoc": "^0.26.0",
+    "apple-auth": "^1.0.7",
     "bcrypt": "^5.0.0",
     "body-parser": "^1.18.3",
     "compression": "^1.7.4",
     "cookie-session": "^1.4.0",
     "coupon-code": "^0.4.5",
-    "csv-stringify": "^5.5.3",
+    "csv-stringify": "^5.6.1",
     "cwait": "^1.1.1",
     "domain-middleware": "~0.1.0",
     "eslint": "^6.8.0",
@@ -37,20 +37,20 @@
     "gulp-nodemon": "^2.5.0",
     "gulp.spritesmith": "^6.9.0",
     "habitica-markdown": "^3.0.0",
-    "helmet": "^4.2.0",
+    "helmet": "^4.4.1",
     "image-size": "^0.9.3",
     "in-app-purchase": "^1.11.3",
     "js2xmlparser": "^4.0.1",
     "jsonwebtoken": "^8.5.1",
-    "jwks-rsa": "^1.12.0",
+    "jwks-rsa": "^1.12.2",
     "lodash": "^4.17.20",
     "merge-stream": "^2.0.0",
     "method-override": "^3.0.0",
     "moment": "^2.29.1",
     "moment-recur": "^1.0.7",
-    "mongoose": "^5.11.8",
+    "mongoose": "^5.11.13",
     "morgan": "^1.10.0",
-    "nconf": "^0.11.0",
+    "nconf": "^0.11.1",
     "node-gcm": "^1.0.3",
     "on-headers": "^1.0.2",
     "passport": "^0.4.1",
@@ -60,13 +60,13 @@
     "paypal-rest-sdk": "^1.8.1",
     "pp-ipn": "^1.1.0",
     "ps-tree": "^1.0.0",
-    "rate-limiter-flexible": "^2.1.15",
+    "rate-limiter-flexible": "^2.2.1",
     "redis": "^3.0.2",
     "regenerator-runtime": "^0.13.7",
     "remove-markdown": "^0.3.0",
     "rimraf": "^3.0.2",
     "short-uuid": "^4.1.0",
-    "stripe": "^8.129.0",
+    "stripe": "^8.132.0",
     "superagent": "^6.1.0",
     "universal-analytics": "^0.4.23",
     "useragent": "^2.1.9",
@@ -109,7 +109,7 @@
     "apidoc": "gulp apidoc"
   },
   "devDependencies": {
-    "axios": "^0.21.0",
+    "axios": "^0.21.1",
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
     "chai-moment": "^0.1.0",
@@ -120,8 +120,8 @@
     "mocha": "^5.1.1",
     "monk": "^7.3.2",
     "require-again": "^2.0.0",
-    "run-rs": "^0.7.3",
-    "sinon": "^9.2.2",
+    "run-rs": "^0.7.4",
+    "sinon": "^9.2.4",
     "sinon-chai": "^3.5.0",
     "sinon-stub-promise": "^4.0.0"
   },

test/api/unit/libs/payments/group-plans/group-payments-create.test.js

@@ -22,9 +22,7 @@ describe('Purchasing a group plan for group', () => {
 
   let plan; let group; let user; let
     data;
-  const stripe = stripeModule('test', {
-    apiVersion: '2020-08-27',
-  });
+  const stripe = stripeModule('test');
   const groupLeaderName = 'sender';
   const groupName = 'test group';
 

test/api/unit/libs/payments/payments.test.js

@@ -269,7 +269,7 @@ describe('payments/index', () => {
       context('Active Promotion', () => {
         beforeEach(() => {
           sinon.stub(worldState, 'getCurrentEvent').returns({
-            ...common.content.events.winter2021,
+            ...common.content.events.winter2021Promo,
             event: 'winter2021',
           });
         });

test/api/unit/libs/payments/stripe/checkout.test.js

@@ -17,9 +17,7 @@ import * as gems from '../../../../../../website/server/libs/payments/gems';
 const { i18n } = common;
 
 describe('Stripe - Checkout', () => {
-  const stripe = stripeModule('test', {
-    apiVersion: '2020-08-27',
-  });
+  const stripe = stripeModule('test');
   const BASE_URL = nconf.get('BASE_URL');
   const redirectUrls = {
     success_url: `${BASE_URL}/redirect/stripe-success-checkout`,

test/api/unit/libs/payments/stripe/subscriptions.test.js

@@ -236,9 +236,7 @@ describe('Stripe - Subscriptions', () => {
   });
 
   describe('handlePaymentMethodChange', () => {
-    const stripe = stripeModule('test', {
-      apiVersion: '2020-08-27',
-    });
+    const stripe = stripeModule('test');
 
     it('updates the plan quantity based on the number of group members', async () => {
       const stripeIntentRetrieveStub = sandbox.stub(stripe.setupIntents, 'retrieve').resolves({
@@ -259,9 +257,7 @@ describe('Stripe - Subscriptions', () => {
   });
 
   describe('chargeForAdditionalGroupMember', () => {
-    const stripe = stripeModule('test', {
-      apiVersion: '2020-08-27',
-    });
+    const stripe = stripeModule('test');
     let stripeUpdateSubStub;
     const plan = common.content.subscriptionBlocks['group_monthly']; // eslint-disable-line dot-notation
 
@@ -302,9 +298,7 @@ describe('Stripe - Subscriptions', () => {
 
   describe('cancelSubscription', () => {
     const subKey = 'basic_3mo';
-    const stripe = stripeModule('test', {
-      apiVersion: '2020-08-27',
-    });
+    const stripe = stripeModule('test');
     let user; let groupId; let
       group;
 

test/api/unit/libs/payments/stripe/webhooks.test.js

@@ -16,9 +16,7 @@ import * as subscriptions from '../../../../../../website/server/libs/payments/s
 const { i18n } = common;
 
 describe('Stripe - Webhooks', () => {
-  const stripe = stripeModule('test', {
-    apiVersion: '2020-08-27',
-  });
+  const stripe = stripeModule('test');
   const endpointSecret = nconf.get('STRIPE_WEBHOOKS_ENDPOINT_SECRET');
   const headers = {};
   const body = {};

test/api/v3/integration/tasks/POST-tasks_user.test.js

@@ -8,9 +8,14 @@ import {
 
 describe('POST /tasks/user', () => {
   let user;
+  let tzoffset;
+
+  before(async () => {
+    tzoffset = new Date().getTimezoneOffset();
+  });
 
   beforeEach(async () => {
-    user = await generateUser();
+    user = await generateUser({ 'preferences.timezoneOffset': tzoffset });
   });
 
   context('validates params', async () => {
@@ -544,7 +549,7 @@ describe('POST /tasks/user', () => {
       expect(task.everyX).to.eql(5);
       expect(task.daysOfMonth).to.eql([15]);
       expect(task.weeksOfMonth).to.eql([3]);
-      expect(new Date(task.startDate)).to.eql(now);
+      expect(new Date(task.startDate)).to.eql(new Date(now.setHours(0, 0, 0, 0)));
       expect(task.isDue).to.be.true;
       expect(task.nextDue.length).to.eql(6);
     });

test/api/v3/integration/tasks/PUT-tasks_id.test.js

@@ -10,9 +10,14 @@ import {
 
 describe('PUT /tasks/:id', () => {
   let user;
+  let tzoffset;
+
+  before(async () => {
+    tzoffset = (new Date()).getTimezoneOffset();
+  });
 
   beforeEach(async () => {
-    user = await generateUser();
+    user = await generateUser({ 'preferences.timezoneOffset': tzoffset });
   });
 
   context('validates params', () => {
@@ -503,7 +508,8 @@ describe('PUT /tasks/:id', () => {
     let monthly;
 
     beforeEach(async () => {
-      const date1 = moment.utc('2020-07-01').toDate();
+      // using date literals is discouraged here, daylight savings will break everything
+      const date1 = moment().toDate();
       monthly = await user.post('/tasks/user', {
         text: 'test monthly',
         type: 'daily',
@@ -514,7 +520,7 @@ describe('PUT /tasks/:id', () => {
     });
 
     it('updates days of month when start date updated', async () => {
-      const date2 = moment.utc('2020-07-01').toDate();
+      const date2 = moment().add(6, 'months').toDate();
       const savedMonthly = await user.put(`/tasks/${monthly._id}`, {
         startDate: date2,
       });
@@ -523,18 +529,30 @@ describe('PUT /tasks/:id', () => {
     });
 
     it('updates next due when start date updated', async () => {
-      const date2 = moment.utc('2022-07-01').toDate();
+      const date2 = moment().add(6, 'months').toDate();
       const savedMonthly = await user.put(`/tasks/${monthly._id}`, {
         startDate: date2,
       });
 
       expect(savedMonthly.nextDue.length).to.eql(6);
-      expect(moment(savedMonthly.nextDue[0]).toDate()).to.eql(moment.utc('2022-08-01').toDate());
-      expect(moment(savedMonthly.nextDue[1]).toDate()).to.eql(moment.utc('2022-09-01').toDate());
-      expect(moment(savedMonthly.nextDue[2]).toDate()).to.eql(moment.utc('2022-10-01').toDate());
-      expect(moment(savedMonthly.nextDue[3]).toDate()).to.eql(moment.utc('2022-11-01').toDate());
-      expect(moment(savedMonthly.nextDue[4]).toDate()).to.eql(moment.utc('2022-12-01').toDate());
-      expect(moment(savedMonthly.nextDue[5]).toDate()).to.eql(moment.utc('2023-01-01').toDate());
+      expect(moment(savedMonthly.nextDue[0]).toDate()).to.eql(
+        moment(date2).add(1, 'months').startOf('day').toDate(),
+      );
+      expect(moment(savedMonthly.nextDue[1]).toDate()).to.eql(
+        moment(date2).add(2, 'months').startOf('day').toDate(),
+      );
+      expect(moment(savedMonthly.nextDue[2]).toDate()).to.eql(
+        moment(date2).add(3, 'months').startOf('day').toDate(),
+      );
+      expect(moment(savedMonthly.nextDue[3]).toDate()).to.eql(
+        moment(date2).add(4, 'months').startOf('day').toDate(),
+      );
+      expect(moment(savedMonthly.nextDue[4]).toDate()).to.eql(
+        moment(date2).add(5, 'months').startOf('day').toDate(),
+      );
+      expect(moment(savedMonthly.nextDue[5]).toDate()).to.eql(
+        moment(date2).add(6, 'months').startOf('day').toDate(),
+      );
     });
   });
 

test/api/v3/integration/tasks/challenges/POST-tasks_challenge_id.test.js

@@ -11,13 +11,18 @@ describe('POST /tasks/challenge/:challengeId', () => {
   let user;
   let guild;
   let challenge;
+  let tzoffset;
 
   function findUserChallengeTask (memberTask) {
     return memberTask.challenge.id === challenge._id;
   }
 
+  before(async () => {
+    tzoffset = new Date().getTimezoneOffset();
+  });
+
   beforeEach(async () => {
-    user = await generateUser({ balance: 1 });
+    user = await generateUser({ balance: 1, 'preferences.timezoneOffset': tzoffset });
     guild = await generateGroup(user);
     challenge = await generateChallenge(user, guild);
     await user.post(`/challenges/${challenge._id}/join`);
@@ -165,7 +170,7 @@ describe('POST /tasks/challenge/:challengeId', () => {
     expect(task.type).to.eql('daily');
     expect(task.frequency).to.eql('daily');
     expect(task.everyX).to.eql(5);
-    expect(new Date(task.startDate)).to.eql(now);
+    expect(new Date(task.startDate)).to.eql(new Date(now.setHours(0, 0, 0, 0)));
 
     expect(userChallengeTask.notes).to.eql(task.notes);
   });

test/api/v3/integration/tasks/challenges/PUT-tasks_challenge_challengeId.test.js

@@ -12,7 +12,7 @@ describe('PUT /tasks/:id', () => {
   let challenge;
 
   before(async () => {
-    user = await generateUser();
+    user = await generateUser({ 'preferences.timezoneOffset': new Date().getTimezoneOffset() });
     guild = await generateGroup(user);
     challenge = await generateChallenge(user, guild);
     await user.post(`/challenges/${challenge._id}/join`);

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

@@ -8,12 +8,18 @@ import {
 describe('POST /tasks/group/:groupid', () => {
   let user; let guild; let
     manager;
+  let tzoffset;
   const groupName = 'Test Public Guild';
   const groupType = 'guild';
 
+  before(async () => {
+    tzoffset = new Date().getTimezoneOffset();
+  });
+
   beforeEach(async () => {
-    user = await generateUser({ balance: 1 });
+    //  user = await generateUser({ balance: 1, 'preferences.timezoneOffset': tzoffset });
     const { group, groupLeader, members } = await createAndPopulateGroup({
+      leaderDetails: { balance: 10, 'preferences.timezoneOffset': tzoffset },
       groupDetails: {
         name: groupName,
         type: groupType,
@@ -128,7 +134,7 @@ describe('POST /tasks/group/:groupid', () => {
     expect(task.type).to.eql('daily');
     expect(task.frequency).to.eql('daily');
     expect(task.everyX).to.eql(5);
-    expect(new Date(task.startDate)).to.eql(now);
+    expect(new Date(task.startDate)).to.eql(new Date(now.setHours(0, 0, 0, 0)));
   });
 
   it('allows a manager to add a group task', async () => {

test/api/v3/integration/user/POST-move-pinned-item.js

@@ -3,15 +3,15 @@ import {
 } from '../../../../helpers/api-integration/v3';
 
 import getOfficialPinnedItems from '../../../../../website/common/script/libs/getOfficialPinnedItems';
+import content from '../../../../../website/common/script/content';
 
 describe('POST /user/move-pinned-item/:path/move/to/:position', () => {
   let user;
-  let officialPinnedItems;
   let officialPinnedItemPaths;
 
   beforeEach(async () => {
     user = await generateUser();
-    officialPinnedItems = getOfficialPinnedItems(user);
+    const officialPinnedItems = getOfficialPinnedItems(user);
 
     officialPinnedItemPaths = [];
     // officialPinnedItems are returned in { type: ..., path:... } format
@@ -83,7 +83,7 @@ describe('POST /user/move-pinned-item/:path/move/to/:position', () => {
     expect(res).to.eql(expectedResponse);
   });
 
-  it('adjusts the order of pinned items with order mismatch', async () => {
+  it('adjusts the order of pinned items with order mismatch - existing item in order', async () => {
     const testPinnedItems = [
       { type: 'card', path: 'cardTypes.thankyou' },
       { type: 'card', path: 'cardTypes.greeting' },
@@ -125,6 +125,95 @@ describe('POST /user/move-pinned-item/:path/move/to/:position', () => {
     expect(res).to.eql(expectedResponse);
   });
 
+  it('adjusts the order of pinned items with order mismatch - not existing in order', async () => {
+    const testPinnedItems = [
+      { type: 'card', path: 'cardTypes.thankyou' },
+      { type: 'card', path: 'cardTypes.greeting' },
+      { type: 'potion', path: 'potion' },
+      { type: 'armoire', path: 'armoire' },
+    ];
+
+    const testPinnedItemsOrder = [
+      'armoire',
+      'potion',
+    ];
+
+    await user.update({
+      pinnedItems: testPinnedItems,
+      pinnedItemsOrder: testPinnedItemsOrder,
+    });
+    await user.sync();
+
+    await user.post('/user/move-pinned-item/cardTypes.greeting/move/to/2');
+    await user.sync();
+
+    // The basic test
+    expect(user.pinnedItemsOrder[2]).to.equal('cardTypes.greeting');
+
+    // potion is now the last item because the 2 unacounted for cards show up
+    // at the beginning of the order
+    expect(user.pinnedItemsOrder[user.pinnedItemsOrder.length - 1]).to.equal('potion');
+  });
+
+  it('adjusts the order of official pinned items with order mismatch - not existing in order', async () => {
+    const testPinnedItems = [
+      { type: 'card', path: 'cardTypes.thankyou' },
+      { type: 'card', path: 'cardTypes.greeting' },
+      { type: 'potion', path: 'potion' },
+    ];
+
+    const testPinnedItemsOrder = [
+      'potion',
+    ];
+
+    const { officialPinnedItems } = content;
+
+    // add item to pinned
+    officialPinnedItems.push({ type: 'armoire', path: 'armoire' });
+
+    await user.update({
+      pinnedItems: testPinnedItems,
+      pinnedItemsOrder: testPinnedItemsOrder,
+    });
+    await user.sync();
+
+    await user.post('/user/move-pinned-item/armoire/move/to/2');
+    await user.sync();
+
+    // The basic test
+    expect(user.pinnedItemsOrder[2]).to.equal('armoire');
+
+    // potion is now the last item because the 2 unacounted for cards show up
+    // at the beginning of the order
+    expect(user.pinnedItemsOrder[user.pinnedItemsOrder.length - 1]).to.equal('potion');
+  });
+
+  it('adjusts the order of pinned items with order mismatch - not existing - out of length', async () => {
+    const testPinnedItems = [
+      { type: 'card', path: 'cardTypes.thankyou' },
+      { type: 'card', path: 'cardTypes.greeting' },
+      { type: 'potion', path: 'potion' },
+      { type: 'armoire', path: 'armoire' },
+    ];
+
+    const testPinnedItemsOrder = [
+      'armoire',
+      'potion',
+    ];
+
+    await user.update({
+      pinnedItems: testPinnedItems,
+      pinnedItemsOrder: testPinnedItemsOrder,
+    });
+    await user.sync();
+
+    await user.post('/user/move-pinned-item/cardTypes.greeting/move/to/33');
+    await user.sync();
+
+    // since the target was out of bounce it added it to the last item
+    expect(user.pinnedItemsOrder[user.pinnedItemsOrder.length - 1]).to.equal('cardTypes.greeting');
+  });
+
   it('cannot move pinned item that you do not have pinned', async () => {
     const testPinnedItems = [
       { type: 'potion', path: 'potion' },

test/common/ops/hatch.js

@@ -169,7 +169,6 @@ describe('shared.ops.hatch', () => {
 
       it('awards Back to Basics achievement', () => {
         user.items.pets = {
-          'Wolf-Base': 5,
           'TigerCub-Base': 5,
           'PandaCub-Base': 10,
           'LionCub-Base': 5,
@@ -180,14 +179,13 @@ describe('shared.ops.hatch', () => {
           'BearCub-Base': 5,
         };
         user.items.eggs = { Wolf: 1 };
-        user.items.hatchingPotions = { Spooky: 1 };
-        hatch(user, { params: { egg: 'Wolf', hatchingPotion: 'Spooky' } });
+        user.items.hatchingPotions = { Base: 1 };
+        hatch(user, { params: { egg: 'Wolf', hatchingPotion: 'Base' } });
         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,
@@ -198,8 +196,8 @@ describe('shared.ops.hatch', () => {
           'BearCub-Desert': 5,
         };
         user.items.eggs = { Wolf: 1 };
-        user.items.hatchingPotions = { Spooky: 1 };
-        hatch(user, { params: { egg: 'Wolf', hatchingPotion: 'Spooky' } });
+        user.items.hatchingPotions = { Desert: 1 };
+        hatch(user, { params: { egg: 'Wolf', hatchingPotion: 'Desert' } });
         expect(user.achievements.dustDevil).to.eql(true);
       });
 

website/client/package.json

@@ -13,38 +13,38 @@
     "storybook:serve": "vue-cli-service storybook:serve -p 6006 -c config/storybook"
   },
   "dependencies": {
-    "@storybook/addon-actions": "^5.3.19",
-    "@storybook/addon-knobs": "^5.3.19",
-    "@storybook/addon-links": "^5.3.19",
+    "@storybook/addon-actions": "^6.1.15",
+    "@storybook/addon-knobs": "^6.1.15",
+    "@storybook/addon-links": "^6.1.15",
     "@storybook/addon-notes": "^5.3.21",
-    "@storybook/vue": "^5.3.19",
-    "@vue/cli-plugin-babel": "^4.5.9",
-    "@vue/cli-plugin-eslint": "^4.5.9",
-    "@vue/cli-plugin-router": "^4.5.9",
-    "@vue/cli-plugin-unit-mocha": "^4.5.9",
-    "@vue/cli-service": "^4.5.9",
+    "@storybook/vue": "^6.1.15",
+    "@vue/cli-plugin-babel": "^4.5.11",
+    "@vue/cli-plugin-eslint": "^4.5.11",
+    "@vue/cli-plugin-router": "^4.5.11",
+    "@vue/cli-plugin-unit-mocha": "^4.5.11",
+    "@vue/cli-service": "^4.5.11",
     "@vue/test-utils": "1.0.0-beta.29",
-    "amplitude-js": "^7.3.3",
-    "axios": "^0.21.0",
+    "amplitude-js": "^7.4.1",
+    "axios": "^0.21.1",
     "axios-progress-bar": "^1.2.0",
     "babel-eslint": "^10.1.0",
     "bootstrap": "^4.5.3",
-    "bootstrap-vue": "^2.21.1",
+    "bootstrap-vue": "^2.21.2",
     "chai": "^4.1.2",
-    "core-js": "^3.8.1",
+    "core-js": "^3.8.3",
     "eslint": "^6.8.0",
     "eslint-config-habitrpg": "^6.2.0",
     "eslint-plugin-mocha": "^5.3.0",
     "eslint-plugin-vue": "^6.2.2",
     "habitica-markdown": "^3.0.0",
     "hellojs": "^1.18.6",
-    "inspectpack": "^4.5.2",
+    "inspectpack": "^4.6.1",
     "intro.js": "^2.9.3",
     "jquery": "^3.5.1",
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
-    "nconf": "^0.11.0",
-    "sass": "^1.30.0",
+    "nconf": "^0.11.1",
+    "sass": "^1.32.5",
     "sass-loader": "^8.0.2",
     "smartbanner.js": "^1.16.0",
     "svg-inline-loader": "^0.8.2",
@@ -54,12 +54,12 @@
     "uuid": "^8.3.2",
     "validator": "^13.5.2",
     "vue": "^2.6.12",
-    "vue-cli-plugin-storybook": "^0.6.1",
+    "vue-cli-plugin-storybook": "^2.0.0",
     "vue-mugen-scroll": "^0.2.6",
     "vue-router": "^3.4.9",
     "vue-template-compiler": "^2.6.12",
     "vuedraggable": "^2.24.3",
     "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0",
-    "webpack": "^4.44.2"
+    "webpack": "^4.46.0"
   }
 }

website/client/src/assets/css/sprites/spritesmith-main-0.css

@@ -1,48 +1,48 @@
 .achievement-alien {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1659px -1480px;
+  background-position: -1671px -1480px;
   width: 24px;
   height: 26px;
 }
 .achievement-alien2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -480px -1549px;
+  background-position: -529px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-allThatGlitters2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -812px -1480px;
+  background-position: -873px -1480px;
   width: 64px;
   height: 56px;
 }
 .achievement-allYourBase2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -877px -1480px;
+  background-position: -938px -1480px;
   width: 64px;
   height: 56px;
 }
 .achievement-alpha2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -529px -1549px;
+  background-position: -578px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-aridAuthority2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -942px -1480px;
+  background-position: -1003px -1480px;
   width: 64px;
   height: 56px;
 }
 .achievement-armor2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -578px -1549px;
+  background-position: -627px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-backToBasics2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1267px -1480px;
+  background-position: -1328px -1480px;
   width: 48px;
   height: 56px;
 }
@@ -54,31 +54,31 @@
 }
 .achievement-bewilder2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -627px -1549px;
+  background-position: -676px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-birthday2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -676px -1549px;
+  background-position: -725px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-boneCollector2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1316px -1480px;
+  background-position: -1377px -1480px;
   width: 48px;
   height: 56px;
 }
 .achievement-boot2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -725px -1549px;
+  background-position: -774px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-bow2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -774px -1549px;
+  background-position: -823px -1549px;
   width: 48px;
   height: 52px;
 }
@@ -90,85 +90,85 @@
 }
 .achievement-burnout2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -823px -1549px;
+  background-position: -872px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-cactus2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -872px -1549px;
+  background-position: -921px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-cake2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -921px -1549px;
+  background-position: -970px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-cave2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -970px -1549px;
+  background-position: -1019px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-challenge2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1019px -1549px;
+  background-position: -1068px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-comment2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1068px -1549px;
+  background-position: -1117px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-completedTask2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1365px -1480px;
+  background-position: -1426px -1480px;
   width: 48px;
   height: 56px;
 }
 .achievement-congrats2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1117px -1549px;
+  background-position: -1166px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-costumeContest2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1166px -1549px;
+  background-position: -1215px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-createdTask2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1414px -1480px;
+  background-position: -1475px -1480px;
   width: 48px;
   height: 56px;
 }
 .achievement-dilatory2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1215px -1549px;
+  background-position: -1264px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-dustDevil2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1463px -1480px;
+  background-position: -1524px -1480px;
   width: 48px;
   height: 56px;
 }
 .achievement-dysheartener2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1264px -1549px;
+  background-position: -1313px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-fedPet2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1512px -1480px;
+  background-position: -1573px -1480px;
   width: 48px;
   height: 56px;
 }
@@ -180,61 +180,61 @@
 }
 .achievement-friends2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1313px -1549px;
+  background-position: -1362px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-getwell2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1362px -1549px;
+  background-position: -1411px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-goodAsGold2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1561px -1480px;
+  background-position: -1622px -1480px;
   width: 48px;
   height: 56px;
 }
 .achievement-goodluck2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1411px -1549px;
+  background-position: -1460px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-greeting2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1460px -1549px;
+  background-position: -1509px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-guild2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1509px -1549px;
+  background-position: -1558px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-habitBirthday2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1558px -1549px;
+  background-position: -1607px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-habiticaDay2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1607px -1549px;
+  background-position: 0px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-hatchedPet2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1610px -1480px;
+  background-position: -284px -1549px;
   width: 48px;
   height: 56px;
 }
 .achievement-heart2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: 0px -1628px;
+  background-position: -49px -1628px;
   width: 48px;
   height: 52px;
 }
@@ -246,13 +246,13 @@
 }
 .achievement-karaoke-2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -49px -1628px;
+  background-position: -98px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-karaoke {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1659px -1507px;
+  background-position: -1671px -1507px;
   width: 24px;
   height: 26px;
 }
@@ -262,87 +262,93 @@
   width: 68px;
   height: 68px;
 }
-.achievement-lostMasterclasser2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -98px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-mindOverMatter2x {
+.achievement-legendaryBestiary2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -751px -1480px;
   width: 60px;
   height: 64px;
 }
-.achievement-monsterMagus2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -284px -1549px;
-  width: 48px;
-  height: 56px;
-}
-.achievement-ninja2x {
+.achievement-lostMasterclasser2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -147px -1628px;
   width: 48px;
   height: 52px;
 }
-.achievement-npc2x {
+.achievement-mindOverMatter2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -196px -1628px;
-  width: 48px;
-  height: 52px;
+  background-position: -812px -1480px;
+  width: 60px;
+  height: 64px;
 }
-.achievement-nye2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -245px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-partyOn2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -294px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-partyUp2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -343px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-pearlyPro2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1007px -1480px;
-  width: 64px;
-  height: 56px;
-}
-.achievement-perfect2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -392px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-primedForPainting2x {
+.achievement-monsterMagus2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -333px -1549px;
   width: 48px;
   height: 56px;
 }
-.achievement-purchasedEquipment2x {
+.achievement-ninja2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -382px -1549px;
+  background-position: -196px -1628px;
   width: 48px;
+  height: 52px;
+}
+.achievement-npc2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -245px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-nye2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -294px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-partyOn2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -343px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-partyUp2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -392px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-pearlyPro2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -1068px -1480px;
+  width: 64px;
   height: 56px;
 }
-.achievement-rat2x {
+.achievement-perfect2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -441px -1628px;
   width: 48px;
   height: 52px;
 }
+.achievement-primedForPainting2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -382px -1549px;
+  width: 48px;
+  height: 56px;
+}
+.achievement-purchasedEquipment2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -431px -1549px;
+  width: 48px;
+  height: 56px;
+}
+.achievement-rat2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -490px -1628px;
+  width: 48px;
+  height: 52px;
+}
 .achievement-redLetterDay2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1072px -1480px;
+  background-position: -1133px -1480px;
   width: 64px;
   height: 56px;
 }
@@ -354,79 +360,79 @@
 }
 .achievement-royally-loyal2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -490px -1628px;
+  background-position: -539px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-seafoam2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -539px -1628px;
+  background-position: -588px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-seeingRed2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -431px -1549px;
+  background-position: -480px -1549px;
   width: 48px;
   height: 56px;
 }
 .achievement-shield2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -588px -1628px;
+  background-position: -637px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-shinySeed2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -637px -1628px;
+  background-position: -686px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-skeletonCrew2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1137px -1480px;
+  background-position: -1198px -1480px;
   width: 64px;
   height: 56px;
 }
 .achievement-snowball2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -686px -1628px;
+  background-position: -735px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-spookySparkles2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -735px -1628px;
+  background-position: -784px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-stoikalm2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -784px -1628px;
+  background-position: -833px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-sun2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -833px -1628px;
+  background-position: -882px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-sword2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -882px -1628px;
+  background-position: -931px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-thankyou2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -931px -1628px;
+  background-position: -980px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-thermometer2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -980px -1628px;
+  background-position: -1029px -1628px;
   width: 48px;
   height: 52px;
 }
@@ -438,61 +444,61 @@
 }
 .achievement-tree2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1029px -1628px;
+  background-position: -1078px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-triadbingo2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1078px -1628px;
+  background-position: -1127px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-ultimate-healer2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1127px -1628px;
+  background-position: -1176px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-ultimate-mage2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1176px -1628px;
+  background-position: -1225px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-ultimate-rogue2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1225px -1628px;
+  background-position: -1274px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-ultimate-warrior2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1274px -1628px;
+  background-position: -1323px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-undeadUndertaker2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1202px -1480px;
+  background-position: -1263px -1480px;
   width: 64px;
   height: 56px;
 }
 .achievement-unearned2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1323px -1628px;
+  background-position: -1372px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-valentine2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1372px -1628px;
+  background-position: -1421px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-wolf2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1421px -1628px;
+  background-position: -1470px -1628px;
   width: 48px;
   height: 52px;
 }
@@ -988,265 +994,265 @@
   width: 141px;
   height: 147px;
 }
-.background_flying_over_icy_steppes {
+.background_flying_over_glacier {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1278px -888px;
   width: 141px;
   height: 147px;
 }
-.background_flying_over_rocky_canyon {
+.background_flying_over_icy_steppes {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1278px -1036px;
   width: 141px;
   height: 147px;
 }
-.background_flying_over_snowy_mountains {
+.background_flying_over_rocky_canyon {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: 0px -1184px;
   width: 141px;
   height: 147px;
 }
-.background_flying_over_tropical_islands {
+.background_flying_over_snowy_mountains {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -142px -1184px;
   width: 141px;
   height: 147px;
 }
-.background_foggy_moor {
+.background_flying_over_tropical_islands {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -284px -1184px;
   width: 141px;
   height: 147px;
 }
-.background_forest {
+.background_foggy_moor {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -426px -1184px;
   width: 141px;
   height: 147px;
 }
-.background_frigid_peak {
+.background_forest {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -568px -1184px;
   width: 141px;
   height: 147px;
 }
-.background_frosty_forest {
+.background_frigid_peak {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -710px -1184px;
   width: 141px;
   height: 147px;
 }
-.background_frozen_lake {
+.background_frosty_forest {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -852px -1184px;
   width: 141px;
   height: 147px;
 }
-.background_garden_shed {
+.background_frozen_lake {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -994px -1184px;
   width: 141px;
   height: 147px;
 }
-.background_gazebo {
+.background_garden_shed {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1136px -1184px;
   width: 141px;
   height: 147px;
 }
-.background_giant_autumn_leaf {
+.background_gazebo {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1278px -1184px;
   width: 141px;
   height: 147px;
 }
-.background_giant_birdhouse {
+.background_giant_autumn_leaf {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1420px 0px;
   width: 141px;
   height: 147px;
 }
-.background_giant_book {
+.background_giant_birdhouse {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1420px -148px;
   width: 141px;
   height: 147px;
 }
-.background_giant_dandelions {
+.background_giant_book {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1420px -296px;
   width: 141px;
   height: 147px;
 }
-.background_giant_florals {
+.background_giant_dandelions {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1420px -444px;
   width: 141px;
   height: 147px;
 }
-.background_giant_seashell {
+.background_giant_florals {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1420px -592px;
   width: 141px;
   height: 147px;
 }
-.background_giant_wave {
+.background_giant_seashell {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1420px -740px;
   width: 141px;
   height: 147px;
 }
-.background_gingerbread_house {
+.background_giant_wave {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1420px -888px;
   width: 141px;
   height: 147px;
 }
-.background_glowing_mushroom_cave {
+.background_gingerbread_house {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1420px -1036px;
   width: 141px;
   height: 147px;
 }
-.background_gorgeous_greenhouse {
+.background_glowing_mushroom_cave {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1420px -1184px;
   width: 141px;
   height: 147px;
 }
-.background_grand_staircase {
+.background_gorgeous_greenhouse {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: 0px -1332px;
   width: 141px;
   height: 147px;
 }
-.background_graveyard {
+.background_grand_staircase {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -142px -1332px;
   width: 141px;
   height: 147px;
 }
-.background_green {
+.background_graveyard {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -284px -1332px;
   width: 141px;
   height: 147px;
 }
-.background_guardian_statues {
+.background_green {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -426px -1332px;
   width: 141px;
   height: 147px;
 }
-.background_gumdrop_land {
+.background_guardian_statues {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -568px -1332px;
   width: 141px;
   height: 147px;
 }
-.background_habit_city_rooftops {
+.background_gumdrop_land {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -710px -1332px;
   width: 141px;
   height: 147px;
 }
-.background_habit_city_streets {
+.background_habit_city_rooftops {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -852px -1332px;
   width: 141px;
   height: 147px;
 }
-.background_halflings_house {
+.background_habit_city_streets {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -994px -1332px;
   width: 141px;
   height: 147px;
 }
-.background_hall_of_heroes {
+.background_halflings_house {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1136px -1332px;
   width: 141px;
   height: 147px;
 }
-.background_harvest_feast {
+.background_hall_of_heroes {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1278px -1332px;
   width: 141px;
   height: 147px;
 }
-.background_harvest_fields {
+.background_harvest_feast {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1420px -1332px;
   width: 141px;
   height: 147px;
 }
-.background_harvest_moon {
+.background_harvest_fields {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1562px 0px;
   width: 141px;
   height: 147px;
 }
-.background_haunted_forest {
+.background_harvest_moon {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1562px -148px;
   width: 141px;
   height: 147px;
 }
-.background_haunted_house {
+.background_haunted_forest {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1562px -296px;
   width: 141px;
   height: 147px;
 }
-.background_heather_field {
+.background_haunted_house {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1562px -444px;
   width: 141px;
   height: 147px;
 }
-.background_herding_sheep_in_autumn {
+.background_heart_shaped_bubbles {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1562px -592px;
   width: 141px;
   height: 147px;
 }
-.background_holiday_hearth {
+.background_heather_field {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1562px -740px;
   width: 141px;
   height: 147px;
 }
-.background_holiday_market {
+.background_herding_sheep_in_autumn {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1562px -888px;
   width: 141px;
   height: 147px;
 }
-.background_holiday_wreath {
+.background_holiday_hearth {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1562px -1036px;
   width: 141px;
   height: 147px;
 }
-.background_hot_air_balloon {
+.background_holiday_market {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1562px -1184px;
   width: 141px;
   height: 147px;
 }
-.background_ice_cave {
+.background_holiday_wreath {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1562px -1332px;
   width: 141px;
   height: 147px;
 }
-.background_iceberg {
+.background_hot_air_balloon {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: 0px -1480px;
   width: 141px;
   height: 147px;
 }
-.background_idyllic_cabin {
+.background_hot_spring {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -142px -1480px;
   width: 141px;

website/client/src/assets/css/sprites/spritesmith-main-14.css

@@ -1,48 +1,132 @@
-.quest_TEMPLATE_FOR_MISSING_IMAGE {
+.quest_bronze {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -719px -1546px;
-  width: 221px;
-  height: 39px;
-}
-.quest_falcon {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -443px 0px;
+  background-position: -220px 0px;
   width: 219px;
   height: 219px;
 }
-.quest_ferret {
+.quest_bunny {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: 0px -1546px;
+  width: 210px;
+  height: 186px;
+}
+.quest_butterfly {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -440px 0px;
+  width: 219px;
+  height: 219px;
+}
+.quest_cheetah {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
   background-position: 0px -232px;
   width: 219px;
   height: 219px;
 }
-.quest_fluorite {
+.quest_cow {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px -232px;
-  width: 219px;
-  height: 219px;
-}
-.quest_frog {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px 0px;
-  width: 221px;
+  background-position: -1760px 0px;
+  width: 174px;
   height: 213px;
 }
-.quest_ghost_stag {
+.quest_dilatory {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
   background-position: -440px -232px;
   width: 219px;
   height: 219px;
 }
+.quest_dilatoryDistress1 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -222px -1332px;
+  width: 210px;
+  height: 210px;
+}
+.quest_dilatoryDistress2 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -1760px -422px;
+  width: 150px;
+  height: 150px;
+}
+.quest_dilatoryDistress3 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -660px 0px;
+  width: 219px;
+  height: 219px;
+}
+.quest_dilatory_derby {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -220px -232px;
+  width: 219px;
+  height: 219px;
+}
+.quest_dolphin {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -660px -220px;
+  width: 219px;
+  height: 219px;
+}
+.quest_dustbunnies {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: 0px -452px;
+  width: 219px;
+  height: 219px;
+}
+.quest_egg {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -1760px -214px;
+  width: 165px;
+  height: 207px;
+}
+.quest_evilsanta {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -1760px -724px;
+  width: 118px;
+  height: 131px;
+}
+.quest_evilsanta2 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -220px -452px;
+  width: 219px;
+  height: 219px;
+}
+.quest_falcon {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -440px -452px;
+  width: 219px;
+  height: 219px;
+}
+.quest_ferret {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -660px -452px;
+  width: 219px;
+  height: 219px;
+}
+.quest_fluorite {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -880px 0px;
+  width: 219px;
+  height: 219px;
+}
+.quest_frog {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: 0px -1332px;
+  width: 221px;
+  height: 213px;
+}
+.quest_ghost_stag {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -880px -220px;
+  width: 219px;
+  height: 219px;
+}
 .quest_goldenknight1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -663px 0px;
+  background-position: -880px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -217px -1546px;
+  background-position: -211px -1546px;
   width: 250px;
   height: 150px;
 }
@@ -54,343 +138,253 @@
 }
 .quest_gryphon {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -663px -1332px;
+  background-position: -876px -1332px;
   width: 216px;
   height: 177px;
 }
 .quest_guineapig {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -663px -220px;
+  background-position: 0px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_harpy {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -452px;
+  background-position: -220px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_hedgehog {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px -1332px;
+  background-position: -433px -1332px;
   width: 219px;
   height: 186px;
 }
 .quest_hippo {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px -452px;
+  background-position: -440px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_horse {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -440px -452px;
+  background-position: -660px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_kangaroo {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -660px -452px;
+  background-position: -880px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_kraken {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -880px -1332px;
+  background-position: -1093px -1332px;
   width: 216px;
   height: 177px;
 }
 .quest_lostMasterclasser1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -883px 0px;
+  background-position: -1100px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_lostMasterclasser2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -883px -220px;
+  background-position: -1100px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_lostMasterclasser3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -883px -440px;
+  background-position: -1100px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_mayhemMistiflying1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1765px -537px;
+  background-position: -1760px -573px;
   width: 150px;
   height: 150px;
 }
 .quest_mayhemMistiflying2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -672px;
+  background-position: -1100px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_mayhemMistiflying3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px -672px;
+  background-position: 0px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_monkey {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -440px -672px;
+  background-position: -220px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_moon1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px -214px;
+  background-position: -1540px -220px;
   width: 216px;
   height: 216px;
 }
 .quest_moon2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -660px -672px;
+  background-position: -440px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_moon3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -880px -672px;
+  background-position: -660px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1103px 0px;
+  background-position: -880px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1103px -220px;
+  background-position: -1100px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1103px -440px;
+  background-position: -1320px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_nudibranch {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px -431px;
+  background-position: -1540px -437px;
   width: 216px;
   height: 216px;
 }
 .quest_octopus {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -440px -1332px;
+  background-position: -653px -1332px;
   width: 222px;
   height: 177px;
 }
 .quest_owl {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1103px -660px;
+  background-position: -1320px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_peacock {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px -648px;
+  background-position: -1540px -654px;
   width: 216px;
   height: 216px;
 }
 .quest_penguin {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1765px -353px;
+  background-position: 0px -1733px;
   width: 190px;
   height: 183px;
 }
 .quest_pterodactyl {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -892px;
+  background-position: -1320px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_rat {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px -892px;
+  background-position: -1320px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_robot {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -440px -892px;
+  background-position: -1320px -880px;
   width: 219px;
   height: 219px;
 }
 .quest_rock {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px -865px;
+  background-position: -1540px -871px;
   width: 216px;
   height: 216px;
 }
 .quest_rooster {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1765px 0px;
+  background-position: -1527px -1332px;
   width: 213px;
   height: 174px;
 }
 .quest_ruby {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -660px -892px;
+  background-position: 0px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_sabretooth {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -880px -892px;
+  background-position: -220px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_seaserpent {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1100px -892px;
+  background-position: -440px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_sheep {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1323px 0px;
+  background-position: -660px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_silver {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1323px -220px;
+  background-position: -880px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_slime {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1323px -440px;
+  background-position: -1100px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_sloth {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1323px -660px;
+  background-position: -1320px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_snail {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -1332px;
+  background-position: -1540px -1088px;
   width: 219px;
   height: 213px;
 }
 .quest_snake {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1097px -1332px;
+  background-position: -1310px -1332px;
   width: 216px;
   height: 177px;
 }
 .quest_spider {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -468px -1546px;
+  background-position: -462px -1546px;
   width: 250px;
   height: 150px;
 }
 .quest_squirrel {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1323px -880px;
+  background-position: -1540px 0px;
   width: 219px;
   height: 219px;
 }
-.quest_stoikalmCalamity1 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1765px -688px;
-  width: 150px;
-  height: 150px;
-}
-.quest_stoikalmCalamity2 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_stoikalmCalamity3 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_taskwoodsTerror1 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1765px -839px;
-  width: 150px;
-  height: 150px;
-}
-.quest_taskwoodsTerror2 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px -1082px;
-  width: 216px;
-  height: 216px;
-}
-.quest_taskwoodsTerror3 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -440px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_treeling {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1314px -1332px;
-  width: 216px;
-  height: 177px;
-}
-.quest_trex {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1765px -175px;
-  width: 204px;
-  height: 177px;
-}
-.quest_trex_undead {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1531px -1332px;
-  width: 216px;
-  height: 177px;
-}
-.quest_triceratops {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -660px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_turquoise {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -880px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_turtle {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1100px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_unicorn {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1320px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_velociraptor {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px 0px;
-  width: 222px;
-  height: 225px;
-}
-.quest_vice1 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -1546px;
-  width: 216px;
-  height: 177px;
-}

website/client/src/components/achievements/chooseClass.vue

@@ -212,7 +212,10 @@ export default {
       currentEvent: 'worldState.data.currentEvent',
     }),
     eventName () {
-      if (!this.currentEvent || !this.currentEvent.event || this.currentEvent.season === 'normal') return null;
+      if (
+        !this.currentEvent || !this.currentEvent.event
+        || this.currentEvent.season === 'normal' || this.currentEvent.season === 'valentines'
+      ) return null;
       return this.currentEvent.event.replace('NoPromo', '');
     },
   },

website/client/src/components/appFooter.vue

@@ -80,7 +80,6 @@
                  target="_blank">{{ $t('requestFeature') }}</a>
             </li>
             <li v-html="$t('communityExtensions')"></li>
-            <li v-html="$t('communityForum')"></li>
             <li>
               <a href="https://www.facebook.com/Habitica"
                  target="_blank">{{ $t('communityFacebook') }}</a>
@@ -168,7 +167,7 @@
       </div>
       <div class="row">
         <div class="col-12 col-md-5 text-center text-md-left">
-          © 2020 Habitica. All rights reserved.
+          © 2021 Habitica. All rights reserved.
           <div v-if="!IS_PRODUCTION && isUserLoaded"
                class="debug float-left">
             <button class="btn btn-primary"

website/client/src/components/creatorIntro.vue

@@ -121,7 +121,7 @@
             v-if="editing"
             class="menu-container col-2"
             :class="{active: activeTopPage === 'backgrounds'}"
-            @click="changeTopPage('backgrounds', '2020')"
+            @click="changeTopPage('backgrounds', '2021')"
           >
             <div class="menu-item">
               <div
@@ -1184,7 +1184,7 @@ export default {
         },
       ],
 
-      bgSubMenuItems: ['2020', '2019', '2018', '2017', '2016', '2015', '2014'].map(y => ({
+      bgSubMenuItems: ['2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014'].map(y => ({
         id: y,
         label: y,
       })),
@@ -1211,6 +1211,7 @@ export default {
         2018: [],
         2019: [],
         2020: [],
+        2021: [],
       };
 
       // Hack to force update for now until we restructure the data

website/client/src/components/groups/groupFormModal.vue

@@ -608,22 +608,21 @@ export default {
       };
 
       const categoryKeys = this.workingGroup.categories;
-      const serverCategories = [];
+      const categories = [];
       categoryKeys.forEach(key => {
         const catName = this.categoriesHashByKey[key];
-        serverCategories.push({
+        categories.push({
           slug: key,
           name: catName,
         });
       });
-      this.workingGroup.categories = serverCategories;
 
-      const groupData = { ...this.workingGroup };
+      const groupData = { ...this.workingGroup, categories };
 
       let newgroup;
       if (groupData.id) {
         await this.$store.dispatch('guilds:update', { group: groupData });
-        this.$root.$emit('updatedGroup', this.workingGroup);
+        this.$root.$emit('updatedGroup', groupData);
         // @TODO: this doesn't work because of the async resource
         // if (updatedGroup.type === 'party') this.$store.state.party = {data: updatedGroup};
       } else {

website/client/src/components/groups/tavern.vue

@@ -374,12 +374,6 @@
                 target="_blank"
               >{{ $t('requestFeature') }}</a>
             </li>
-            <li>
-              <a
-                href
-                v-html="$t('communityForum')"
-              ></a>
-            </li>
             <li>
               <router-link
                 to="/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a"

website/client/src/components/header/userDropdown.vue

@@ -40,7 +40,7 @@
       >{{ $t('editAvatar') }}</a>
       <a
         class="topbar-dropdown-item dropdown-item dropdown-separated"
-        @click="showAvatar('backgrounds', '2020')"
+        @click="showAvatar('backgrounds', '2021')"
       >{{ $t('backgrounds') }}</a>
       <a
         class="topbar-dropdown-item dropdown-item"

website/client/src/components/notifications.vue

@@ -386,6 +386,14 @@ const NOTIFICATIONS = {
       achievement: 'redLetterDay',
     },
   },
+  ACHIEVEMENT_LEGENDARY_BESTIARY: {
+    achievement: true,
+    label: $t => `${$t('achievement')}: ${$t('achievementLegendaryBestiary')}`,
+    modalId: 'generic-achievement',
+    data: {
+      achievement: 'legendaryBestiary',
+    },
+  },
 };
 
 export default {
@@ -448,7 +456,7 @@ export default {
       'ONBOARDING_COMPLETE', 'FIRST_DROPS', 'ACHIEVEMENT_BUG_BONANZA', 'ACHIEVEMENT_BARE_NECESSITIES',
       'ACHIEVEMENT_FRESHWATER_FRIENDS', 'ACHIEVEMENT_GOOD_AS_GOLD', 'ACHIEVEMENT_ALL_THAT_GLITTERS',
       'ACHIEVEMENT_BONE_COLLECTOR', 'ACHIEVEMENT_SKELETON_CREW', 'ACHIEVEMENT_SEEING_RED',
-      'ACHIEVEMENT_RED_LETTER_DAY',
+      'ACHIEVEMENT_RED_LETTER_DAY', 'ACHIEVEMENT_LEGENDARY_BESTIARY',
     ].forEach(type => {
       handledNotifications[type] = true;
     });
@@ -869,6 +877,7 @@ export default {
           case 'ACHIEVEMENT_SKELETON_CREW':
           case 'ACHIEVEMENT_SEEING_RED':
           case 'ACHIEVEMENT_RED_LETTER_DAY':
+          case 'ACHIEVEMENT_LEGENDARY_BESTIARY':
           case 'GENERIC_ACHIEVEMENT':
             this.showNotificationWithModal(notification);
             break;

website/client/src/components/settings/restoreModal.vue

@@ -151,6 +151,8 @@ export default {
         return;
       }
 
+      if (this.restoreValues.stats.lvl > 999) this.restoreValues.stats.lvl = 999;
+
       const userChangedLevel = this.restoreValues.stats.lvl !== this.user.stats.lvl;
       const userDidNotChangeExp = this.restoreValues.stats.exp === this.user.stats.exp;
       if (userChangedLevel && userDidNotChangeExp) this.restoreValues.stats.exp = 0;

website/client/src/components/static/communityGuidelines.vue

@@ -54,12 +54,6 @@
         <p v-html="$t('commGuidePara024')"></p>
       </div>
     </div>
-    <div class="media align-items-center">
-      <div class="media-body">
-        <p v-html="$t('commGuidePara027')"></p>
-      </div>
-      <img src="~@/assets/images/community-guidelines/backCorner.png">
-    </div>
     <h3 id="guilds">
       {{ $t('commGuideHeadingPublicGuilds') }}
     </h3>

website/client/tests/unit/components/challenges/challengeDetail.spec.js

@@ -42,6 +42,7 @@ describe('Challenge Detail', () => {
           { _id: '3', type: 'reward' },
           { _id: '4', type: 'todo' },
         ],
+        'common:setTitle': () => {},
       },
       getters: {
       },

website/client/tests/unit/components/groups/myGuilds.spec.js

@@ -49,6 +49,7 @@ describe('myGuilds component', () => {
     getters: {},
     actions: {
       'guilds:getMyGuilds': () => guilds,
+      'common:setTitle': () => {},
     },
   });
 

website/client/tests/unit/components/home.spec.js

@@ -39,7 +39,8 @@ describe('Home', () => {
       actions: {
         'auth:register': registerStub,
         'auth:socialAuth': socialAuthStub,
-        'auth:verifyUsername': () => Promise.resolve({}),
+        'auth:verifyUsername': () => async () => ({}),
+        'common:setTitle': () => {},
       },
     });
 

website/client/tests/unit/components/static/home.spec.js

@@ -1,108 +0,0 @@
-import { shallowMount, createLocalVue } from '@vue/test-utils';
-
-import Home from '@/components/static/home.vue';
-import Store from '@/libs/store';
-import * as Analytics from '@/libs/analytics';
-
-const localVue = createLocalVue();
-localVue.use(Store);
-
-describe('Home', () => {
-  let registerStub;
-  let socialAuthStub;
-  let store;
-  let wrapper;
-
-  function mountWrapper (query) {
-    return shallowMount(Home, {
-      store,
-      localVue,
-      mocks: {
-        $t: string => string,
-        $route: { query: query || {} },
-      },
-    });
-  }
-
-  async function fillOutUserForm (username, email, password) {
-    await wrapper.find('#usernameInput').setValue(username);
-    await wrapper.find('input[type=email]').setValue(email);
-    await wrapper.findAll('input[type=password]').setValue(password);
-  }
-
-  beforeEach(() => {
-    registerStub = sinon.stub();
-    socialAuthStub = sinon.stub();
-    store = new Store({
-      state: {},
-      getters: {},
-      actions: {
-        'auth:register': registerStub,
-        'auth:socialAuth': socialAuthStub,
-      },
-    });
-
-    sinon.stub(Analytics, 'track');
-
-    wrapper = mountWrapper();
-  });
-
-  afterEach(sinon.restore);
-
-  it('has a visible title', () => {
-    expect(wrapper.find('h1').text()).to.equal('motivateYourself');
-  });
-
-  describe('signup form', () => {
-    it('registers a user from the form', async () => {
-      const username = 'newUser';
-      const email = 'rookie@habitica.com';
-      const password = 'ImmaG3tProductive!';
-      await fillOutUserForm(username, email, password);
-
-      await wrapper.find('form').trigger('submit');
-
-      expect(registerStub.calledOnce).to.be.true;
-      expect(registerStub.getCall(0).args[1]).to.deep.equal({
-        username,
-        email,
-        password,
-        passwordConfirm: password,
-        groupInvite: '',
-      });
-    });
-
-    it('registers a user with group invite if groupInvite in the query', async () => {
-      const groupInvite = 'TheBestGroup';
-      wrapper = mountWrapper({ groupInvite });
-      await fillOutUserForm('invitedUser', 'invited@habitica.com', '1veGotFri3ndsHooray!');
-
-      await wrapper.find('form').trigger('submit');
-
-      expect(registerStub.calledOnce).to.be.true;
-      expect(registerStub.getCall(0).args[1].groupInvite).to.equal(groupInvite);
-    });
-
-    it('registers a user with group invite if p in the query', async () => {
-      const p = 'ThePiGroup';
-      wrapper = mountWrapper({ p });
-      await fillOutUserForm('alsoInvitedUser', 'invited2@habitica.com', '1veGotFri3nds2!');
-
-      await wrapper.find('form').trigger('submit');
-
-      expect(registerStub.calledOnce).to.be.true;
-      expect(registerStub.getCall(0).args[1].groupInvite).to.equal(p);
-    });
-
-    it('registers a user with group invite invite if both p and groupInvite are in the query', async () => {
-      const groupInvite = 'StillTheBestGroup';
-      wrapper = mountWrapper({ p: 'LesserGroup', groupInvite });
-      await fillOutUserForm('doublyInvitedUser', 'invited3@habitica.com', '1veGotSm4rtFri3nds!');
-
-      await wrapper.find('form').trigger('submit');
-
-      expect(registerStub.calledOnce).to.be.true;
-      expect(registerStub.getCall(0).args[1].groupInvite).to.equal(groupInvite);
-    });
-  });
-});

website/client/tests/unit/components/tasks/user.spec.js

@@ -10,6 +10,7 @@ describe('Tasks User', () => {
     const store = new Store({
       state: { user: { data: { tags: [challengeTag] } } },
       getters: {},
+      actions: { 'common:setTitle': () => {} },
     });
     return shallowMount(User, {
       store,

website/common/locales/ach/limited.json

@@ -146,6 +146,6 @@
     "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
     "discountBundle": "bundle",
-    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Announcement": "<strong>Gift a subscription and get a subscription free</strong> event going on now!",
     "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/af/limited.json

@@ -146,6 +146,6 @@
     "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
     "discountBundle": "bundle",
-    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Announcement": "<strong>Gift a subscription and get a subscription free</strong> event going on now!",
     "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/ar/challenge.json

@@ -96,9 +96,12 @@
     "descriptionRequired": "Description is required",
     "locationRequired": "Location of challenge is required ('Add to')",
     "categoiresRequired": "One or more categories must be selected",
-    "viewProgressOf": "View Progress Of",
-    "viewProgress": "عرض التقدم",
+    "viewProgressOf": "مشاهدة ملف",
+    "viewProgress": "عرض التقد",
     "selectMember": "اختر عضو",
     "confirmKeepChallengeTasks": "هل تريد إبقاء مهمة التحدي؟",
-    "selectParticipant": "اختر مشارك"
+    "selectParticipant": "اختر مشارك",
+    "wonChallengeDesc": "<%= إسم التحدي %> إخترتك لتكون الفائز!تم تسجيل فوزك في \"إنجازاتك\".",
+    "yourReward": "مكافئاتك",
+    "filters": "فلاتر"
 }

website/common/locales/ar/content.json

@@ -4,7 +4,7 @@
     "armoireText": "الصندوق السحري",
     "armoireNotesFull": "افتح الدولاب لتحصل بشكل عشوائي على معدات خاصة،على خبرة أو على طعام. قطع المعدات المتبقية :",
     "armoireLastItem": "لقد وجدت آخر قطعة من المعدات النادرة في الصندوق السحري.",
-    "armoireNotesEmpty": "الصندوق سيحتوي على معدات جديدة في الأسبوع الأول من كل شهر. حتى ذلك الوقت، اضغط عليه باستمرار للحصول على الخبرة والطعام!",
+    "armoireNotesEmpty": "الصندوق سيحتوي على معدات جديدة في الأسبوع الأول من كل شهر. حتى ذلك الوقت، إضغط عليه باستمرار للحصول على الخبرة والطعام!",
     "dropEggWolfText": "ذئب",
     "dropEggWolfMountText": "ذئب",
     "dropEggWolfAdjective": "وفي",

website/common/locales/ar/gear.json

@@ -1741,5 +1741,7 @@
     "eyewearArmoirePlagueDoctorMaskNotes": "An authentic mask worn by the doctors who battle the Plague of Procrastination. Increases Constitution and Intelligence by <%= attrs %> each. Enchanted Armoire: Plague Doctor Set (Item 2 of 3).",
     "eyewearArmoireGoofyGlassesText": "Goofy Glasses",
     "eyewearArmoireGoofyGlassesNotes": "Perfect for going incognito or just making your partymates giggle. Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
-    "twoHandedItem": "Two-handed item."
+    "twoHandedItem": "Two-handed item.",
+    "weaponSpecialKS2019Notes": "",
+    "weaponSpecialKS2019Text": "سيف جريفون الأسطوري"
 }

website/common/locales/ar/limited.json

@@ -146,6 +146,6 @@
     "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
     "discountBundle": "bundle",
-    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Announcement": "<strong>Gift a subscription and get a subscription free</strong> event going on now!",
     "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }