Merge branch 'release' into develop

migrations/archive/2019/20191022_pet_color_achievements.js

@@ -0,0 +1,82 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20191022_pet_color_achievements';
+import { model as User } from '../../../website/server/models/user';
+
+const progressCount = 1000;
+let count = 0;
+
+async function updateUser (user) {
+  count++;
+
+  let set = {
+    migration: MIGRATION_NAME,
+  };
+
+  if (user && user.items && user.items.pets) {
+    const pets = user.items.pets;
+    if (pets['Wolf-Zombie'] > 0
+      && pets['TigerCub-Zombie'] > 0
+      && pets['PandaCub-Zombie'] > 0
+      && pets['LionCub-Zombie'] > 0
+      && pets['Fox-Zombie'] > 0
+      && pets['FlyingPig-Zombie'] > 0
+      && pets['Dragon-Zombie'] > 0
+      && pets['Cactus-Zombie'] > 0
+      && pets['BearCub-Zombie'] > 0) {
+        set['achievements.monsterMagus'] = true;
+      }
+  }
+
+  if (user && user.items && user.items.mounts) {
+    const mounts = user.items.mounts;
+    if (mounts['Wolf-Zombie']
+      && mounts['TigerCub-Zombie']
+      && mounts['PandaCub-Zombie']
+      && mounts['LionCub-Zombie']
+      && mounts['Fox-Zombie']
+      && mounts['FlyingPig-Zombie']
+      && mounts['Dragon-Zombie']
+      && mounts['Cactus-Zombie']
+      && mounts['BearCub-Zombie'] ) {
+        set['achievements.undeadUndertaker'] = true;
+      }
+  }
+
+  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+
+  return await User.update({ _id: user._id }, { $set: set }).exec();
+}
+
+module.exports = async function processUsers () {
+  let query = {
+    migration: { $ne: MIGRATION_NAME },
+    'auth.timestamps.loggedin': { $gt: new Date('2019-10-01') },
+  };
+
+  const fields = {
+    _id: 1,
+    items: 1,
+  };
+
+  while (true) { // eslint-disable-line no-constant-condition
+    const users = await User // eslint-disable-line no-await-in-loop
+      .find(query)
+      .limit(250)
+      .sort({_id: 1})
+      .select(fields)
+      .lean()
+      .exec();
+
+    if (users.length === 0) {
+      console.warn('All appropriate users found and modified.');
+      console.warn(`\n${count} users processed\n`);
+      break;
+    } else {
+      query._id = {
+        $gt: users[users.length - 1]._id,
+      };
+    }
+
+    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
+  }
+};

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.116.8",
+  "version": "4.117.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.116.8",
+  "version": "4.117.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@google-cloud/trace-agent": "^4.2.2",

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

@@ -12,7 +12,7 @@
 }
 .promo_desert_pet_achievements {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -930px -592px;
+  background-position: -373px -395px;
   width: 204px;
   height: 102px;
 }
@@ -54,13 +54,13 @@
 }
 .promo_shadow_spooky_potions {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -737px 0px;
+  background-position: -737px -148px;
   width: 423px;
   height: 147px;
 }
 .promo_spooky_sparkles {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -737px -148px;
+  background-position: -737px -296px;
   width: 423px;
   height: 147px;
 }
@@ -72,10 +72,16 @@
 }
 .promo_witchy_familiars {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -737px -296px;
+  background-position: -737px 0px;
   width: 423px;
   height: 147px;
 }
+.promo_zombie_achievements {
+  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -930px -592px;
+  width: 204px;
+  height: 102px;
+}
 .scene_quest_shop {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: 0px 0px;

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

@@ -1,6 +1,12 @@
+.npc_justin {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1844px -856px;
+  width: 84px;
+  height: 120px;
+}
 .npc_matt {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -597px -1535px;
+  background-position: -214px -1535px;
   width: 195px;
   height: 138px;
 }
@@ -12,7 +18,7 @@
 }
 .banner_flair_dysheartener {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1963px -836px;
+  background-position: -1929px -856px;
   width: 69px;
   height: 18px;
 }
