Merge branch 'develop' into negue/flagpm

.gitignore

@@ -40,6 +40,7 @@ test/client/unit/coverage
 test/client/e2e/reports
 test/client-old/spec/mocks/translations.js
 yarn.lock
+.gitattributes
 
 # Elastic Beanstalk Files
 .elasticbeanstalk/*

config.json.example

@@ -78,5 +78,6 @@
   "TEST_DB_URI": "mongodb://localhost/habitrpg_test",
   "TRANSIFEX_SLACK_CHANNEL": "transifex",
   "WEB_CONCURRENCY": 1,
-  "SKIP_SSL_CHECK_KEY": "key"
+  "SKIP_SSL_CHECK_KEY": "key",
+  "ENABLE_STACKDRIVER_TRACING": "false"
 }

migrations/users/mystery-items.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
-const MIGRATION_NAME = 'mystery_items_201901';
-const MYSTERY_ITEMS = ['head_mystery_201901', 'body_mystery_201901'];
+const MIGRATION_NAME = 'mystery_items_201902';
+const MYSTERY_ITEMS = ['eyewear_mystery_201902', 'shield_mystery_201902'];
 import { model as User } from '../../website/server/models/user';
 import { model as UserNotification } from '../../website/server/models/userNotification';
 

package.json

@@ -1,17 +1,19 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.83.0",
+  "version": "4.85.5",
   "main": "./website/server/index.js",
   "dependencies": {
+    "@google-cloud/trace-agent": "^3.5.2",
     "@slack/client": "^3.8.1",
     "accepts": "^1.3.5",
     "amazon-payments": "^0.2.7",
     "amplitude": "^3.5.0",
+    "amplitude-js": "^4.6.0-beta.2",
     "apidoc": "^0.17.5",
     "apn": "^2.2.0",
     "autoprefixer": "^8.5.0",
-    "aws-sdk": "^2.329.0",
+    "aws-sdk": "^2.400.0",
     "axios": "^0.18.0",
     "axios-progress-bar": "^1.2.0",
     "babel-core": "^6.26.3",
@@ -29,7 +31,7 @@
     "bcrypt": "^3.0.1",
     "body-parser": "^1.18.3",
     "bootstrap": "^4.1.1",
-    "bootstrap-vue": "^2.0.0-rc.9",
+    "bootstrap-vue": "^2.0.0-rc.13",
     "compression": "^1.7.2",
     "cookie-session": "^1.2.0",
     "coupon-code": "^0.4.5",
@@ -62,7 +64,7 @@
     "method-override": "^3.0.0",
     "moment": "^2.22.1",
     "moment-recur": "^1.0.7",
-    "mongoose": "^5.3.4",
+    "mongoose": "^5.4.11",
     "morgan": "^1.7.0",
     "nconf": "^0.10.0",
     "node-gcm": "^1.0.2",
@@ -98,12 +100,12 @@
     "uuid": "^3.0.1",
     "validator": "^10.5.0",
     "vinyl-buffer": "^1.0.1",
-    "vue": "^2.5.16",
+    "vue": "^2.6.4",
     "vue-loader": "^14.2.2",
     "vue-mugen-scroll": "^0.2.1",
     "vue-router": "^3.0.0",
     "vue-style-loader": "^4.1.0",
-    "vue-template-compiler": "^2.5.16",
+    "vue-template-compiler": "^2.6.4",
     "vuedraggable": "^2.15.0",
     "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#5d237615463a84a23dd6f3f77c6ab577d68593ec",
     "webpack": "^3.12.0",
@@ -144,7 +146,7 @@
     "apidoc": "gulp apidoc"
   },
   "devDependencies": {
-    "@vue/test-utils": "^1.0.0-beta.19",
+    "@vue/test-utils": "^1.0.0-beta.29",
     "babel-plugin-istanbul": "^4.1.6",
     "babel-plugin-syntax-object-rest-spread": "^6.13.0",
     "chai": "^4.1.2",

test/api/v3/integration/hall/GET-hall_heroes_heroId.test.js

@@ -25,9 +25,9 @@ describe('GET /heroes/:heroId', () => {
 
   it('validates req.params.heroId', async () => {
     await expect(user.get('/hall/heroes/invalidUUID')).to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
+      code: 404,
+      error: 'NotFound',
+      message: t('userWithIDNotFound', {userId: 'invalidUUID'}),
     });
   });
 
@@ -40,7 +40,7 @@ describe('GET /heroes/:heroId', () => {
     });
   });
 
-  it('returns only necessary hero data', async () => {
+  it('returns only necessary hero data given user id', async () => {
     let hero = await generateUser({
       contributor: {tier: 23},
     });
@@ -53,4 +53,18 @@ describe('GET /heroes/:heroId', () => {
     expect(heroRes.auth.local).not.to.have.keys(['salt', 'hashed_password']);
     expect(heroRes.profile).to.have.all.keys(['name']);
   });
+
+  it('returns only necessary hero data given username', async () => {
+    let hero = await generateUser({
+      contributor: {tier: 23},
+    });
+    let heroRes = await user.get(`/hall/heroes/${hero.auth.local.username}`);
+
+    expect(heroRes).to.have.all.keys([ // works as: object has all and only these keys
+      '_id', 'id', 'balance', 'profile', 'purchased',
+      'contributor', 'auth', 'items',
+    ]);
+    expect(heroRes.auth.local).not.to.have.keys(['salt', 'hashed_password']);
+    expect(heroRes.profile).to.have.all.keys(['name']);
+  });
 });

test/client/unit/specs/components/categories/categoryTags.js

@@ -1,4 +1,5 @@
-import {shallow} from '@vue/test-utils';
+import {mount} from '@vue/test-utils';
+import Vue from 'vue';
 
 import CategoryTags from 'client/components/categories/categoryTags.vue';
 
@@ -6,7 +7,7 @@ describe('Category Tags', () => {
   let wrapper;
 
   beforeEach(function () {
-    wrapper = shallow(CategoryTags, {
+    wrapper = mount(CategoryTags, {
       propsData: {
         categories: [],
       },
@@ -27,8 +28,10 @@ describe('Category Tags', () => {
         },
       ],
     });
-    expect(wrapper.contains('.category-label')).to.eq(true);
-    expect(wrapper.find('.category-label').text()).to.eq('test');
+    return Vue.nextTick().then(() => {
+      expect(wrapper.contains('.category-label')).to.eq(true);
+      expect(wrapper.find('.category-label').text()).to.eq('test');
+    });
   });
 
   it('displays a habitica official in purple', () => {

test/client/unit/specs/components/sidebarSection.js

@@ -1,4 +1,4 @@
-import { shallow } from '@vue/test-utils';
+import { mount } from '@vue/test-utils';
 
 import SidebarSection from 'client/components/sidebarSection.vue';
 
@@ -6,7 +6,7 @@ describe('Sidebar Section', () => {
   let wrapper;
 
   beforeEach(function () {
-    wrapper = shallow(SidebarSection, {
+    wrapper = mount(SidebarSection, {
       propsData: {
         title: 'Hello World',
       },
@@ -39,7 +39,7 @@ describe('Sidebar Section', () => {
   });
 
   it('can hide contents by default', () => {
-    wrapper = shallow(SidebarSection, {
+    wrapper = mount(SidebarSection, {
       propsData: {
         title: 'Hello World',
         show: false,

test/client/unit/specs/components/tasks/column.js

@@ -1,4 +1,4 @@
-import { shallow, createLocalVue } from '@vue/test-utils';
+import { mount, createLocalVue } from '@vue/test-utils';
 
 import TaskColumn from 'client/components/tasks/column.vue';
 
@@ -21,7 +21,7 @@ describe('Task Column', () => {
     };
     let stubs = ['b-modal'];  // <b-modal> is a custom component and not tested here
 
-    return shallow(TaskColumn, {
+    return mount(TaskColumn, {
       propsData: {
         type,
       },

test/client/unit/specs/libs/highlightUsers.js

@@ -3,30 +3,37 @@ import habiticaMarkdown from 'habitica-markdown';
 
 describe('highlightUserAndEmail', () => {
   it('highlights displayname', () => {
-    const text = 'hello @displayedUser';
+    const text = 'hello @displayedUser with text after';
 
     const result = highlightUsers(text, 'user', 'displayedUser');
-    expect(result).to.contain('<span class="at-highlight at-text">@displayedUser</span>');
+
+    expect(result).to.contain('<span class="at-text at-highlight">@displayedUser</span>');
   });
 
   it('highlights username', () => {
     const text = 'hello @user';
 
     const result = highlightUsers(text, 'user', 'displayedUser');
-    expect(result).to.contain('<span class="at-highlight at-text">@user</span>');
+    expect(result).to.contain('<span class="at-text at-highlight">@user</span>');
   });
 
-  it('highlights email with username', () => {
-    const text = habiticaMarkdown.render('hello hello@user.com');
+  it('not highlights any email', () => {
+    const text = habiticaMarkdown.render('hello@example.com');
 
-    const result = highlightUsers(text, 'user', 'displayedUser');
-    expect(result).to.contain('>hello<span class="at-highlight at-text">@user</span>.com</a>');
+    const result = highlightUsers(text, 'example', 'displayedUser');
+    expect(result).to.not.contain('<span class="at-highlight">@example</span>');
   });
 
-  it('highlights any mention', () => {
-    const text = habiticaMarkdown.render('hello y.@user.com other words');
 
-    const result = highlightUsers(text, 'test', 'displayedUser');
-    expect(result).to.contain('<span class="at-text">@user</span>');
+  it('complex highlight', () => {
+    const plainText = 'a bit more @mentions to @use my@mentions.com broken.@mail.com';
+
+    const text = habiticaMarkdown.render(plainText);
+
+    const result = highlightUsers(text, 'use', 'mentions');
+
+    expect(result).to.contain('<span class="at-text at-highlight">@mentions</span>');
+    expect(result).to.contain('<span class="at-text at-highlight">@use</span>');
+    expect(result).to.not.contain('<span class="at-text at-highlight">@mentions</span>.com');
   });
 });

test/common/ops/buy/buyArmoire.js

@@ -158,7 +158,7 @@ describe('shared.ops.buyArmoire', () => {
 
       expect(armoireCount).to.eql(_.size(getFullArmoire()) - 2);
       expect(user.stats.gp).to.eql(100);
-      expect(analytics.track).to.be.calledOnce;
+      expect(analytics.track).to.be.calledTwice;
     });
   });
 });

website/client/app.vue

@@ -649,5 +649,6 @@ export default {
 <style src="assets/css/sprites/spritesmith-main-21.css"></style>
 <style src="assets/css/sprites/spritesmith-main-22.css"></style>
 <style src="assets/css/sprites/spritesmith-main-23.css"></style>
+<style src="assets/css/sprites/spritesmith-main-24.css"></style>
 <style src="assets/css/sprites.css"></style>
 <style src="smartbanner.js/dist/smartbanner.min.css"></style>

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

@@ -1,48 +1,42 @@
 .promo_armoire_backgrounds_201902 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -422px;
+  background-position: 0px -220px;
   width: 423px;
   height: 147px;
 }
-.promo_bird_buddies_bundle {
+.promo_mystery_201902 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -662px 0px;
-  width: 420px;
+  background-position: -424px -220px;
+  width: 240px;
   height: 147px;
 }
-.promo_birthday_2019 {
+.promo_mythical_marvels_bundle {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -277px;
-  width: 498px;
-  height: 144px;
-}
-.promo_mystery_201901 {
-  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -662px -148px;
-  width: 282px;
+  background-position: 0px -368px;
+  width: 423px;
   height: 147px;
 }
 .promo_take_this {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -945px -148px;
+  background-position: -424px -368px;
   width: 96px;
   height: 69px;
 }
-.scene_apollo {
+.promo_valentines_potions {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -662px -296px;
-  width: 279px;
+  background-position: 0px -516px;
+  width: 420px;
   height: 147px;
 }
-.scene_eating_healthy {
+.scene_achievement {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -328px 0px;
-  width: 333px;
-  height: 252px;
+  background-position: -397px 0px;
+  width: 339px;
+  height: 210px;
 }
-.scene_yesterdailies {
+.scene_cooking {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: 0px 0px;
-  width: 327px;
-  height: 276px;
+  width: 396px;
+  height: 219px;
 }

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

@@ -1,300 +1,342 @@
 .Pet_Currency_Gem {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1913px -1504px;
+  background-position: -1913px -1062px;
   width: 68px;
   height: 68px;
 }
 .Pet_Currency_Gem1x {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -2015px -905px;
+  background-position: -1992px -592px;
   width: 15px;
   height: 13px;
 }
 .Pet_Currency_Gem2x {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1982px -1407px;
+  background-position: -1187px -1067px;
   width: 30px;
   height: 26px;
 }
 .PixelPaw-Gold {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1982px -1228px;
+  background-position: -1929px -711px;
   width: 51px;
   height: 51px;
 }
 .PixelPaw {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1963px -905px;
+  background-position: -1765px -1444px;
   width: 51px;
   height: 51px;
 }
 .PixelPaw002 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1982px -1297px;
+  background-position: -220px -276px;
   width: 51px;
   height: 51px;
 }
+.inventory_present {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -1844px -1269px;
+  width: 68px;
+  height: 68px;
+}
+.inventory_present_08 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -1844px -1062px;
+  width: 68px;
+  height: 68px;
+}
+.inventory_present_09 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -1844px -1545px;
+  width: 68px;
+  height: 68px;
+}
+.inventory_present_10 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -1844px -1131px;
+  width: 68px;
+  height: 68px;
+}
+.inventory_present_11 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -1913px -1131px;
+  width: 68px;
+  height: 68px;
+}
+.inventory_present_12 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -1913px -1200px;
+  width: 68px;
+  height: 68px;
+}
+.inventory_special_birthday {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -1913px -1269px;
+  width: 68px;
+  height: 68px;
+}
 .inventory_special_congrats {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1913px -1366px;
+  background-position: -1913px -1338px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_fortify {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1366px;
+  background-position: -1913px -1407px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_getwell {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1913px -1228px;
+  background-position: -1844px -1476px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_goodluck {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1504px;
+  background-position: -1913px -1476px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_greeting {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1573px;
+  background-position: -1913px -1545px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_nye {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1765px -1444px;
+  background-position: -1844px -1614px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_opaquePotion {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -220px -203px;
+  background-position: -1913px -1614px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_seafoam {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1963px -836px;
+  background-position: -1627px -1444px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_shinySeed {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1935px -1089px;
+  background-position: -1696px -1444px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_snowball {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1228px;
+  background-position: -1929px -642px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_spookySparkles {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1297px;
+  background-position: -1935px -763px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_thankyou {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1913px -1297px;
+  background-position: -1935px -854px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_trinket {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1435px;
+  background-position: -1844px -993px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_valentine {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1913px -1435px;
+  background-position: -1913px -993px;
   width: 68px;
   height: 68px;
 }
 .knockout {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1180px;
+  background-position: -1844px -945px;
   width: 120px;
   height: 47px;
 }
 .pet_key {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1913px -1573px;
+  background-position: -1844px -1200px;
   width: 68px;
   height: 68px;
 }
 .rebirth_orb {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1627px -1444px;
+  background-position: -1844px -1338px;
   width: 68px;
   height: 68px;
 }
 .seafoam_star {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1929px -968px;
+  background-position: -1844px -854px;
   width: 90px;
   height: 90px;
 }
 .shop_armoire {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1696px -1444px;
+  background-position: -1844px -1407px;
   width: 68px;
   height: 68px;
 }
 .snowman {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1089px;
+  background-position: -1844px -763px;
   width: 90px;
   height: 90px;
 }
 .zzz {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1982px -1366px;
+  background-position: -1963px -551px;
   width: 40px;
   height: 40px;
 }
 .zzz_light {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1965px -1180px;
+  background-position: -1963px -510px;
   width: 40px;
   height: 40px;
 }
 .notif_inventory_present_01 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -2004px -1118px;
+  background-position: -1960px -1683px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_02 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1995px -563px;
+  background-position: -1054px -841px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_03 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1995px -685px;
+  background-position: -1963px -592px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_04 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1995px -592px;
+  background-position: -1025px -841px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_05 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1995px -621px;
+  background-position: -996px -841px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_06 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1995px -714px;
+  background-position: -967px -841px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_07 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1995px -743px;
+  background-position: -1981px -711px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_08 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1995px -772px;
+  background-position: -1931px -1683px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_09 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1995px -801px;
+  background-position: -1902px -1683px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_10 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -2004px -1089px;
+  background-position: -1873px -1683px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_11 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1995px -534px;
+  background-position: -1844px -1683px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_12 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1995px -650px;
+  background-position: -1965px -945px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_special_birthday {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -2010px -238px;
+  background-position: -1982px -1062px;
   width: 20px;
   height: 24px;
 }
 .notif_inventory_special_congrats {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -2010px -336px;
+  background-position: -1982px -1200px;
   width: 20px;
   height: 22px;
 }
 .notif_inventory_special_getwell {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -2010px -313px;
+  background-position: -1981px -740px;
   width: 20px;
   height: 22px;
 }
 .notif_inventory_special_goodluck {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -2010px -211px;
+  background-position: -1982px -1020px;
   width: 20px;
   height: 26px;
 }
 .notif_inventory_special_greeting {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -2010px -359px;
+  background-position: -1982px -1156px;
   width: 20px;
   height: 22px;
 }
 .notif_inventory_special_nye {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -2010px -184px;
+  background-position: -1982px -993px;
   width: 24px;
   height: 26px;
 }
 .notif_inventory_special_thankyou {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -2010px -263px;
+  background-position: -1982px -1131px;
   width: 20px;
   height: 24px;
 }
 .notif_inventory_special_valentine {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -2010px -288px;
+  background-position: -1982px -1087px;
   width: 20px;
   height: 24px;
 }
 .npc_bailey {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -220px -272px;
+  background-position: -220px -203px;
   width: 60px;
   height: 72px;
 }
 .npc_justin {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -968px;
+  background-position: -1844px -642px;
   width: 84px;
   height: 120px;
 }
@@ -312,7 +354,7 @@
 }
 .banner_flair_dysheartener {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1929px -1059px;
+  background-position: -1935px -832px;
   width: 69px;
   height: 18px;
 }
@@ -330,13 +372,13 @@
 }
 .quest_armadillo {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -660px -1095px;
+  background-position: -1407px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_atom1 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -696px -1315px;
+  background-position: -445px -1315px;
   width: 250px;
   height: 150px;
 }
@@ -354,19 +396,19 @@
 }
 .quest_axolotl {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -527px 0px;
+  background-position: -1100px -1095px;
   width: 219px;
   height: 219px;
 }
 .quest_badger {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1407px -660px;
+  background-position: -440px -435px;
   width: 219px;
   height: 219px;
 }
 .quest_basilist {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -392px;
+  background-position: -191px -1529px;
   width: 189px;
   height: 141px;
 }
@@ -384,13 +426,13 @@
 }
 .quest_butterfly {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -220px -435px;
+  background-position: -1407px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_cheetah {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -440px -435px;
+  background-position: -1407px 0px;
   width: 219px;
   height: 219px;
 }
@@ -402,7 +444,7 @@
 }
 .quest_dilatory {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -660px -875px;
+  background-position: -660px -1095px;
   width: 219px;
   height: 219px;
 }
@@ -414,55 +456,55 @@
 }
 .quest_dilatoryDistress2 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -534px;
+  background-position: -1844px -359px;
   width: 150px;
   height: 150px;
 }
 .quest_dilatoryDistress3 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1187px -440px;
+  background-position: -440px -1095px;
   width: 219px;
   height: 219px;
 }
 .quest_dilatory_derby {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -660px -655px;
+  background-position: -880px -1095px;
   width: 219px;
   height: 219px;
 }
 .quest_dustbunnies {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: 0px -1095px;
+  background-position: -1187px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_egg {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -184px;
+  background-position: -1844px 0px;
   width: 165px;
   height: 207px;
 }
 .quest_evilsanta {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -836px;
+  background-position: -1844px -510px;
   width: 118px;
   height: 131px;
 }
 .quest_evilsanta2 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1407px 0px;
+  background-position: -880px -875px;
   width: 219px;
   height: 219px;
 }
 .quest_falcon {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1407px -440px;
+  background-position: 0px -875px;
   width: 219px;
   height: 219px;
 }
 .quest_ferret {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1407px -220px;
+  background-position: -747px 0px;
   width: 219px;
   height: 219px;
 }
@@ -474,19 +516,19 @@
 }
 .quest_ghost_stag {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1100px -1095px;
+  background-position: -220px -435px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight1 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -880px -1095px;
+  background-position: -527px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight2 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -445px -1315px;
+  background-position: -696px -1315px;
   width: 250px;
   height: 150px;
 }
@@ -510,7 +552,7 @@
 }
 .quest_harpy {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1187px -660px;
+  background-position: 0px -1095px;
   width: 219px;
   height: 219px;
 }
@@ -522,19 +564,19 @@
 }
 .quest_hippo {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -307px 0px;
+  background-position: -1187px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_horse {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1187px 0px;
+  background-position: -1187px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_kangaroo {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -880px -875px;
+  background-position: -1187px 0px;
   width: 219px;
   height: 219px;
 }
@@ -546,25 +588,25 @@
 }
 .quest_lostMasterclasser1 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -440px -875px;
+  background-position: -660px -875px;
   width: 219px;
   height: 219px;
 }
 .quest_lostMasterclasser2 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -220px -875px;
+  background-position: -1407px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_lostMasterclasser3 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: 0px -875px;
+  background-position: -220px -875px;
   width: 219px;
   height: 219px;
 }
 .quest_mayhemMistiflying1 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -685px;
+  background-position: -1844px -208px;
   width: 150px;
   height: 150px;
 }
@@ -588,37 +630,37 @@
 }
 .quest_moon1 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1627px -217px;
+  background-position: -1407px -880px;
   width: 216px;
   height: 216px;
 }
 .quest_moon2 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -440px -655px;
+  background-position: -660px -655px;
   width: 219px;
   height: 219px;
 }
 .quest_moon3 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -220px -655px;
+  background-position: -440px -655px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone1 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: 0px -655px;
+  background-position: -220px -655px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone2 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -747px -220px;
+  background-position: 0px -655px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone3 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -747px 0px;
+  background-position: -747px -220px;
   width: 219px;
   height: 219px;
 }
@@ -642,37 +684,31 @@
 }
 .quest_peacock {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1627px 0px;
+  background-position: -1627px -217px;
   width: 216px;
   height: 216px;
 }
 .quest_penguin {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px 0px;
+  background-position: 0px -1529px;
   width: 190px;
   height: 183px;
 }
 .quest_pterodactyl {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -440px -1095px;
+  background-position: -307px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_rat {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1187px -220px;
+  background-position: -440px -875px;
   width: 219px;
   height: 219px;
 }
 .quest_rock {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1407px -880px;
+  background-position: -1627px 0px;
   width: 216px;
   height: 216px;
 }
-.quest_rooster {
-  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: 0px -1529px;
-  width: 213px;
-  height: 174px;
-}

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

@@ -1,18 +1,390 @@
-.Pet_HatchingPotion_Thunderstorm {
+.Pet-Wolf-Desert {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -82px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Ember {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -328px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Fairy {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -164px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Floral {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: 0px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Frost {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -82px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Ghost {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -164px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Glass {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -246px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Glow {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -246px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Golden {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: 0px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Holly {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -82px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-IcySnow {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -164px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Peppermint {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -246px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Rainbow {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -328px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Red {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -328px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-RoseQuartz {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -328px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-RoyalPurple {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: 0px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -82px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shimmer {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -164px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Skeleton {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -246px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Spooky {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -328px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-StarryNight {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -410px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Thunderstorm {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -410px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veteran {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -410px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-White {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -410px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -492px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Base {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -492px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-CottonCandyBlue {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -492px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-CottonCandyPink {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -492px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Desert {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: 0px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Golden {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -82px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Red {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -164px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -246px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: 0px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-White {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -410px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -492px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet_HatchingPotion_Aquatic {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -69px -500px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Base {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -574px -483px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_CottonCandyBlue {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -138px -500px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_CottonCandyPink {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -207px -500px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Cupid {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -276px -500px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Desert {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -345px -500px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Ember {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -414px -500px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Fairy {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -483px -500px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Floral {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -574px 0px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Frost {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -574px -69px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Ghost {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -574px -138px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Glass {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -574px -207px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Glow {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -574px -276px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Golden {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -574px -345px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Holly {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -574px -414px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_IcySnow {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: 0px -500px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Peppermint {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: 0px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Purple {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -69px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Rainbow {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -138px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Red {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -207px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_RoseQuartz {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -276px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_RoyalPurple {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -345px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -414px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shimmer {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -483px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Skeleton {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -552px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Spooky {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -643px 0px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_StarryNight {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -643px -69px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Thunderstorm {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -643px -138px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_White {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -69px 0px;
+  background-position: -643px -207px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: 0px -69px;
+  background-position: -643px -276px;
   width: 68px;
   height: 68px;
 }

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

@@ -1,12 +1,54 @@
+.shop_weapon_special_spring2017Warrior {
+  background-image: url('~assets/images/sprites/spritesmith-main-9.png');
+  background-position: -1605px -1449px;
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_spring2018Healer {
+  background-image: url('~assets/images/sprites/spritesmith-main-9.png');
+  background-position: -1380px -1515px;
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_spring2018Mage {
+  background-image: url('~assets/images/sprites/spritesmith-main-9.png');
+  background-position: 0px -1584px;
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_spring2018Rogue {
+  background-image: url('~assets/images/sprites/spritesmith-main-9.png');
+  background-position: -69px -1584px;
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_spring2018Warrior {
+  background-image: url('~assets/images/sprites/spritesmith-main-9.png');
+  background-position: -138px -1584px;
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_springHealer {
+  background-image: url('~assets/images/sprites/spritesmith-main-9.png');
+  background-position: -207px -1584px;
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_springMage {
+  background-image: url('~assets/images/sprites/spritesmith-main-9.png');
+  background-position: -276px -1584px;
+  width: 68px;
+  height: 68px;
+}
 .shop_weapon_special_springRogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -414px;
+  background-position: -345px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_springWarrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -897px -1515px;
+  background-position: -1605px -1380px;
   width: 68px;
   height: 68px;
 }
@@ -630,499 +672,499 @@
 }
 .shop_armor_special_summer2015Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -483px;
+  background-position: -414px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summer2015Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -552px;
+  background-position: -483px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summer2015Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -621px;
+  background-position: -552px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summer2015Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -690px;
+  background-position: -621px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summer2016Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -759px;
+  background-position: -690px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summer2016Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -828px;
+  background-position: -759px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summer2016Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -897px;
+  background-position: -828px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summer2016Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -966px;
+  background-position: -897px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summer2017Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -1035px;
+  background-position: -966px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summer2017Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -1104px;
+  background-position: -1035px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summer2017Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -1173px;
+  background-position: -1104px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summer2017Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -1242px;
+  background-position: -1173px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summer2018Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -1311px;
+  background-position: -1242px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summer2018Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -1380px;
+  background-position: -1311px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summer2018Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -1449px;
+  background-position: -1380px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summer2018Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: 0px -1584px;
+  background-position: -1449px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summerHealer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -69px -1584px;
+  background-position: -1518px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summerMage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -138px -1584px;
+  background-position: -1587px -1584px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summerRogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -207px -1584px;
+  background-position: -1674px 0px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_summerWarrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -276px -1584px;
+  background-position: -1674px -69px;
   width: 68px;
   height: 68px;
 }
 .shop_body_special_summer2015Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -345px -1584px;
+  background-position: -747px -954px;
   width: 68px;
   height: 68px;
 }
 .shop_body_special_summer2015Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -414px -1584px;
+  background-position: -816px -954px;
   width: 68px;
   height: 68px;
 }
 .shop_body_special_summer2015Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -483px -1584px;
+  background-position: -885px -954px;
   width: 68px;
   height: 68px;
 }
 .shop_body_special_summer2015Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -552px -1584px;
+  background-position: -954px -954px;
   width: 68px;
   height: 68px;
 }
 .shop_body_special_summerHealer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -621px -1584px;
+  background-position: -1023px -954px;
   width: 68px;
   height: 68px;
 }
 .shop_body_special_summerMage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -690px -1584px;
+  background-position: -91px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_eyewear_special_summerRogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -759px -1584px;
+  background-position: -160px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_eyewear_special_summerWarrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -828px -1584px;
+  background-position: -229px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summer2015Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -897px -1584px;
+  background-position: -298px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summer2015Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -966px -1584px;
+  background-position: -367px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summer2015Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1035px -1584px;
+  background-position: -436px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summer2015Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1104px -1584px;
+  background-position: -505px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summer2016Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1173px -1584px;
+  background-position: -574px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summer2016Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1242px -1584px;
+  background-position: -643px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summer2016Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -747px -954px;
+  background-position: -712px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summer2016Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -816px -954px;
+  background-position: -781px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summer2017Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -885px -954px;
+  background-position: -850px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summer2017Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -954px -954px;
+  background-position: -1333px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summer2017Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1023px -954px;
+  background-position: -1402px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summer2017Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -91px -1424px;
+  background-position: -1471px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summer2018Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -160px -1424px;
+  background-position: 0px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summer2018Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -229px -1424px;
+  background-position: -69px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summer2018Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -298px -1424px;
+  background-position: -138px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summer2018Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -367px -1424px;
+  background-position: -207px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summerHealer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -850px -1424px;
+  background-position: -276px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summerMage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -919px -1424px;
+  background-position: -345px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summerRogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -988px -1424px;
+  background-position: -414px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_summerWarrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1057px -1424px;
+  background-position: -483px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_shield_special_summer2015Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1126px -1424px;
+  background-position: -552px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_shield_special_summer2015Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1195px -1424px;
+  background-position: -621px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_shield_special_summer2015Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1264px -1424px;
+  background-position: -690px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_shield_special_summer2016Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1333px -1424px;
+  background-position: -759px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_shield_special_summer2016Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1402px -1424px;
+  background-position: -828px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_shield_special_summer2016Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1471px -1424px;
+  background-position: -897px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_shield_special_summer2017Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: 0px -1515px;
+  background-position: -966px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_shield_special_summer2017Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -69px -1515px;
+  background-position: -1035px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_shield_special_summer2017Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -138px -1515px;
+  background-position: -1104px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_shield_special_summer2018Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -207px -1515px;
+  background-position: -1173px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_shield_special_summer2018Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -276px -1515px;
+  background-position: -1242px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_shield_special_summer2018Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -345px -1515px;
+  background-position: -1311px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_shield_special_summerHealer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -414px -1515px;
+  background-position: -678px -954px;
   width: 68px;
   height: 68px;
 }
 .shop_shield_special_summerRogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -483px -1515px;
+  background-position: -1449px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_shield_special_summerWarrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -552px -1515px;
+  background-position: -1518px -1515px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summer2015Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -621px -1515px;
+  background-position: -1605px 0px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summer2015Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -690px -1515px;
+  background-position: -1605px -69px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summer2015Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -759px -1515px;
+  background-position: -1605px -138px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summer2015Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -828px -1515px;
+  background-position: -1605px -207px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summer2016Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -678px -954px;
+  background-position: -1605px -276px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summer2016Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -966px -1515px;
+  background-position: -1605px -345px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summer2016Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1035px -1515px;
+  background-position: -1605px -414px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summer2016Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1104px -1515px;
+  background-position: -1605px -483px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summer2017Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1173px -1515px;
+  background-position: -1605px -552px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summer2017Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1242px -1515px;
+  background-position: -1605px -621px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summer2017Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1311px -1515px;
+  background-position: -1605px -690px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summer2017Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1380px -1515px;
+  background-position: -1605px -759px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summer2018Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1449px -1515px;
+  background-position: -1605px -828px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summer2018Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1518px -1515px;
+  background-position: -1605px -897px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summer2018Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px 0px;
+  background-position: -1605px -966px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summer2018Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -69px;
+  background-position: -1605px -1035px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summerHealer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -138px;
+  background-position: -1605px -1104px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summerMage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -207px;
+  background-position: -1605px -1173px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summerRogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -276px;
+  background-position: -1605px -1242px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_summerWarrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1605px -345px;
+  background-position: -1605px -1311px;
   width: 68px;
   height: 68px;
 }
@@ -1398,37 +1440,37 @@
 }
 .shop_armor_special_takeThis {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -436px -1424px;
+  background-position: -919px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_back_special_takeThis {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -505px -1424px;
+  background-position: -988px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_body_special_takeThis {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -574px -1424px;
+  background-position: -1057px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_takeThis {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -643px -1424px;
+  background-position: -1126px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_shield_special_takeThis {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -712px -1424px;
+  background-position: -1195px -1424px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_takeThis {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -781px -1424px;
+  background-position: -1264px -1424px;
   width: 68px;
   height: 68px;
 }
@@ -1878,191 +1920,149 @@
 }
 .shop_armor_special_candycane {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1311px -1584px;
+  background-position: -1674px -138px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_ski {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1380px -1584px;
+  background-position: -1674px -207px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_snowflake {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1449px -1584px;
+  background-position: -1674px -276px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2015Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1518px -1584px;
+  background-position: -1674px -345px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2015Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1587px -1584px;
+  background-position: -1674px -414px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2015Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px 0px;
+  background-position: -1674px -483px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2015Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -69px;
+  background-position: -1674px -552px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2016Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -138px;
+  background-position: -1674px -621px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2016Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -207px;
+  background-position: -1674px -690px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2016Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -276px;
+  background-position: -1674px -759px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2016Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -345px;
+  background-position: -1674px -828px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2017Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -414px;
+  background-position: -1674px -897px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2017Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -483px;
+  background-position: -1674px -966px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2017Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -552px;
+  background-position: -1674px -1035px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2017Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -621px;
+  background-position: -1674px -1104px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2018Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -690px;
+  background-position: -1674px -1173px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2018Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -759px;
+  background-position: -1674px -1242px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2018Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -828px;
+  background-position: -1674px -1311px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2018Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -897px;
+  background-position: -1674px -1380px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2019Healer {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -966px;
+  background-position: -1674px -1449px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2019Mage {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -1035px;
+  background-position: -1674px -1518px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2019Rogue {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -1104px;
+  background-position: 0px -1653px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_winter2019Warrior {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -1173px;
+  background-position: -69px -1653px;
   width: 68px;
   height: 68px;
 }
 .shop_armor_special_yeti {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -1242px;
+  background-position: -138px -1653px;
   width: 68px;
   height: 68px;
 }
 .shop_head_special_candycane {
-  background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -1311px;
-  width: 68px;
-  height: 68px;
-}
-.shop_head_special_nye {
-  background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -1380px;
-  width: 68px;
-  height: 68px;
-}
-.shop_head_special_nye2014 {
-  background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -1449px;
-  width: 68px;
-  height: 68px;
-}
-.shop_head_special_nye2015 {
-  background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -1674px -1518px;
-  width: 68px;
-  height: 68px;
-}
-.shop_head_special_nye2016 {
-  background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: 0px -1653px;
-  width: 68px;
-  height: 68px;
-}
-.shop_head_special_nye2017 {
-  background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -69px -1653px;
-  width: 68px;
-  height: 68px;
-}
-.shop_head_special_nye2018 {
-  background-image: url('~assets/images/sprites/spritesmith-main-9.png');
-  background-position: -138px -1653px;
-  width: 68px;
-  height: 68px;
-}
-.shop_head_special_ski {
   background-image: url('~assets/images/sprites/spritesmith-main-9.png');
   background-position: -207px -1653px;
   width: 68px;

website/client/components/groups/membersModal.vue

@@ -20,7 +20,7 @@ div
           select.form-control(@change='changeSortDirection($event)')
             option(v-for='sortDirection in sortDirections', :value='sortDirection.value') {{sortDirection.text}}
 
-    .row.apply-options.d-flex.justify-content-center(v-if='sortDirty')
+    .row.apply-options.d-flex.justify-content-center(v-if='sortDirty && group.type === "party"')
       a(@click='applySortOptions()') {{ $t('applySortToHeader') }}
     .row(v-if='invites.length > 0')
       .col-6.offset-3.nav

website/client/components/hall/heroes.vue

@@ -8,14 +8,14 @@
       .row
         .form.col-6(v-if='!hero.profile')
           .form-group
-            input.form-control(type='text', v-model='heroID', :placeholder="$t('UUID')")
+            input.form-control(type='text', v-model='heroID', :placeholder="'User ID or Username'")
           .form-group
             button.btn.btn-secondary(@click='loadHero(heroID)')
               | {{ $t('loadUser') }}
 
       .row
         .form.col-6(v-if='hero && hero.profile', submit='saveHero(hero)')
-          router-link(:to="{'name': 'userProfile', 'params': {'userId': msg.uuid}}")
+          router-link(:to="{'name': 'userProfile', 'params': {'userId': hero._id}}")
             h3 {{hero.profile.name}}
           .form-group
             input.form-control(type='text', v-model='hero.contributor.text', :placeholder="$t('contribTitle')")
@@ -23,10 +23,10 @@
             label {{ $t('contribLevel') }}
             input.form-control(type='number', v-model='hero.contributor.level')
             small {{ $t('contribHallText') }}
-            | 
-            a(target='_blank', href='https://trello.com/c/wkFzONhE/277-contributor-gear') {{ $t('moreDetails') }}
-            |, 
-            a(target='_blank', href='https://github.com/HabitRPG/habitica/issues/3801') {{ $t('moreDetails2') }}
+              | 
+              a(target='_blank', href='https://trello.com/c/wkFzONhE/277-contributor-gear') {{ $t('moreDetails') }}
+              |, 
+              a(target='_blank', href='https://github.com/HabitRPG/habitica/issues/3801') {{ $t('moreDetails2') }}
           .form-group
             textarea.form-control(cols=5, :placeholder="$t('contributions')", v-model='hero.contributor.contributions')
             //include ../../shared/formattiv-help
@@ -35,7 +35,9 @@
           .form-group
             label {{ $t('balance') }}
             input.form-control(type='number', step="any", v-model='hero.balance')
-            small {{ '`user.balance`' + this.$t('notGems') }}
+            small
+              span ‘{{ hero.balance }}’ 
+              span(v-html='$t("notGems")')
           .accordion
             .accordion-group(heading='Items')
               h4.expand-toggle(:class="{'open': expandItems}", @click="expandItems = !expandItems") Update Item
@@ -84,11 +86,11 @@
           tr(v-for='(hero, index) in heroes')
             td
               span(v-if='hero.contributor && hero.contributor.admin', :popover="$t('gamemaster')", popover-trigger='mouseenter', popover-placement='right')
-                a.label.label-default(:class='userLevelStyle(hero)', @click='clickMember(hero, true)')
+                .label.label-default(:class='userLevelStyle(hero)')
                   | {{hero.profile.name}} 
                   //- span(v-class='userAdminGlyphiconStyle(hero)')
               span(v-if='!hero.contributor || !hero.contributor.admin')
-                a.label.label-default(v-if='hero.profile', v-class='userLevelStyle(hero)', @click='clickMember(hero, true)') {{hero.profile.name}}
+                .label.label-default(v-if='hero.profile', v-class='userLevelStyle(hero)') {{hero.profile.name}}
             td(v-if='user.contributor.admin', @click='populateContributorInput(hero._id, index)').btn-link {{hero._id}}
             td {{hero.contributor.level}}
             td {{hero.contributor.text}}

website/client/components/header/index.vue

@@ -48,6 +48,7 @@ div
     color: $header-color;
     flex-wrap: nowrap;
     position: relative;
+    max-height: 10.25rem;
   }
 
   .hide-header {

website/client/components/header/menu.vue

@@ -4,11 +4,12 @@ div
   creator-intro
   profileModal
   report-flag-modal
-  b-navbar.topbar.navbar-inverse.static-top.navbar-expand-lg(type="dark", :class="navbarZIndexClass")
+  send-gems-modal
+  b-navbar.topbar.navbar-inverse.static-top(toggleable="lg", type="dark", :class="navbarZIndexClass")
     b-navbar-brand.brand
       .logo.svg-icon.d-none.d-xl-block(v-html="icons.logo")
       .svg-icon.gryphon.d-xs-block.d-xl-none
-    b-nav-toggle(target='menu_collapse').menu-toggle
+    b-navbar-toggle(target='menu_collapse').menu-toggle
     .quick-menu.mobile-only.form-inline
       a.item-with-icon(@click="sync", v-b-tooltip.hover.bottom="$t('sync')")
         .top-menu-icon.svg-icon(v-html="icons.sync")
@@ -344,22 +345,24 @@ import syncIcon from 'assets/svg/sync.svg';
 import svgHourglasses from 'assets/svg/hourglass.svg';
 import logo from 'assets/svg/logo.svg';
 
+import creatorIntro from '../creatorIntro';
 import InboxModal from '../userMenu/inbox.vue';
 import notificationMenu from './notificationsDropdown';
-import creatorIntro from '../creatorIntro';
 import profileModal from '../userMenu/profileModal';
+import sendGemsModal from 'client/components/payments/sendGemsModal';
 import userDropdown from './userDropdown';
 
 import reportFlagModal from '../chat/reportFlagModal';
 
 export default {
   components: {
-    userDropdown,
+    creatorIntro,
     InboxModal,
     notificationMenu,
-    creatorIntro,
     profileModal,
     reportFlagModal,
+    sendGemsModal,
+    userDropdown,
   },
   data () {
     return {

website/client/components/inventory/equipment/equipGearModal.vue

@@ -187,6 +187,8 @@
       },
       hideDialog () {
         this.$root.$emit('bv::hide::modal', 'equipgear-modal');
+        document.body.classList.remove('modal-open');
+        document.body.setAttribute('data-modal-open-count', document.body.getAttribute('data-modal-open-count') - 1);
       },
       memberOverrideAvatarGear (gear) {
         return {

website/client/components/members/memberSearchDropdown.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
 b-dropdown.create-dropdown(:text="text", no-flip)
-  b-dropdown-item(:disabled='true')
+  b-dropdown-form(:disabled='true')
     input.form-control(type='text', v-model='searchTerm')
   b-dropdown-item(v-for="member in memberResults", :key="member._id", @click="selectMember(member)")
     | {{ member.profile.name }}

website/client/components/payments/sendGemsModal.vue

@@ -91,7 +91,6 @@ import notificationsMixin from 'client/mixins/notifications';
 const TECH_ASSISTANCE_EMAIL = 'admin@habitica.com';
 
 export default {
-  props: ['userReceivingGems'],
   mixins: [paymentsMixin, notificationsMixin],
   data () {
     return {
@@ -110,6 +109,7 @@ export default {
         hrefTechAssistanceEmail: `<a href="mailto:${TECH_ASSISTANCE_EMAIL}">${TECH_ASSISTANCE_EMAIL}</a>`,
       },
       sendingInProgress: false,
+      userReceivingGems: null,
     };
   },
   computed: {
@@ -176,5 +176,11 @@ export default {
       this.$root.$emit('bv::hide::modal', 'send-gems');
     },
   },
+  mounted () {
+    this.$root.$on('habitica::send-gems', (data) => {
+      this.userReceivingGems = data;
+      this.$root.$emit('bv::show::modal', 'send-gems');
+    });
+  },
 };
 </script>

website/client/components/shops/seasonal/index.vue

@@ -388,7 +388,9 @@
       },
 
       seasonal () {
+        // vue subscriptions, don't remove
         let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line
+        const myUserVersion = this.user._v; // eslint-disable-line
 
         let seasonal = shops.getSeasonalShop(this.user);
 

website/client/components/tasks/taskModal.vue

@@ -1009,7 +1009,7 @@ export default {
       }
     },
     handleClick (e) {
-      if (this.$refs.popup && !this.$refs.popup.$el.contains(e.target)) {
+      if (this.$refs.popup && !this.$refs.popup.$el.parentNode.contains(e.target)) {
         this.closeTagsPopup();
       }
     },

website/client/components/userLink.vue

@@ -103,7 +103,7 @@
         return this.icons[`tier${this.level}`];
       },
       tierTitle () {
-        return achievementsLib.getContribText(this.level, this.isNPC) || '';
+        return achievementsLib.getContribText(this.contributor, this.isNPC) || '';
       },
       levelStyle () {
         return this.userLevelStyleFromLevel(this.level, this.isNPC);

website/client/components/userMenu/profile.vue

@@ -136,7 +136,6 @@
     v-show='selectedPage === "stats"',
     :showAllocation='showAllocation()',
     v-if='user.preferences')
-  send-gems-modal(:userReceivingGems='userReceivingGems')
 </template>
 
 <style lang="scss" >
@@ -388,7 +387,6 @@ import { mapState } from 'client/libs/store';
 import cloneDeep from 'lodash/cloneDeep';
 
 import MemberDetails from '../memberDetails';
-import sendGemsModal from 'client/components/payments/sendGemsModal';
 import markdown from 'client/directives/markdown';
 import achievementsLib from '../../../common/script/libs/achievements';
 // @TODO: EMAILS.COMMUNITY_MANAGER_EMAIL
@@ -414,7 +412,6 @@ export default {
     markdown,
   },
   components: {
-    sendGemsModal,
     MemberDetails,
     profileStats,
   },
@@ -434,7 +431,6 @@ export default {
       }),
       adminToolsLoaded: false,
       userIdToMessage: '',
-      userReceivingGems: '',
       editing: false,
       editingProfile: {
         name: '',
@@ -499,6 +495,9 @@ export default {
     async userId () {
       this.loadUser();
     },
+    userLoggedIn () {
+      this.loadUser();
+    },
   },
   methods: {
     async loadUser () {
@@ -592,8 +591,7 @@ export default {
       axios.post(`/api/v4/user/block/${this.user._id}`);
     },
     openSendGemsModal () {
-      this.userReceivingGems = this.user;
-      this.$root.$emit('bv::show::modal', 'send-gems');
+      this.$root.$emit('habitica::send-gems', this.user);
     },
     adminRevokeChat () {
       if (!this.hero.flags) {

website/client/libs/analytics.js

@@ -1,8 +1,10 @@
+import forEach from 'lodash/forEach';
 import isEqual from 'lodash/isEqual';
 import keys from 'lodash/keys';
 import pick from 'lodash/pick';
 import includes from 'lodash/includes';
 import getStore from 'client/store';
+import amplitude from 'amplitude-js';
 import Vue from 'vue';
 
 const IS_PRODUCTION = process.env.NODE_ENV === 'production'; // eslint-disable-line no-process-env
@@ -70,7 +72,7 @@ function _gatherUserStats (properties) {
 export function setUser () {
   const store = getStore();
   const user = store.state.user.data;
-  window.amplitude.setUserId(user._id);
+  amplitude.getInstance().setUserId(user._id);
   window.ga('set', {userId: user._id});
 }
 
@@ -80,7 +82,7 @@ export function track (properties) {
     if (_doesNotHaveRequiredFields(properties)) return false;
     if (_doesNotHaveAllowedHitType(properties)) return false;
 
-    window.amplitude.logEvent(properties.eventAction, properties);
+    amplitude.getInstance().logEvent(properties.eventAction, properties);
     window.ga('send', properties);
   });
 }
@@ -92,7 +94,11 @@ export function updateUser (properties) {
 
     _gatherUserStats(properties);
 
-    window.amplitude.setUserProperties(properties);
+    forEach(properties, (value, key) => {
+      const identify = new amplitude.Identify().set(key, value);
+      amplitude.getInstance().identify(identify);
+    });
+
     window.ga('set', properties);
   });
 }
@@ -103,13 +109,7 @@ export function setup () {
   /* eslint-disable */
 
   // Amplitude
