v4.103.0

also fixes some sprite issues

migrations/users/mystery-items.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
-const MIGRATION_NAME = 'mystery_items_201905';
-const MYSTERY_ITEMS = ['headAccessory_mystery_201905', 'back_mystery_201905'];
+const MIGRATION_NAME = 'mystery_items_201906';
+const MYSTERY_ITEMS = ['headAccessory_mystery_201906', 'armor_mystery_201906'];
 import { model as User } from '../../website/server/models/user';
 import { model as UserNotification } from '../../website/server/models/userNotification';
 

package-lock.json

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

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.101.0",
+  "version": "4.103.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@google-cloud/trace-agent": "^3.6.0",

test/client/unit/specs/components/avatar.vue.test.js

@@ -83,12 +83,12 @@ context('avatar.vue', () => {
       expect(vm.paddingTop).to.equal('28px');
     });
 
-    it('is 24.5px if user has a pet', () => {
+    it('is 24px if user has a pet', () => {
       vm.member.items = {
         currentPet: { name: 'Foo' },
       };
 
-      expect(vm.paddingTop).to.equal('24.5px');
+      expect(vm.paddingTop).to.equal('24px');
     });
 
     it('is 0px if user has a mount', () => {
@@ -297,4 +297,4 @@ context('avatar.vue', () => {
       });
     });
   });
-});
+});

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

@@ -1,6 +1,6 @@
 .promo_armoire_backgrounds_201906 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -720px;
+  background-position: 0px -869px;
   width: 423px;
   height: 147px;
 }
@@ -16,57 +16,69 @@
   width: 553px;
   height: 358px;
 }
-.promo_floral_sunshine_potions {
+.promo_glass_watery_potions {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -720px;
+  background-position: -424px -869px;
   width: 423px;
   height: 147px;
 }
 .promo_halfmoon_glasses {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -963px -296px;
+  background-position: -1086px -148px;
   width: 279px;
   height: 147px;
 }
-.promo_mystery_201905 {
+.promo_mystery_201906 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -963px -148px;
+  background-position: -1086px 0px;
   width: 282px;
   height: 147px;
 }
 .promo_oddballs_bundle {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -963px 0px;
+  background-position: -426px -720px;
   width: 423px;
   height: 147px;
 }
 .promo_orcas {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -963px -444px;
+  background-position: -1086px -296px;
   width: 219px;
   height: 147px;
 }
+.promo_seafoam {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: 0px -720px;
+  width: 425px;
+  height: 148px;
+}
 .promo_seasonal_shop {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1183px -444px;
+  background-position: -1086px -444px;
   width: 162px;
   height: 132px;
 }
 .promo_summer_splash_2019 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -554px 0px;
+  background-position: -554px -244px;
   width: 408px;
   height: 186px;
 }
 .promo_take_this {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1246px -148px;
+  background-position: -1249px -444px;
   width: 96px;
   height: 69px;
 }