@@ -30,19 +36,19 @@
 }
 .quest_armadillo {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -307px 0px;
+  background-position: -220px -435px;
   width: 219px;
   height: 219px;
 }
 .quest_atom1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1105px -1315px;
+  background-position: -885px -1315px;
   width: 250px;
   height: 150px;
 }
 .quest_atom2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -389px -1535px;
+  background-position: -1387px -1315px;
   width: 207px;
   height: 138px;
 }
@@ -54,19 +60,19 @@
 }
 .quest_axolotl {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -527px 0px;
+  background-position: 0px -655px;
   width: 219px;
   height: 219px;
 }
 .quest_badger {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -435px;
+  background-position: -220px -655px;
   width: 219px;
   height: 219px;
 }
 .quest_basilist {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1844px -392px;
+  background-position: -191px -1710px;
   width: 189px;
   height: 141px;
 }
@@ -78,7 +84,7 @@
 }
 .quest_bronze {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -435px;
+  background-position: -967px 0px;
   width: 219px;
   height: 219px;
 }
@@ -90,25 +96,25 @@
 }
 .quest_butterfly {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -435px;
+  background-position: -967px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_cheetah {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -747px 0px;
+  background-position: 0px -875px;
   width: 219px;
   height: 219px;
 }
 .quest_cow {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1535px;
+  background-position: -1844px 0px;
   width: 174px;
   height: 213px;
 }
 .quest_dilatory {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -655px;
+  background-position: -440px -875px;
   width: 219px;
   height: 219px;
 }
@@ -120,85 +126,85 @@
 }
 .quest_dilatoryDistress2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1844px -534px;
+  background-position: -1844px -573px;
   width: 150px;
   height: 150px;
 }
 .quest_dilatoryDistress3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -655px;
+  background-position: -1187px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_dilatory_derby {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -747px -220px;
+  background-position: -220px -875px;
   width: 219px;
   height: 219px;
 }
 .quest_dolphin {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -655px;
+  background-position: -1187px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_dustbunnies {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -655px;
+  background-position: -1187px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_egg {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1844px -184px;
+  background-position: -1844px -214px;
   width: 165px;
   height: 207px;
 }
 .quest_evilsanta {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1844px -836px;
+  background-position: -1844px -724px;
   width: 118px;
   height: 131px;
 }
 .quest_evilsanta2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -967px 0px;
+  background-position: -220px -1095px;
   width: 219px;
   height: 219px;
 }
 .quest_falcon {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -967px -220px;
+  background-position: -307px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_ferret {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -967px -440px;
+  background-position: -660px -1095px;
   width: 219px;
   height: 219px;
 }
 .quest_frog {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -1315px;
+  background-position: -440px -1315px;
   width: 221px;
   height: 213px;
 }
 .quest_ghost_stag {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -875px;
+  background-position: -1100px -1095px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -875px;
+  background-position: -440px -1095px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1356px -1315px;
+  background-position: -1136px -1315px;
   width: 250px;
   height: 150px;
 }
@@ -216,13 +222,13 @@
 }
 .quest_guineapig {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -875px;
+  background-position: -1407px -880px;
   width: 219px;
   height: 219px;
 }
 .quest_harpy {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -875px;
+  background-position: 0px -1315px;
   width: 219px;
   height: 219px;
 }
@@ -234,19 +240,19 @@
 }
 .quest_hippo {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -875px;
+  background-position: -1407px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_horse {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1187px 0px;
+  background-position: -1407px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_kangaroo {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1187px -220px;
+  background-position: -1407px 0px;
   width: 219px;
   height: 219px;
 }
@@ -258,7 +264,7 @@
 }
 .quest_lostMasterclasser1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1187px -440px;
+  background-position: -880px -1095px;
   width: 219px;
   height: 219px;
 }
@@ -270,85 +276,85 @@
 }
 .quest_lostMasterclasser3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1095px;
+  background-position: -660px -875px;
   width: 219px;
   height: 219px;
 }
 .quest_mayhemMistiflying1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1844px -685px;