-  var r = window.amplitude || {};
-  r._q = [];
-  function a(window) {r[window] = function() {r._q.push([window].concat(Array.prototype.slice.call(arguments, 0)));}}
-  var i = ["init", "logEvent", "logRevenue", "setUserId", "setUserProperties", "setOptOut", "setVersionName", "setDomain", "setDeviceId", "setGlobalUserProperties"];
-  for (var o = 0; o < i.length; o++) {a(i[o])}
-  window.amplitude = r;
-  amplitude.init(AMPLITUDE_KEY);
+  amplitude.getInstance().init(AMPLITUDE_KEY);
 
   // Google Analytics (aka Universal Analytics)
   window['GoogleAnalyticsObject'] = 'ga';
@@ -124,14 +124,7 @@ export function load () {
   // Load real scripts
   if (!IS_PRODUCTION) return;
 
-  // Amplitude
-  const amplitudeScript = document.createElement('script');
   let firstScript = document.getElementsByTagName('script')[0];
-  amplitudeScript.type = 'text/javascript';
-  amplitudeScript.async = true;
-  amplitudeScript.src = 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.2.0-min.gz.js';
-  firstScript.parentNode.insertBefore(amplitudeScript, firstScript);
-
   // Google Analytics
   const gaScript = document.createElement('script');
   firstScript = document.getElementsByTagName('script')[0];

website/client/libs/highlightUsers.js

@@ -1,18 +1,23 @@
+import escapeRegExp from 'lodash/escapeRegExp';
+
+const optionalAnchorTagRegExStr = '(<\\w[^>]*)?'; // everything including the anchor tag is recognized
+const mentionRegExStr = '(@[\\w-]+)';
+const optionalPostMentionRegExStr = '(\\.\\w+)?'; // like dot-TLD
+
+const finalMentionRegEx = new RegExp(`${optionalAnchorTagRegExStr}${mentionRegExStr}${optionalPostMentionRegExStr}`, 'gi');
+
 export function highlightUsers (text, userName, displayName) {
-  const findAnyMentionRegex = '@[\\w-]+(?:\\b)';
+  const currentUser = [`@${userName}`, `@${displayName}`].map(escapeRegExp);
 
-  const atRegex = new RegExp(`${findAnyMentionRegex}`, 'gi');
-  const currentUser = [`@${userName}`, `@${displayName}`];
+  text = text.replace(finalMentionRegEx, (fullMatched, preMention, mentionStr, postMention) => {
+    if (preMention && preMention.includes('<a') || Boolean(postMention)) {
+      return fullMatched;
+    }
 
-  if (atRegex.test(text)) {
-    text = text.replace(atRegex, match => {
-      if (currentUser.includes(match)) {
-        return `<span class="at-highlight at-text">${match}</span>`;
-      }
+    const isUserMention = currentUser.includes(mentionStr) ? 'at-highlight' : '';
 
-      return `<span class="at-text">${match}</span>`;
-    });
-  }
+    return fullMatched.replace(mentionStr, `<span class="at-text ${isUserMention}">${mentionStr}</span>`);
+  });
 
   return text;
 }

website/common/locales/en/content.json

@@ -279,6 +279,7 @@
   "hatchingPotionGlow": "Glow-in-the-Dark",
   "hatchingPotionFrost": "Frost",
   "hatchingPotionIcySnow": "Icy Snow",
+  "hatchingPotionRoseQuartz": "Rose Quartz",
 
   "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.",
   "premiumPotionAddlNotes": "Not usable on quest pet eggs.",

website/common/locales/en/gear.json

@@ -1568,6 +1568,8 @@
   "shieldMystery201709Notes": "This book will guide you through your forays into sorcery. Confers no benefit. September 2017 Subscriber Item.",
   "shieldMystery201802Text": "Love Bug Shield",
   "shieldMystery201802Notes": "Although it may look like brittle candy, this shield is resistant to even the strongest Shattering Heartbreak attacks! Confers no benefit. February 2018 Subscriber Item.",
+  "shieldMystery201902Text": "Cryptic Confetti",
+  "shieldMystery201902Notes": "This glittery paper forms magic hearts that slowly drift and dance in the air. Confers no benefit. February 2019 Subscriber Item",
   "shieldMystery301405Text": "Clock Shield",
   "shieldMystery301405Notes": "Time is on your side with this towering clock shield! Confers no benefit. June 3015 Subscriber Item.",
   "shieldMystery301704Text": "Fluttery Fan",
@@ -1891,6 +1893,8 @@
   "eyewearMystery201507Notes": "These sunglasses let you stay cool even when the weather is hot. Confers no benefit. July 2015 Subscriber Item.",
   "eyewearMystery201701Text": "Timeless Shades",
   "eyewearMystery201701Notes": "These sunglasses will protect your eyes from harmful rays and will look stylish no matter where you find yourself in time! Confers no benefit. January 2017 Subscriber Item.",
+  "eyewearMystery201902Text": "Cryptic Crush Mask",
+  "eyewearMystery201902Notes": "This mysterious mask hides your identity but not your winning smile. Confers no benefit. February 2019 Subscriber Item.",
   "eyewearMystery301404Text": "Eyewear Goggles",
   "eyewearMystery301404Notes": "No eyewear could be fancier than a pair of goggles - except, perhaps, for a monocle. Confers no benefit. April 3015 Subscriber Item.",
   "eyewearMystery301405Text": "Monocle",

website/common/locales/en/questsContent.json

@@ -737,5 +737,8 @@
   "questVelociraptorCompletion": "You burst through the grass, confronting the Veloci-Rapper.<br><br><em>See here, rapper, you’re no quitter,<br>You’re Bad Habits' hardest hitter!<br>Check off your To-Dos like a boss,<br>Don’t mourn over one day’s loss!</em><br><br>Filled with renewed confidence, it bounds off to freestyle another day, leaving behind three eggs where it sat.",
   "questVelociraptorBoss": "Veloci-Rapper",
   "questVelociraptorDropVelociraptorEgg": "Velociraptor (Egg)",
-  "questVelociraptorUnlockText": "Unlocks purchasable Velociraptor eggs in the Market"
+  "questVelociraptorUnlockText": "Unlocks purchasable Velociraptor eggs in the Market",
+
+  "mythicalMarvelsText": "Mythical Marvels Quest Bundle",
+  "mythicalMarvelsNotes": "Contains 'Convincing the Unicorn Queen,' 'The Fiery Gryphon,' and 'Danger in the Depths: Sea Serpent Strike!' Available until February 28."
 }

