Merge branch 'release' into develop

migrations/archive/2020/20201126_harvest_feast.js

@@ -0,0 +1,126 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20201126_harvest_feast';
+import { v4 as uuid } from 'uuid';
+import { model as User } from '../../../website/server/models/user';
+
+const progressCount = 1000;
+let count = 0;
+
+async function updateUser (user) {
+  count++;
+
+  const set = {};
+  let inc;
+  let push;
+
+  set.migration = MIGRATION_NAME;
+
+  if (typeof user.items.gear.owned.head_special_turkeyHelmGilded !== 'undefined') {
+    inc = {
+      'items.food.Pie_Base': 1,
+      'items.food.Pie_CottonCandyBlue': 1,
+      'items.food.Pie_CottonCandyPink': 1,
+      'items.food.Pie_Desert': 1,
+      'items.food.Pie_Golden': 1,
+      'items.food.Pie_Red': 1,
+      'items.food.Pie_Shade': 1,
+      'items.food.Pie_Skeleton': 1,
+      'items.food.Pie_Zombie': 1,
+      'items.food.Pie_White': 1,
+    }
+  } else if (typeof user.items.gear.owned.armor_special_turkeyArmorBase !== 'undefined') {
+    set['items.gear.owned.head_special_turkeyHelmGilded'] = false;
+    set['items.gear.owned.armor_special_turkeyArmorGilded'] = false;
+    set['items.gear.owned.back_special_turkeyTailGilded'] = false;
+    push = [
+      {
+        type: 'marketGear',
+        path: 'gear.flat.head_special_turkeyHelmGilded',
+        _id: uuid(),
+      },
+      {
+        type: 'marketGear',
+        path: 'gear.flat.armor_special_turkeyArmorGilded',
+        _id: uuid(),
+      },
+      {
+        type: 'marketGear',
+        path: 'gear.flat.back_special_turkeyTailGilded',
+        _id: uuid(),
+      },
+    ];
+  } else if (user.items && user.items.mounts && user.items.mounts['Turkey-Gilded']) {
+    set['items.gear.owned.head_special_turkeyHelmBase'] = false;
+    set['items.gear.owned.armor_special_turkeyArmorBase'] = false;
+    set['items.gear.owned.back_special_turkeyTailBase'] = false;
+    push = [
+      {
+        type: 'marketGear',
+        path: 'gear.flat.head_special_turkeyHelmBase',
+        _id: uuid(),
+      },
+      {
+        type: 'marketGear',
+        path: 'gear.flat.armor_special_turkeyArmorBase',
+        _id: uuid(),
+      },
+      {
+        type: 'marketGear',
+        path: 'gear.flat.back_special_turkeyTailBase',
+        _id: uuid(),
+      },
+    ];
+  } else if (user.items && user.items.pets && user.items.pets['Turkey-Gilded']) {
+    set['items.mounts.Turkey-Gilded'] = true;
+  } else if (user.items && user.items.mounts && user.items.mounts['Turkey-Base']) {
+    set['items.pets.Turkey-Gilded'] = 5;
+  } else if (user.items && user.items.pets && user.items.pets['Turkey-Base']) {
+    set['items.mounts.Turkey-Base'] = true;
+  } else {
+    set['items.pets.Turkey-Base'] = 5;
+  }
+
+  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+
+  if (inc) {
+    return await User.update({_id: user._id}, {$inc: inc, $set: set}).exec();
+  } else if (push) {
+    return await User.update({_id: user._id}, {$set: set, $push: {pinnedItems: {$each: push}}}).exec();
+  } else {
+    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('2019-11-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
+  }
+};

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.171.0",
+  "version": "4.172.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.171.0",
+  "version": "4.172.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.12.9",

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

@@ -1,9 +1,15 @@
 .quest_TEMPLATE_FOR_MISSING_IMAGE {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -1501px;
+  background-position: -1543px -1141px;
   width: 221px;
   height: 39px;
 }
+.quest_kraken {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: 0px -1323px;
+  width: 216px;
+  height: 177px;
+}
 .quest_lostMasterclasser1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
   background-position: -223px 0px;
@@ -24,7 +30,7 @@
 }
 .quest_mayhemMistiflying1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px -537px;