+  background-position: -1844px -422px;
   width: 150px;
   height: 150px;
 }
 .quest_mayhemMistiflying2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -1095px;
+  background-position: -967px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_mayhemMistiflying3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -1095px;
+  background-position: -660px -655px;
   width: 219px;
   height: 219px;
 }
 .quest_monkey {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -1095px;
+  background-position: -747px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_moon1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1627px 0px;
+  background-position: -1627px -217px;
   width: 216px;
   height: 216px;
 }
 .quest_moon2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -1095px;
+  background-position: -440px -435px;
   width: 219px;
   height: 219px;
 }
 .quest_moon3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -1095px;
+  background-position: 0px -435px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1407px 0px;
+  background-position: -527px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1407px -220px;
+  background-position: -1407px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1407px -440px;
+  background-position: -220px -1315px;
   width: 219px;
   height: 219px;
 }
 .quest_nudibranch {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1627px -217px;
+  background-position: -1627px -651px;
   width: 216px;
   height: 216px;
 }
 .quest_octopus {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -882px -1315px;
+  background-position: -662px -1315px;
   width: 222px;
   height: 177px;
 }
 .quest_owl {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1407px -660px;
+  background-position: 0px -1095px;
   width: 219px;
   height: 219px;
 }
@@ -360,43 +366,37 @@
 }
 .quest_penguin {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1844px 0px;
+  background-position: 0px -1710px;
   width: 190px;
   height: 183px;
 }
 .quest_pterodactyl {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1407px -880px;
+  background-position: -880px -875px;
   width: 219px;
   height: 219px;
 }
 .quest_rat {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1315px;
+  background-position: -440px -655px;
   width: 219px;
   height: 219px;
 }
 .quest_robot {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -1315px;
+  background-position: -747px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_rock {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1627px -651px;
+  background-position: -1627px 0px;
   width: 216px;
   height: 216px;
 }
 .quest_rooster {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -175px -1535px;
+  background-position: 0px -1535px;
   width: 213px;
   height: 174px;
 }
-.quest_sabretooth {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -1315px;
-  width: 219px;
-  height: 219px;
-}

website/client/src/components/notifications.vue

@@ -175,6 +175,7 @@ const NOTIFICATIONS = {
     label: $t => `${$t('achievement')}: ${$t('achievementAridAuthority')}`,
     modalId: 'generic-achievement',
   },
+<<<<<<< HEAD:website/client/src/components/notifications.vue
   ACHIEVEMENT_PARTY_UP: {
     achievement: true,
     label: $t => `${$t('achievement')}: ${$t('achievementPartyUp')}`,
@@ -212,6 +213,18 @@ const NOTIFICATIONS = {
       modalText: $t => $t('triadBingoAchievement'),
     },
   },
+=======
+  ACHIEVEMENT_MONSTER_MAGUS: {
+    achievement: true,
+    label: ($t) => `${$t('achievement')}: ${$t('achievementMonsterMagus')}`,
+    modalId: 'generic-achievement',
+  },
+  ACHIEVEMENT_UNDEAD_UNDERTAKER: {
+    achievement: true,
+    label: ($t) => `${$t('achievement')}: ${$t('achievementUndeadUndertaker')}`,
+    modalId: 'generic-achievement',
+  },
+>>>>>>> release:website/client/components/notifications.vue
 };
 
 export default {
@@ -266,8 +279,14 @@ export default {
       'ULTIMATE_GEAR_ACHIEVEMENT', 'REBIRTH_ACHIEVEMENT', 'GUILD_JOINED_ACHIEVEMENT',
       'CHALLENGE_JOINED_ACHIEVEMENT', 'INVITED_FRIEND_ACHIEVEMENT', 'NEW_CONTRIBUTOR_LEVEL',
       'CRON', 'SCORED_TASK', 'LOGIN_INCENTIVE', 'ACHIEVEMENT_ALL_YOUR_BASE', 'ACHIEVEMENT_BACK_TO_BASICS',
+<<<<<<< HEAD:website/client/src/components/notifications.vue
       'GENERIC_ACHIEVEMENT', 'ACHIEVEMENT_PARTY_UP', 'ACHIEVEMENT_PARTY_ON', 'ACHIEVEMENT_BEAST_MASTER',
       'ACHIEVEMENT_MOUNT_MASTER', 'ACHIEVEMENT_TRIAD_BINGO', 'ACHIEVEMENT_DUST_DEVIL', 'ACHIEVEMENT_ARID_AUTHORITY',
+=======
+      'ACHIEVEMENT_DUST_DEVIL', 'ACHIEVEMENT_ARID_AUTHORITY',
+      'ACHIEVEMENT_MONSTER_MAGUS', 'ACHIEVEMENT_UNDEAD_UNDERTAKER',
+      'GENERIC_ACHIEVEMENT',
+>>>>>>> release:website/client/components/notifications.vue
     ].forEach(type => {
       handledNotifications[type] = true;
     });
@@ -666,11 +685,16 @@ export default {
           case 'ACHIEVEMENT_BACK_TO_BASICS':
           case 'ACHIEVEMENT_DUST_DEVIL':
           case 'ACHIEVEMENT_ARID_AUTHORITY':
+<<<<<<< HEAD:website/client/src/components/notifications.vue
           case 'ACHIEVEMENT_PARTY_UP':
           case 'ACHIEVEMENT_PARTY_ON':
           case 'ACHIEVEMENT_BEAST_MASTER':
           case 'ACHIEVEMENT_MOUNT_MASTER':
           case 'ACHIEVEMENT_TRIAD_BINGO':
+=======
+          case 'ACHIEVEMENT_MONSTER_MAGUS':
+          case 'ACHIEVEMENT_UNDEAD_UNDERTAKER':
+>>>>>>> release:website/client/components/notifications.vue
           case 'GENERIC_ACHIEVEMENT':
             this.showNotificationWithModal(notification);
             break;

website/common/locales/en/achievements.json

@@ -28,5 +28,11 @@
   "achievementAridAuthorityModalText": "You tamed all the Desert Mounts!",
   "achievementKickstarter2019": "Pin Kickstarter Backer",
   "achievementKickstarter2019Text": "Backed the 2019 Pin Kickstarter Project",
-  "achievementPartyOn": "Your party grew to 4 members!"
+  "achievementPartyOn": "Your party grew to 4 members!",
+  "achievementMonsterMagus": "Monster Magus",
+  "achievementMonsterMagusText": "Has collected all Zombie Pets.",
+  "achievementMonsterMagusModalText": "You collected all the Zombie Pets!",
+  "achievementUndeadUndertaker": "Undead Undertaker",
+  "achievementUndeadUndertakerText": "Has tamed all Zombie Mounts.",
+  "achievementUndeadUndertakerModalText": "You tamed all the Zombie Mounts!"
 }

website/common/locales/en/npc.json

@@ -24,7 +24,7 @@
   "sleepDescription": "Need a break? Check into Daniel's Inn to pause some of Habitica's more difficult game mechanics:",
   "sleepBullet1": "Missed Dailies won't damage you",
   "sleepBullet2": "Tasks won't lose streaks or decay in color",
-  "sleepBullet3": "Bosses won't do damage for your missed Dailies",
+  "sleepBullet3": "Bosses won't do damage for your own missed Dailies",
   "sleepBullet4": "Your boss damage or collection Quest items will stay pending until check-out",
   "pauseDailies": "Pause Damage",
   "unpauseDailies": "Unpause Damage",

website/common/script/content/achievements.js

@@ -157,6 +157,16 @@ const basicAchievs = {
     titleKey: 'achievementAridAuthority',
     textKey: 'achievementAridAuthorityText',
   },
+  monsterMagus: {
+    icon: 'achievement-monsterMagus',
+    titleKey: 'achievementMonsterMagus',
+    textKey: 'achievementMonsterMagusText',
+  },
+  undeadUndertaker: {
+    icon: 'achievement-undeadUndertaker',
+    titleKey: 'achievementUndeadUndertaker',
+    textKey: 'achievementUndeadUndertakerText',
+  },
 };
 Object.assign(achievementsData, basicAchievs);
 