website/common/locales/en/subscriber.json

@@ -154,6 +154,7 @@
     "mysterySet201811": "Splendid Sorcerer Set",
     "mysterySet201812": "Arctic Fox Set",
     "mysterySet201901": "Polaris Set",
+    "mysterySet201902": "Cryptic Crush Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",

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

@@ -400,6 +400,12 @@ let eyewear = {
     mystery: '201701',
     value: 0,
   },
+  201902: {
+    text: t('eyewearMystery201902Text'),
+    notes: t('eyewearMystery201902Notes'),
+    mystery: '201902',
+    value: 0,
+  },
   301404: {
     text: t('eyewearMystery301404Text'),
     notes: t('eyewearMystery301404Notes'),
@@ -781,6 +787,12 @@ let shield = {
     mystery: '201802',
     value: 0,
   },
+  201902: {
+    text: t('shieldMystery201902Text'),
+    notes: t('shieldMystery201902Notes'),
+    mystery: '201902',
+    value: 0,
+  },
   301405: {
     text: t('shieldMystery301405Text'),
     notes: t('shieldMystery301405Notes'),

website/common/script/content/hatching-potions.js

@@ -156,6 +156,12 @@ let premium = {
     limited: true,
     _season: 'January',
   },
+  RoseQuartz: {
+    value: 2,
+    text: t('hatchingPotionRoseQuartz'),
+    limited: true,
+    _season: 'February',
+  },
 };
 
 each(drops, (pot, key) => {

website/common/script/content/index.js

@@ -227,6 +227,21 @@ api.bundles = {
     type: 'quests',
     value: 7,
   },
+  mythicalMarvels: {
+    key: 'mythicalMarvels',
+    text: t('mythicalMarvelsText'),
+    notes: t('mythicalMarvelsNotes'),
+    bundleKeys: [
+      'unicorn',
+      'seaserpent',
+      'gryphon',
+    ],
+    canBuy () {
+      return moment().isBetween('2019-02-19', '2019-03-02');
+    },
+    type: 'quests',
+    value: 7,
+  },
 };
 
 /*

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

@@ -242,6 +242,10 @@ let mysterySets = {
     start: '2019-01-28',
     end: '2019-02-02',
   },
+  201902: {
+    start: '2019-02-25',
+    end: '2019-03-02',
+  },
   301404: {
     start: '3014-03-24',
     end: '3014-04-02',

website/common/script/content/shop-featuredItems.js

@@ -9,15 +9,15 @@ const featuredItems = {
     },
     {
       type: 'hatchingPotions',
-      path: 'hatchingPotions.CottonCandyPink',
+      path: 'hatchingPotions.Golden',
     },
     {
       type: 'eggs',
-      path: 'eggs.TigerCub',
+      path: 'eggs.PandaCub',
     },
     {
       type: 'card',
-      path: 'cardTypes.birthday',
+      path: 'cardTypes.goodluck',
     },
   ],
   quests: [

website/common/script/ops/buy/buyArmoire.js

@@ -68,6 +68,19 @@ export class BuyArmoireOperation extends AbstractGoldItemOperation {
     ];
   }
 
+  _trackDropAnalytics (userId, key) {
+    this.analytics.track(
+      'dropped item',
+      {
+        uuid: userId,
+        itemKey: key,
+        acquireMethod: 'Armoire',
+        category: 'behavior',
+        headers: this.req.headers,
+      },
+    );
+  }
+
   _gearResult (user, eligibleEquipment) {
     eligibleEquipment.sort();
     let drop = randomVal(eligibleEquipment);
@@ -89,6 +102,10 @@ export class BuyArmoireOperation extends AbstractGoldItemOperation {
 
     removeItemByPath(user, `gear.flat.${drop.key}`);
 
+    if (this.analytics) {
+      this._trackDropAnalytics(user._id, drop.key);
+    }
+
     let armoireResp = {
       type: 'gear',
       dropKey: drop.key,
@@ -109,6 +126,10 @@ export class BuyArmoireOperation extends AbstractGoldItemOperation {
     user.items.food[drop.key] = user.items.food[drop.key] || 0;
     user.items.food[drop.key] += 1;
 
+    if (this.analytics) {
+      this._trackDropAnalytics(user._id, drop.key);
+    }
+
     return {
       message: this.i18n('armoireFood', {
         image: `<span class="Pet_Food_${drop.key} pull-left"></span>`,

website/common/script/ops/pinnedGearUtils.js

@@ -85,30 +85,16 @@ function removePinnedGearByClass (user) {
 }
 
 function removePinnedGearAddPossibleNewOnes (user, itemPath, newItemKey) {
-  let currentPinnedItems = selectGearToPin(user);
-  let removeAndAddAllItems = false;
-
-  for (let item of currentPinnedItems) {
-    let itemInfo = getItemInfo(user, 'marketGear', item);
-
-    if (itemInfo.path === itemPath) {
-      removeAndAddAllItems = true;
-      break;
-    }
-  }
-
   removeItemByPath(user, itemPath);
 
-  if (removeAndAddAllItems) {
-    // an item of the users current "new" gear was bought
-    // remove the old pinned gear items and add the new gear back
-    removePinnedGearByClass(user);
-    user.items.gear.owned[newItemKey] = true;
-    addPinnedGearByClass(user);
-  } else {
-    // just change the new gear to owned
-    user.items.gear.owned[newItemKey] = true;
-  }
+  // an item of the users current "new" gear was bought
+  // remove the old pinned gear items and add the new gear back
+  removePinnedGearByClass(user);
+  user.items.gear.owned[newItemKey] = true;
+  addPinnedGearByClass(user);
+
+  // update the version, so that vue can refresh the seasonal shop
+  user._v++;
 }
 
 /**