+  background-position: -1543px -688px;
   width: 150px;
   height: 150px;
 }
@@ -108,7 +114,7 @@
 }
 .quest_penguin {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px -353px;
+  background-position: -1543px -504px;
   width: 190px;
   height: 183px;
 }
@@ -138,7 +144,7 @@
 }
 .quest_rooster {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px 0px;
+  background-position: -1543px -151px;
   width: 213px;
   height: 174px;
 }
@@ -192,13 +198,13 @@
 }
 .quest_snake {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -1323px;
+  background-position: -217px -1323px;
   width: 216px;
   height: 177px;
 }
 .quest_spider {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1085px -1323px;
+  background-position: -1543px 0px;
   width: 250px;
   height: 150px;
 }
@@ -210,7 +216,7 @@
 }
 .quest_stoikalmCalamity1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px -688px;
+  background-position: -1543px -839px;
   width: 150px;
   height: 150px;
 }
@@ -228,7 +234,7 @@
 }
 .quest_taskwoodsTerror1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px -839px;
+  background-position: -1543px -990px;
   width: 150px;
   height: 150px;
 }
@@ -246,19 +252,19 @@
 }
 .quest_treeling {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -217px -1323px;
+  background-position: -434px -1323px;
   width: 216px;
   height: 177px;
 }
 .quest_trex {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px -175px;
+  background-position: -1543px -326px;
   width: 204px;
   height: 177px;
 }
 .quest_trex_undead {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -434px -1323px;
+  background-position: -651px -1323px;
   width: 216px;
   height: 177px;
 }
@@ -294,7 +300,7 @@
 }
 .quest_vice1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -651px -1323px;
+  background-position: -868px -1323px;
   width: 216px;
   height: 177px;
 }
@@ -306,7 +312,7 @@
 }
 .quest_vice3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -868px -1323px;
+  background-position: -1085px -1323px;
   width: 216px;
   height: 177px;
 }
@@ -330,721 +336,667 @@
 }
 .quest_atom1_soapBars {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1694px -598px;
+  background-position: -1734px -565px;
   width: 48px;
   height: 51px;
 }
 .quest_dilatoryDistress1_blueFins {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1694px -688px;
+  background-position: -1734px -617px;
   width: 51px;
   height: 48px;
 }
 .quest_dilatoryDistress1_fireCoral {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1694px -737px;
+  background-position: -207px -1639px;
   width: 48px;
   height: 51px;
 }
 .quest_egg_plainEgg {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1694px -839px;
+  background-position: -256px -1639px;
   width: 48px;
   height: 51px;
 }
 .quest_evilsanta2_branches {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1694px -891px;
+  background-position: -305px -1639px;
   width: 48px;
   height: 51px;
 }
 .quest_evilsanta2_tracks {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1694px -537px;
+  background-position: -1734px -504px;
   width: 54px;
   height: 60px;
 }
 .quest_goldenknight1_testimony {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -759px -1679px;
+  background-position: -354px -1639px;
   width: 48px;
   height: 51px;
 }
 .quest_lostMasterclasser1_ancientTome {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1757px 0px;
+  background-position: -1757px -151px;
   width: 33px;
   height: 42px;
 }
 .quest_lostMasterclasser1_forbiddenTome {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1757px -43px;
+  background-position: -1757px -194px;
   width: 33px;
   height: 42px;
 }
 .quest_lostMasterclasser1_hiddenTome {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1757px -86px;
+  background-position: -1757px -237px;
   width: 33px;
   height: 42px;
 }
 .quest_mayhemMistiflying2_mistifly1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -808px -1679px;
+  background-position: -403px -1639px;
   width: 48px;
   height: 51px;
 }
 .quest_mayhemMistiflying2_mistifly2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -857px -1679px;
+  background-position: -452px -1639px;
   width: 48px;
   height: 51px;
 }
 .quest_mayhemMistiflying2_mistifly3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -906px -1679px;