website/common/script/content/constants.js

@@ -268,6 +268,9 @@ export const ANIMAL_COLOR_ACHIEVEMENTS = [
     color: 'Base', petAchievement: 'backToBasics', petNotificationType: 'ACHIEVEMENT_BACK_TO_BASICS', mountAchievement: 'allYourBase', mountNotificationType: 'ACHIEVEMENT_ALL_YOUR_BASE',
   },
   {
-    color: 'Desert', petAchievement: 'dustDevil', petNotificationType: 'ACHIEVEMENT_DUST_DEVIL', mountAchievement: 'aridAuthority', mountNotificationType: 'ACHIEVEMENT_ARID_AUTHORITY',
+    color: 'Desert', petAchievement: 'dustDevil', petNotificationType: 'ACHIEVEMENT_DUST_DEVIL', mountAchievement: 'aridAuthority', mountNotificationType: 'ACHIEVEMENT_ARID_AUTHORITY'
+  },
+  {
+    color: 'Zombie', petAchievement: 'monsterMagus', petNotificationType: 'ACHIEVEMENT_MONSTER_MAGUS', mountAchievement: 'undeadUndertaker', mountNotificationType: 'ACHIEVEMENT_UNDEAD_UNDERTAKER'
   },
 ];

website/common/script/libs/achievements.js

