Merge branch 'develop' into sabrecat/usernames-master

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

@@ -1,6 +1,6 @@
 .achievement-costumeContest6x {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -142px -727px;
+  background-position: -437px -727px;
   width: 144px;
   height: 156px;
 }
@@ -30,7 +30,7 @@
 }
 .promo_mystery_201810 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -958px -428px;
+  background-position: -142px -727px;
   width: 294px;
   height: 168px;
 }
@@ -48,10 +48,16 @@
 }
 .promo_veteran_pets {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -958px -286px;
+  background-position: -958px -563px;
   width: 363px;
   height: 141px;
 }
+.scene_dailies {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -958px -286px;
+  width: 327px;
+  height: 276px;
+}
 .scene_nametag {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: -376px -365px;
@@ -66,7 +72,7 @@
 }
 .scene_veteran_pets {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -958px -597px;
+  background-position: -582px -727px;
   width: 242px;
   height: 62px;
 }

website/client/components/settings/notifications.vue

@@ -59,6 +59,7 @@ export default {
         'importantAnnouncements',
         'weeklyRecaps',
         'onboarding',
+        'majorUpdates',
       ]),
       // list of email-only notifications
       onlyEmailsIds: Object.freeze([

website/client/libs/createAnimal.js

@@ -1,4 +1,8 @@
 
+import content from 'common/script/content';
+
+const specialPets = Object.keys(content.specialPets);
+
 function getText (textOrFunction) {
   if (textOrFunction instanceof Function) {
     return textOrFunction();
@@ -18,10 +22,12 @@ export function isHatchable (animal, userItems) {
 }
 
 export function isAllowedToFeed (animal, userItems) {
-  return isOwned('pet', animal, userItems) && !isOwned('mount', animal, userItems);
+  return !specialPets.includes(animal.key) &&
+    isOwned('pet', animal, userItems) &&
+    !isOwned('mount', animal, userItems);
 }
 
-export function createAnimal (egg, potion, type, content, userItems) {
+export function createAnimal (egg, potion, type, _content, userItems) {
   let animalKey = `${egg.key}-${potion.key}`;
 
   return {
@@ -31,7 +37,7 @@ export function createAnimal (egg, potion, type, content, userItems) {
     eggName: getText(egg.text),
     potionKey: potion.key,
     potionName: getText(potion.text),
-    name: content[`${type}Info`][animalKey].text(),
+    name: _content[`${type}Info`][animalKey].text(),
     isOwned () {
       return isOwned(type, this, userItems);
     },
@@ -46,3 +52,4 @@ export function createAnimal (egg, potion, type, content, userItems) {
     },
   };
 }
+