-.scene_hiking {
+.scene_casting_spells {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -554px -187px;
-  width: 258px;
-  height: 258px;
+  background-position: -554px -431px;
+  width: 312px;
+  height: 222px;
+}
+.scene_positivity {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -554px 0px;
+  width: 531px;
+  height: 243px;
 }

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

@@ -1,36 +1,48 @@
 .quest_TEMPLATE_FOR_MISSING_IMAGE {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -502px -1510px;
+  background-position: -719px -1519px;
   width: 221px;
   height: 39px;
 }
+.quest_evilsanta2 {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -663px 0px;
+  width: 219px;
+  height: 219px;
+}
+.quest_falcon {
+  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1103px -440px;
+  width: 219px;
+  height: 219px;
+}
 .quest_ferret {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -232px;
+  background-position: -1103px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_frog {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -1112px;
+  background-position: -1100px -1112px;
   width: 221px;
   height: 213px;
 }
 .quest_ghost_stag {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1323px -220px;
+  background-position: 0px -232px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight1 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -452px;
+  background-position: -220px -232px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight2 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -251px -1510px;
+  background-position: -217px -1519px;
   width: 250px;
   height: 150px;
 }
@@ -42,259 +54,259 @@
 }
 .quest_gryphon {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -657px -1332px;
+  background-position: -660px -1332px;
   width: 216px;
   height: 177px;
 }
 .quest_guineapig {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -663px 0px;
+  background-position: 0px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_harpy {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -663px -220px;
+  background-position: -220px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_hedgehog {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1102px -1112px;
+  background-position: 0px -1332px;
   width: 219px;
   height: 186px;
 }
 .quest_hippo {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -452px;
+  background-position: -660px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_horse {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -452px;
+  background-position: -883px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_kangaroo {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -452px;
+  background-position: -883px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_kraken {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1091px -1332px;
+  background-position: 0px -1519px;
   width: 216px;
   height: 177px;
 }
 .quest_lostMasterclasser1 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -883px -220px;
+  background-position: 0px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_lostMasterclasser2 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -883px -440px;
+  background-position: -220px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_lostMasterclasser3 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -672px;
+  background-position: -440px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_mayhemMistiflying1 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1760px -362px;
+  background-position: -1760px -537px;
   width: 150px;
   height: 150px;
 }
 .quest_mayhemMistiflying2 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -672px;
+  background-position: -880px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_mayhemMistiflying3 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -672px;
+  background-position: -1103px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_monkey {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -672px;
+  background-position: -1103px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_moon1 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1543px -217px;
+  background-position: -1543px -651px;
   width: 216px;
   height: 216px;
 }
 .quest_moon2 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1103px -220px;
+  background-position: -443px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_moon3 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1103px -440px;
+  background-position: 0px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone1 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1103px -660px;
+  background-position: -220px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone2 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -892px;
+  background-position: -440px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone3 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -892px;
+  background-position: -660px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_nudibranch {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1543px -651px;
+  background-position: -1543px -434px;
   width: 216px;
   height: 216px;
 }
 .quest_octopus {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1332px;
+  background-position: -220px -1332px;
   width: 222px;
   height: 177px;
 }
 .quest_owl {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -892px;
+  background-position: -1323px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_peacock {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1543px -1085px;
+  background-position: -1543px -217px;
   width: 216px;
   height: 216px;
 }
 .quest_penguin {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1760px -178px;
+  background-position: -1760px -353px;
   width: 190px;
   height: 183px;
 }
 .quest_pterodactyl {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -443px 0px;
+  background-position: -1323px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_rat {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1323px -440px;
+  background-position: -1323px -880px;
   width: 219px;
   height: 219px;
 }
 .quest_rock {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1543px -434px;
+  background-position: -1543px 0px;
   width: 216px;
   height: 216px;
 }
 .quest_rooster {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1525px -1332px;
+  background-position: -1760px 0px;
   width: 213px;
   height: 174px;
 }
 .quest_sabretooth {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1112px;
+  background-position: -440px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_seaserpent {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -1112px;
+  background-position: -660px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_sheep {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -1112px;
+  background-position: 0px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_slime {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1323px -880px;
+  background-position: -1323px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_sloth {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1323px -660px;
+  background-position: -880px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_snail {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -882px -1112px;
+  background-position: -1322px -1112px;
   width: 219px;
   height: 213px;
 }
 .quest_snake {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -223px -1332px;
+  background-position: -443px -1332px;
   width: 216px;
   height: 177px;
 }
 .quest_spider {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1510px;
+  background-position: -468px -1519px;
   width: 250px;
   height: 150px;
 }
 .quest_squirrel {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1323px 0px;
+  background-position: -883px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_stoikalmCalamity1 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1760px -664px;
+  background-position: -1760px -839px;
   width: 150px;
   height: 150px;
 }
 .quest_stoikalmCalamity2 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -892px;
+  background-position: -880px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_stoikalmCalamity3 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -892px;
+  background-position: -440px -232px;
   width: 219px;
   height: 219px;
 }
 .quest_taskwoodsTerror1 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1760px -513px;
+  background-position: -1760px -688px;
   width: 150px;
   height: 150px;
 }
@@ -306,43 +318,43 @@
 }
 .quest_taskwoodsTerror3 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -892px;
+  background-position: -220px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_treeling {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -1332px;
+  background-position: -877px -1332px;
   width: 216px;
   height: 177px;
 }
 .quest_trex {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1760px 0px;
+  background-position: -1760px -175px;
   width: 204px;
   height: 177px;
 }
 .quest_trex_undead {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1308px -1332px;
+  background-position: -1094px -1332px;
   width: 216px;
   height: 177px;
 }
 .quest_triceratops {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1103px 0px;
+  background-position: -1323px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_turtle {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -672px;
+  background-position: -1100px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_unicorn {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -883px 0px;
+  background-position: -660px -672px;
   width: 219px;
   height: 219px;
 }
@@ -354,265 +366,157 @@
 }
 .quest_vice1 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -874px -1332px;
+  background-position: -1528px -1332px;
   width: 216px;
   height: 177px;
 }
 .quest_vice2 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -232px;
+  background-position: -440px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_vice3 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1322px -1112px;
+  background-position: -1311px -1332px;
   width: 216px;
   height: 177px;
 }
 .quest_whale {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -232px;
+  background-position: -663px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_yarn {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1543px 0px;
+  background-position: -1543px -1085px;
   width: 216px;
   height: 216px;
 }
 .quest_atom1_soapBars {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1898px -884px;
+  background-position: -1911px -839px;
   width: 48px;
   height: 51px;
 }
 .quest_dilatoryDistress1_blueFins {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1898px -1298px;
+  background-position: -1809px -1111px;
   width: 51px;
   height: 48px;
 }
 .quest_dilatoryDistress1_fireCoral {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1911px -362px;
+  background-position: -1858px -1059px;
   width: 48px;
   height: 51px;
 }
 .quest_egg_plainEgg {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1911px -414px;
+  background-position: -1911px -688px;
   width: 48px;
   height: 51px;
 }
 .quest_evilsanta2_branches {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1911px -513px;
+  background-position: -1911px -740px;
   width: 48px;
   height: 51px;
 }
 .quest_evilsanta2_tracks {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1898px -815px;
+  background-position: -1911px -537px;
   width: 54px;
   height: 60px;
 }
 .quest_goldenknight1_testimony {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1898px -953px;
+  background-position: -1911px -891px;
   width: 48px;
   height: 51px;
 }
 .quest_lostMasterclasser1_ancientTome {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1829px -1436px;
+  background-position: -1895px -1111px;
   width: 33px;
   height: 42px;
 }
 .quest_lostMasterclasser1_forbiddenTome {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1898px -1367px;
+  background-position: -1861px -1111px;
   width: 33px;
   height: 42px;
 }
 .quest_lostMasterclasser1_hiddenTome {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1911px -768px;
+  background-position: -1927px -990px;
   width: 33px;
   height: 42px;
 }
 .quest_mayhemMistiflying2_mistifly1 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1911px -565px;
+  background-position: -1809px -1059px;
   width: 48px;
   height: 51px;
 }
 .quest_mayhemMistiflying2_mistifly2 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1911px -664px;
+  background-position: -1911px -598px;
   width: 48px;
   height: 51px;
 }
 .quest_mayhemMistiflying2_mistifly3 {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1911px -716px;
+  background-position: -1907px -1059px;
   width: 48px;
   height: 51px;
 }
 .quest_moon1_shard {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1911px -466px;
+  background-position: -1911px -792px;
   width: 42px;
   height: 42px;
 }
 .quest_moonstone1_moonstone {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1932px -1367px;
+  background-position: -1911px -650px;
   width: 30px;
   height: 30px;
 }
 .quest_stoikalmCalamity2_icicleCoin {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1898px -1022px;
+  background-position: -1760px -1111px;
   width: 48px;
   height: 51px;
 }
 .quest_taskwoodsTerror2_brownie {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1898px -1091px;
+  background-position: -1760px -1059px;
   width: 48px;
   height: 51px;
 }
 .quest_taskwoodsTerror2_dryad {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1898px -1160px;
+  background-position: -1878px -990px;
   width: 48px;
   height: 51px;
 }
 .quest_taskwoodsTerror2_pixie {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1898px -1229px;
+  background-position: -1829px -990px;
   width: 48px;
   height: 51px;
 }
 .quest_vice2_lightCrystal {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1911px -617px;
+  background-position: -1911px -943px;
   width: 40px;
   height: 40px;
 }
 .inventory_quest_scroll_alligator {
   background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1829px -1022px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_armadillo {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1760px -1091px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_atom1 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1760px -815px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_atom1_locked {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1829px -1091px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_atom2 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1760px -1229px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_atom2_locked {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1829px -1160px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_atom3 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1760px -1298px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_atom3_locked {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1829px -1229px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_axolotl {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1829px -1298px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_badger {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1760px -1367px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_basilist {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1829px -1367px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_beetle {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1760px -1160px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_bronze {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1760px -1436px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_bunny {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1760px -1022px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_butterfly {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1829px -953px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_cheetah {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1760px -953px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_cow {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1829px -884px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_dilatoryDistress1 {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1829px -815px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_dilatory_derby {
-  background-image: url('~assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1760px -884px;
+  background-position: -1760px -990px;
   width: 68px;
   height: 68px;
 }

website/client/components/avatar.vue

@@ -139,7 +139,7 @@ export default {
       let val = '28px';
 
       if (!this.avatarOnly) {
-        if (this.member.items.currentPet) val = '24.5px';
+        if (this.member.items.currentPet) val = '24px';
         if (this.member.items.currentMount) val = '0px';
       }
 

website/client/components/shops/buyModal.vue

@@ -79,7 +79,7 @@
       span.svg-icon.inline.icon-16.clock-icon(v-html="icons.clock")
       span.limitedString {{ limitedString }}
 
-    .free-rebirth.d-flex.align-items-center(v-if='item.key === "rebirth_orb" && item.value > 0')
+    .free-rebirth.d-flex.align-items-center(v-if='item.key === "rebirth_orb" && item.value > 0 && user.stats.lvl >= 100')
       .m-auto
         span.svg-icon.inline.icon-16.mr-2.pt-015(v-html="icons.whiteClock")
         span(v-html='$t("nextFreeRebirth", {days: nextFreeRebirth})')

website/common/locales/en/content.json

@@ -288,6 +288,7 @@
   "hatchingPotionVeggie": "Garden",
   "hatchingPotionSunshine": "Sunshine",
   "hatchingPotionBronze": "Bronze",
+  "hatchingPotionWatery": "Watery",
 
   "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

@@ -823,6 +823,8 @@
   "armorMystery201903Notes": "People are dye-ing to know where you got this egg-cellent outfit! Confers no benefit. March 2019 Subscriber Item.",
   "armorMystery201904Text": "Opalescent Outfit",
   "armorMystery201904Notes": "This shining garment has opals sewn into the front panel to grant you arcane powers and a fabulous look. Confers no benefit. April 2019 Subscriber Item.",
+  "armorMystery201906Text": "Kindly Koi Tail",
+  "armorMystery201906Notes": "We will spare you a pun about “playing koi.” Oh wait, oops. Confers no benefit. June 2019 Subscriber Item.",
   "armorMystery301404Text": "Steampunk Suit",
   "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
   "armorMystery301703Text": "Steampunk Peacock Gown",
@@ -1950,6 +1952,8 @@
   "headAccessoryMystery201812Notes": "You hear the subtle sound of snowflakes falling upon the landscape. Confers no benefit. December 2018 Subscriber Item.",
   "headAccessoryMystery201905Text": "Dazzling Dragon Horns",
   "headAccessoryMystery201905Notes": "These horns are as sharp as they are shimmery. Confers no benefit. May 2019 Subscriber Item.",
+  "headAccessoryMystery201906Text": "Kindly Koi Ears",
+  "headAccessoryMystery201906Notes": "Legend has it these finny ears help merfolk hear the calls and songs of all the denizens of the deep! Confers no benefit. June 2019 Subscriber Item.",
   "headAccessoryMystery301405Text": "Headwear Goggles",
   "headAccessoryMystery301405Notes": "\"Goggles are for your eyes,\" they said. \"Nobody wants goggles that you can only wear on your head,\" they said. Hah! You sure showed them! Confers no benefit. August 3015 Subscriber Item.",
 

website/common/locales/en/limited.json

@@ -143,10 +143,12 @@
     "summer2019ConchHealerSet": "Conch (Healer)",
     "summer2019HammerheadRogueSet": "Hammerhead (Rogue)",
     "eventAvailability": "Available for purchase until <%= date(locale) %>.",
+    "eventAvailabilityReturning": "Available for purchase until <%= availableDate(locale) %>. This potion was previously released in <%= previousDate(locale) %>.",
     "dateEndMarch": "April 30",
     "dateEndApril": "April 19",
     "dateEndMay": "May 31",
     "dateEndJune": "June 14",
+    "june2018": "June 2018",
     "dateEndJuly": "July 31",
     "dateEndAugust": "August 31",
     "dateEndSeptember": "September 21",

website/common/locales/en/subscriber.json

@@ -159,6 +159,7 @@
     "mysterySet201903": "Egg-squisite Set",
     "mysterySet201904": "Opulent Opal Set",
     "mysterySet201905": "Dazzling Dragon Set",
+    "mysterySet201906": "Kindly Koi Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",

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

@@ -235,6 +235,12 @@ let armor = {
     mystery: '201904',
     value: 0,
   },
+  201906: {
+    text: t('armorMystery201906Text'),
+    notes: t('armorMystery201906Notes'),
+    mystery: '201906',
+    value: 0,
+  },
   301404: {
     text: t('armorMystery301404Text'),
     notes: t('armorMystery301404Notes'),
@@ -784,6 +790,12 @@ let headAccessory = {
     mystery: '201905',
     value: 0,
   },
+  201906: {
+    text: t('headAccessoryMystery201906Text'),
+    notes: t('headAccessoryMystery201906Notes'),
+    mystery: '201906',
+    value: 0,
+  },
   301405: {
     text: t('headAccessoryMystery301405Text'),
     notes: t('headAccessoryMystery301405Notes'),

website/common/script/content/gear/sets/special/index.js

@@ -5122,7 +5122,7 @@ let weapon = {
     set: 'summer2019WaterLilyMageSet',
     text: t('weaponSpecialSummer2019MageText'),
     notes: t('weaponSpecialSummer2019MageNotes', { int: 15 }),
-    value: 160,
+    value: 90,
     int: 15,
   },
   summer2019Healer: {

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

@@ -3,7 +3,7 @@ import defaults from 'lodash/defaults';
 import each from 'lodash/each';
 import t from './translation';
 
-const CURRENT_SEASON = '_NONE_';
+const CURRENT_SEASON = 'July';
 
 function hasQuestAchievementFunction (key) {
   return (user) => {
@@ -143,7 +143,11 @@ let premium = {
     value: 2,
     text: t('hatchingPotionGlass'),
     limited: true,
-    _season: '_PENDING_',
+    _season: 'July',
+    _addlNotes: t('eventAvailabilityReturning', {
+      availableDate: t('dateEndJuly'),
+      previousDate: t('june2018'),
+    }),
   },
   Glow: {
     value: 2,
@@ -190,6 +194,12 @@ let premium = {
       return '';
     },
   },
+  Watery: {
+    value: 2,
+    text: t('hatchingPotionWatery'),
+    limited: true,
+    _season: 'July',
+  },
 };
 
 const wacky = {

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

@@ -258,6 +258,10 @@ let mysterySets = {
     start: '2019-05-28',
     end: '2019-06-02',
   },
+  201906: {
+    start: '2019-06-25',
+    end: '2019-07-02',
+  },
   301404: {
     start: '3014-03-24',
     end: '3014-04-02',

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

@@ -9,15 +9,15 @@ const featuredItems = {
     },
     {
       type: 'eggs',
-      path: 'eggs.Fox',
+      path: 'eggs.BearCub',
     },
     {
-      type: 'hatchingPotions',
-      path: 'hatchingPotions.CottonCandyBlue',
+      type: 'premiumHatchingPotion',
+      path: 'premiumHatchingPotions.Glass',
     },
     {
-      type: 'card',
-      path: 'cardTypes.congrats',
+      type: 'premiumHatchingPotion',
+      path: 'premiumHatchingPotions.Watery',
     },
   ],
   quests: [

website/common/script/libs/shops-seasonal.config.js

@@ -19,6 +19,7 @@ module.exports = {
   },
 
   availableSpells: [
+    'seafoam',
   ],
 
   availableQuests: [