@@ -177,33 +177,35 @@ function _addUltimateGear (result, user, data) {
 function _getBasicAchievements (user, language) {
   const result = {};
 
-  _addPlural(result, user, { path: 'streak', language });
-  _addPlural(result, user, { path: 'perfect', language });
+  _addPlural(result, user, {path: 'streak', language});
+  _addPlural(result, user, {path: 'perfect', language});
 
-  _addSimple(result, user, { path: 'partyUp', language });
-  _addSimple(result, user, { path: 'partyOn', language });
-  _addSimple(result, user, { path: 'joinedGuild', language });
-  _addSimple(result, user, { path: 'royallyLoyal', language });
-  _addSimple(result, user, { path: 'joinedChallenge', language });
-  _addSimple(result, user, { path: 'invitedFriend', language });
-  _addSimple(result, user, { path: 'lostMasterclasser', language });
-  _addSimple(result, user, { path: 'mindOverMatter', language });
-  _addSimple(result, user, { path: 'justAddWater', language });
-  _addSimple(result, user, { path: 'backToBasics', language });
-  _addSimple(result, user, { path: 'allYourBase', language });
-  _addSimple(result, user, { path: 'dustDevil', language });
-  _addSimple(result, user, { path: 'aridAuthority', language });
+  _addSimple(result, user, {path: 'partyUp', language});
+  _addSimple(result, user, {path: 'partyOn', language});
+  _addSimple(result, user, {path: 'joinedGuild', language});
+  _addSimple(result, user, {path: 'royallyLoyal', language});
+  _addSimple(result, user, {path: 'joinedChallenge', language});
+  _addSimple(result, user, {path: 'invitedFriend', language});
+  _addSimple(result, user, {path: 'lostMasterclasser', language});
+  _addSimple(result, user, {path: 'mindOverMatter', language});
+  _addSimple(result, user, {path: 'justAddWater', language});
+  _addSimple(result, user, {path: 'backToBasics', language});
+  _addSimple(result, user, {path: 'allYourBase', language});
+  _addSimple(result, user, {path: 'dustDevil', language});
+  _addSimple(result, user, {path: 'aridAuthority', language});
+  _addSimple(result, user, {path: 'monsterMagus', language});
+  _addSimple(result, user, {path: 'undeadUndertaker', language});
 
-  _addSimpleWithMasterCount(result, user, { path: 'beastMaster', language });
-  _addSimpleWithMasterCount(result, user, { path: 'mountMaster', language });
-  _addSimpleWithMasterCount(result, user, { path: 'triadBingo', language });
+  _addSimpleWithMasterCount(result, user, {path: 'beastMaster', language});
+  _addSimpleWithMasterCount(result, user, {path: 'mountMaster', language});
+  _addSimpleWithMasterCount(result, user, {path: 'triadBingo', language});
 
-  _addUltimateGear(result, user, { path: 'healer', language });
-  _addUltimateGear(result, user, { path: 'rogue', language });
-  _addUltimateGear(result, user, { path: 'warrior', language });
-  _addUltimateGear(result, user, { path: 'mage', altPath: 'wizard', language });
+  _addUltimateGear(result, user, {path: 'healer', language});
+  _addUltimateGear(result, user, {path: 'rogue', language});
+  _addUltimateGear(result, user, {path: 'warrior', language});
+  _addUltimateGear(result, user, {path: 'mage', altPath: 'wizard', language});
 
-  const cardAchievements = ['greeting', 'thankyou', 'birthday', 'congrats', 'getwell', 'goodluck'];
+  let cardAchievements = ['greeting', 'thankyou', 'birthday', 'congrats', 'getwell', 'goodluck'];
   cardAchievements.forEach(path => {
     _addSimpleWithCount(result, user, { path, key: `${path}Cards`, language });
   });

website/server/controllers/api-v3/news.js

@@ -2,10 +2,8 @@ import { authWithHeaders } from '../../middlewares/auth';
 
 const api = {};
 
-// @TODO export this const, cannot export it
-// from here because only routes are exported from controllers
-const LAST_ANNOUNCEMENT_TITLE = 'HABITICA HIRING ANDROID DEVELOPER! AND BLOG POST ON THE QUEST SHOP';
-
+// @TODO export this const, cannot export it from here because only routes are exported from controllers
+const LAST_ANNOUNCEMENT_TITLE = 'NEW PET COLLECTION BADGES!';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -32,17 +30,14 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>10/17/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>10/22/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <h3>Habitica is Hiring! Android Developer Position</h3>
-        <p>Want to join the Habitica team? We’re looking to hire a new developer to help with our Android app! Our ideal candidate is a mobile developer with experience in Kotlin who is capable of supporting existing legacy code and working with our team to continue improving the user experience. You'll make major contributions that help serve and grow an audience of millions of users!</p>
-        <p>If this sounds like a job you'll love, check out the <a href='https://forms.gle/rdyDPTRD8ZjE2qLG8' target='_blank'>full job posting</a> for more information and to fill out an application. </p>
-        <div class="scene_quest_shop center-block"></div>
-        <h3>Blog Post: Quest Shop</h3>
-        <p>This month's <a href='https://habitica.wordpress.com/2019/10/16/quest-shop/' target='_blank'>featured Wiki article</a> is about the Quest Shop! We hope that it will help you as you look for additional ways to keep your Habitica adventure fun and motivating. Be sure to check it out, and let us know what you think by reaching out on <a href='https://twitter.com/habitica' target='_blank'>Twitter</a>, <a href='http://blog.habitrpg.com' target='_blank'>Tumblr</a>, and <a href='https://facebook.com/habitica' target='_blank'>Facebook</a>.</p>
-        <div class="small mb-3">by shanaqui and the Wiki Wizards</div>
+        <div class="promo_zombie_achievements center-block"></div>
+        <p>We're releasing a new achievement so you can celebrate your successes in the world of Habitican pet collecting! Earn the Monster Magus and Undead Undertaker achievements by collecting Zombie pets and mounts and you'll earn a nifty badge for your profile.</p>
+        <p>If you already have all the Zombie pets and/or mounts in your stable, you'll receive the badge automatically! Check your profile and celebrate your new achievement with pride.</p>
+        <div class="small mb-3">By OuttaMyMind and SabreCat</div>
       </div>
       `,
     });

website/server/models/user/schema.js

@@ -130,6 +130,8 @@ export default new Schema({
     dustDevil: Boolean,
     aridAuthority: Boolean,
     kickstarter2019: Boolean,
+    monsterMagus: Boolean,
+    undeadUndertaker: Boolean,
   },
 
   backer: {