+  background-position: -501px -1639px;
   width: 48px;
   height: 51px;
 }
 .quest_moon1_shard {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1694px -789px;
+  background-position: -1748px -326px;
   width: 42px;
   height: 42px;
 }
 .quest_moonstone1_moonstone {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1757px -129px;
+  background-position: -1757px -280px;
   width: 30px;
   height: 30px;
 }
 .quest_robot_bolt {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -955px -1679px;
+  background-position: -550px -1639px;
   width: 48px;
   height: 51px;
 }
 .quest_robot_gear {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1004px -1679px;
+  background-position: -599px -1639px;
   width: 48px;
   height: 51px;
 }
 .quest_robot_spring {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1053px -1679px;
+  background-position: -648px -1639px;
   width: 48px;
   height: 51px;
 }
 .quest_ruby_aquariusRune {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1486px -1679px;
+  background-position: -1748px -453px;
   width: 39px;
   height: 40px;
 }
 .quest_ruby_rubyGem {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1102px -1679px;
+  background-position: -697px -1639px;
   width: 48px;
   height: 51px;
 }
 .quest_ruby_venusRune {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -222px -1501px;
+  background-position: -1750px -1181px;
   width: 39px;
   height: 39px;
 }
 .quest_silver_cancerRune {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -262px -1501px;
+  background-position: -1750px -1250px;
   width: 39px;
   height: 39px;
 }
 .quest_silver_moonRune {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1694px -943px;
+  background-position: -1748px -369px;
   width: 39px;
   height: 42px;
 }
 .quest_silver_silverIngot {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1151px -1679px;
+  background-position: -746px -1639px;
   width: 48px;
   height: 51px;
 }
 .quest_stoikalmCalamity2_icicleCoin {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1200px -1679px;
+  background-position: -795px -1639px;
   width: 48px;
   height: 51px;
 }
 .quest_taskwoodsTerror2_brownie {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1249px -1679px;
+  background-position: -844px -1639px;
   width: 48px;
   height: 51px;
 }
 .quest_taskwoodsTerror2_dryad {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1298px -1679px;
+  background-position: -893px -1639px;
   width: 48px;
   height: 51px;
 }
 .quest_taskwoodsTerror2_pixie {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1347px -1679px;
+  background-position: -942px -1639px;
   width: 48px;
   height: 51px;
 }
 .quest_turquoise_neptuneRune {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -302px -1501px;
+  background-position: -1750px -1319px;
   width: 39px;
   height: 39px;
 }
 .quest_turquoise_sagittariusRune {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -342px -1501px;
+  background-position: -1750px -1388px;
   width: 39px;
   height: 39px;
 }
 .quest_turquoise_turquoiseGem {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1396px -1679px;
+  background-position: -991px -1639px;
   width: 48px;
   height: 51px;
 }
 .quest_vice2_lightCrystal {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1445px -1679px;
+  background-position: -1748px -412px;
   width: 40px;
   height: 40px;
 }
 .inventory_quest_scroll_alligator {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px -990px;
+  background-position: -1694px -688px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_amber {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1612px -990px;
+  background-position: -1694px -757px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_armadillo {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1681px -990px;
+  background-position: -1694px -839px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_atom1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1612px -1059px;
+  background-position: -1694px -990px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_atom1_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px -1059px;
+  background-position: -1694px -908px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_atom2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px -1128px;
+  background-position: -1543px -1181px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_atom2_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1681px -1059px;
+  background-position: -1694px -1059px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_atom3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1681px -1128px;
+  background-position: -1681px -1181px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_atom3_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1612px -1128px;
+  background-position: -1612px -1181px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_axolotl {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px -1197px;
+  background-position: -1543px -1250px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_badger {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1612px -1197px;
+  background-position: -1612px -1250px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_basilist {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1681px -1197px;
+  background-position: -1681px -1250px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_beetle {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px -1266px;
+  background-position: -1543px -1319px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_blackPearl {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1612px -1266px;
+  background-position: -1612px -1319px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_bronze {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1681px -1266px;
+  background-position: -1681px -1319px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_bunny {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px -1335px;
+  background-position: -1543px -1388px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_butterfly {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1612px -1335px;
+  background-position: -1612px -1388px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_cheetah {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1681px -1335px;
+  background-position: -1681px -1388px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_cow {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1543px -1404px;
+  background-position: -1302px -1323px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_dilatoryDistress1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1681px -1404px;
+  background-position: -1440px -1323px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_dilatoryDistress2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1405px -1323px;
+  background-position: -1371px -1392px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_dilatoryDistress2_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1336px -1323px;
+  background-position: -1302px -1392px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_dilatoryDistress3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1336px -1392px;
+  background-position: 0px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_dilatoryDistress3_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1474px -1323px;
+  background-position: -1440px -1392px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_dilatory_derby {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1612px -1404px;
+  background-position: -1371px -1323px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_dolphin {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1405px -1392px;
+  background-position: -69px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_dustbunnies {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1474px -1392px;
+  background-position: -138px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_egg {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -1541px;
+  background-position: -207px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_evilsanta {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -69px -1541px;
+  background-position: -276px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_evilsanta2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -138px -1541px;
+  background-position: -345px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_falcon {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -207px -1541px;
+  background-position: -414px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_ferret {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -276px -1541px;
+  background-position: -483px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_fluorite {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -345px -1541px;
+  background-position: -552px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_frog {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -414px -1541px;
+  background-position: -621px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_ghost_stag {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -483px -1541px;
+  background-position: -690px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_goldenknight1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -621px -1541px;
+  background-position: -828px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_goldenknight1_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -552px -1541px;
+  background-position: -759px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_goldenknight2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -759px -1541px;
+  background-position: -966px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_goldenknight2_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -690px -1541px;
+  background-position: -897px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_goldenknight3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -897px -1541px;
+  background-position: -1104px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_goldenknight3_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -828px -1541px;
+  background-position: -1035px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_gryphon {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -966px -1541px;
+  background-position: -1173px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_guineapig {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1035px -1541px;
+  background-position: -1242px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_harpy {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1104px -1541px;
+  background-position: -1311px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_hedgehog {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1173px -1541px;
+  background-position: -1380px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_hippo {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1242px -1541px;
+  background-position: -1449px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_horse {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1311px -1541px;
+  background-position: -1518px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_kangaroo {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1380px -1541px;
+  background-position: -1587px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_kraken {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1449px -1541px;
+  background-position: -1656px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_lostMasterclasser1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1587px -1541px;
+  background-position: 0px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_lostMasterclasser1_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1518px -1541px;
+  background-position: -1725px -1501px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_lostMasterclasser2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -1610px;
+  background-position: -138px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_lostMasterclasser2_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1656px -1541px;
+  background-position: -69px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_lostMasterclasser3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -138px -1610px;
+  background-position: -276px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_lostMasterclasser3_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -69px -1610px;
+  background-position: -207px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_lostMasterclasser4 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -276px -1610px;
+  background-position: -414px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_lostMasterclasser4_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -207px -1610px;
+  background-position: -345px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_mayhemMistiflying1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -345px -1610px;
+  background-position: -483px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_mayhemMistiflying2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -483px -1610px;
+  background-position: -621px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_mayhemMistiflying2_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -414px -1610px;
+  background-position: -552px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_mayhemMistiflying3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -621px -1610px;
+  background-position: -759px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_mayhemMistiflying3_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -552px -1610px;
+  background-position: -690px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_monkey {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -690px -1610px;
+  background-position: -828px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_moon1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -828px -1610px;
+  background-position: -966px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_moon1_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -759px -1610px;
+  background-position: -897px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_moon2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -966px -1610px;
+  background-position: -1104px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_moon2_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -897px -1610px;
+  background-position: -1035px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_moon3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1104px -1610px;
+  background-position: -1242px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_moon3_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1035px -1610px;
+  background-position: -1173px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_moonstone1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1242px -1610px;
+  background-position: -1380px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_moonstone1_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1173px -1610px;
+  background-position: -1311px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_moonstone2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1380px -1610px;
+  background-position: -1518px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_moonstone2_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1311px -1610px;
+  background-position: -1449px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_moonstone3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1518px -1610px;
+  background-position: -1656px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_moonstone3_locked {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1449px -1610px;
+  background-position: -1587px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_nudibranch {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1587px -1610px;
+  background-position: -1725px -1570px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_octopus {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1656px -1610px;
+  background-position: 0px -1639px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_owl {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -1679px;
+  background-position: -69px -1639px;
   width: 68px;
   height: 68px;
 }
 .inventory_quest_scroll_peacock {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -69px -1679px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_penguin {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -138px -1679px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_pterodactyl {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -207px -1679px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_rat {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -276px -1679px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_robot {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -345px -1679px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_rock {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -414px -1679px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_rooster {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -483px -1679px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_ruby {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -552px -1679px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_sabretooth {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -621px -1679px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_seaserpent {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -690px -1679px;
+  background-position: -138px -1639px;
   width: 68px;
   height: 68px;
 }

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

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

website/client/src/assets/scss/variables.scss

@@ -1,5 +1,5 @@
 // this variables are used to determine which shop npc/backgrounds should be loaded
-// possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, normal, normal
+// possible values are: normal, fall, habitoween, normal, winter, nye, birthday, valentines, normal, normal
 // more to be added on future seasons
 
 $npc_market_flavor: 'normal';

website/common/locales/en/gear.json

@@ -1587,6 +1587,8 @@
   "headMystery202010Notes": "We'll spare you another joke about echolocation... cation... cation. Confers no benefit. October 2020 Subscriber Item.",
   "headMystery202011Text": "Foliated Magus Hat",
   "headMystery202011Notes": "Wield the power of the changing seasons while also looking very stylish! Confers no benefit. November 2020 Subscriber Item.",
+  "headMystery202012Text": "Frostfire Mask",
+  "headMystery202012Notes": "This imposing mask features piercing eyes that will blind foes like the glare of sunlight on fresh snow. Confers no benefit. December 2020 Subscriber Item.",
   "headMystery301404Text": "Fancy Top Hat",
   "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
   "headMystery301405Text": "Basic Top Hat",
@@ -2092,6 +2094,8 @@
   "backMystery202009Notes": "Let these huge wings take you to new heights! Confers no benefit. September 2020 Subscriber Item.",
   "backMystery202010Text": "Beguiling Bat Wings",
   "backMystery202010Notes": "You are the night! So fly as silently as a midnight cloud with these swift purple wings. Confers no benefit. October 2020 Subscriber Item.",
+  "backMystery202012Text": "Frostfire Wings",
+  "backMystery202012Notes": "The snowy feathers of these wings will grant you the speed of a wintry gale. Confers no benefit. December 2020 Subscriber Item.",
 
   "backSpecialWonderconRedText": "Mighty Cape",
   "backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.",

website/common/locales/en/subscriber.json

@@ -117,6 +117,7 @@
     "mysterySet202009": "Marvelous Moth Set",
     "mysterySet202010": "Beguilingly Batty Set",
     "mysterySet202011": "Foliated Magus Set",
+    "mysterySet202012": "Frostfire Phoenix Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",

website/common/script/content/gear/sets/mystery.js

@@ -79,6 +79,7 @@ const back = {
   202005: { },
   202009: { },
   202010: { },
+  202012: { },
 };
 
 const body = {
@@ -159,6 +160,7 @@ const head = {
   202008: { },
   202010: { },
   202011: { },
+  202012: { },
   301404: { },
   301405: { },
   301703: { },

website/server/models/user/hooks.js

@@ -144,22 +144,10 @@ function _setUpNewUser (user) {
   user.items.quests.dustbunnies = 1;
   user.purchased.background.violet = true;
   user.preferences.background = 'violet';
-  if (moment().isBefore('2020-11-02')) {
-    user.migration = '20201029_habitoween_ladder';
-    user.items.pets['JackOLantern-Base'] = 5;
-    user.items.currentPet = 'JackOLantern-Base';
-    user.items.food = {
-      Candy_Skeleton: 1,
-      Candy_Base: 1,
-      Candy_CottonCandyBlue: 1,
-      Candy_CottonCandyPink: 1,
-      Candy_Shade: 1,
-      Candy_White: 1,
-      Candy_Golden: 1,
-      Candy_Zombie: 1,
-      Candy_Desert: 1,
-      Candy_Red: 1,
-    };
+  if (moment().isBefore('2020-11-30')) {
+    user.migration = '20201126_harvest_feast';
+    user.items.pets['Turkey-Base'] = 5;
+    user.items.currentPet = 'Turkey-Base';
   }
 
   user.markModified('items achievements');