4.159.0

chore(news): Bailey
Merge branch 'sabrecat/fall-2020' into release
2026-05-13 03:22:52 -05:00 · 2020-09-22 09:09:51 -05:00 · 2020-09-22 09:09:43 -05:00 · 2020-09-22 09:00:21 -05:00 · 2020-09-22 15:53:05 +02:00 · 2020-09-21 19:59:13 -05:00
634 changed files with 19174 additions and 34470 deletions
@@ -0,0 +1,73 @@
+import { model as User } from '../../website/server/models/user';
+
+const MIGRATION_NAME = 'tag-challenge-field-string2bool';
+
+const progressCount = 1000;
+let count = 0;
+
+export default async function processUsers () {
+  const query = {
+    migration: { $ne: MIGRATION_NAME },
+    tags: {
+      $elemMatch: {
+        challenge: {
+          $exists: true,
+          $type: 'string',
+        },
+      },
+    },
+  };
+
+  while (true) { // eslint-disable-line no-constant-condition
+    // eslint-disable-next-line no-await-in-loop
+    const users = await User.find(query)
+      .sort({ _id: 1 })
+      .limit(250)
+      .select({ _id: 1, tags: 1 })
+      .lean()
+      .exec();
+
+    if (users.length === 0) {
+      console.warn('All appropriate users found and modified.');
+      console.warn(`\n${count} users processed\n`);
+      break;
+    } else {
+      query._id = {
+        $gt: users[users.length - 1],
+      };
+    }
+
+    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
+  }
+}
+
+async function updateUser (user) {
+  count += 1;
+  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+  let requiresUpdate = false;
+
+  if (user && user.tags) {
+    user.tags.forEach(tag => {
+      if (tag && typeof tag.challenge === 'string') {
+        requiresUpdate = true;
+        if (tag.challenge === 'true') {
+          tag.challenge = true;
+        } else if (tag.challenge === 'false') {
+          tag.challenge = false;
+        } else {
+          tag.challenge = null;
+        }
+      }
+    });
+  }
+
+  if (requiresUpdate) {
+    const set = {
+      migration: MIGRATION_NAME,
+      tags: user.tags,
+    };
+    return User.update({ _id: user._id }, { $set: set }).exec();
+  }
+
+  return null;
+}
@@ -1,6 +1,6 @@
 {
  "name": "habitica",
-  "version": "4.156.1",
+  "version": "4.159.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -23,18 +23,18 @@
      }
    },
    "@babel/core": {
-      "version": "7.11.4",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.4.tgz",
-      "integrity": "sha512-5deljj5HlqRXN+5oJTY7Zs37iH3z3b++KjiKtIsJy1NrjOOVSEaJHEetLBhyu0aQOSNNZ/0IuEAan9GzRuDXHg==",
+      "version": "7.11.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz",
+      "integrity": "sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==",
      "requires": {
        "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.11.4",
+        "@babel/generator": "^7.11.6",
        "@babel/helper-module-transforms": "^7.11.0",
        "@babel/helpers": "^7.10.4",
-        "@babel/parser": "^7.11.4",
+        "@babel/parser": "^7.11.5",
        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.11.0",
-        "@babel/types": "^7.11.0",
+        "@babel/traverse": "^7.11.5",
+        "@babel/types": "^7.11.5",
        "convert-source-map": "^1.7.0",
        "debug": "^4.1.0",
        "gensync": "^1.0.0-beta.1",
@@ -46,29 +46,15 @@
      },
      "dependencies": {
        "@babel/generator": {
-          "version": "7.11.4",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.4.tgz",
-          "integrity": "sha512-Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1g==",
+          "version": "7.11.6",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
          "requires": {
-            "@babel/types": "^7.11.0",
+            "@babel/types": "^7.11.5",
            "jsesc": "^2.5.1",
            "source-map": "^0.5.0"
          }
        },
-        "@babel/helper-module-transforms": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-          "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
-          "requires": {
-            "@babel/helper-module-imports": "^7.10.4",
-            "@babel/helper-replace-supers": "^7.10.4",
-            "@babel/helper-simple-access": "^7.10.4",
-            "@babel/helper-split-export-declaration": "^7.11.0",
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.11.0",
-            "lodash": "^4.17.19"
-          }
-        },
        "@babel/helper-split-export-declaration": {
          "version": "7.11.0",
          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
@@ -78,30 +64,30 @@
          }
        },
        "@babel/parser": {
-          "version": "7.11.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.4.tgz",
-          "integrity": "sha512-MggwidiH+E9j5Sh8pbrX5sJvMcsqS5o+7iB42M9/k0CD63MjYbdP4nhSh7uB5wnv2/RVzTZFTxzF/kIa5mrCqA=="
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="
        },
        "@babel/traverse": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz",
-          "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
          "requires": {
            "@babel/code-frame": "^7.10.4",
-            "@babel/generator": "^7.11.0",
+            "@babel/generator": "^7.11.5",
            "@babel/helper-function-name": "^7.10.4",
            "@babel/helper-split-export-declaration": "^7.11.0",
-            "@babel/parser": "^7.11.0",
-            "@babel/types": "^7.11.0",
+            "@babel/parser": "^7.11.5",
+            "@babel/types": "^7.11.5",
            "debug": "^4.1.0",
            "globals": "^11.1.0",
            "lodash": "^4.17.19"
          }
        },
        "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
          "requires": {
            "@babel/helper-validator-identifier": "^7.10.4",
            "lodash": "^4.17.19",
@@ -183,11 +169,10 @@
      }
    },
    "@babel/helper-explode-assignable-expression": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz",
-      "integrity": "sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==",
+      "version": "7.11.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz",
+      "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==",
      "requires": {
-        "@babel/traverse": "^7.10.4",
        "@babel/types": "^7.10.4"
      }
    },
@@ -234,17 +219,37 @@
      }
    },
    "@babel/helper-module-transforms": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz",
-      "integrity": "sha512-4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
+      "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
      "requires": {
        "@babel/helper-module-imports": "^7.10.4",
        "@babel/helper-replace-supers": "^7.10.4",
        "@babel/helper-simple-access": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.11.0",
        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.5",
+        "@babel/types": "^7.11.0",
        "lodash": "^4.17.19"
+      },
+      "dependencies": {
+        "@babel/helper-split-export-declaration": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
+        },
+        "@babel/types": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
      }
    },
    "@babel/helper-optimise-call-expression": {
@@ -269,14 +274,13 @@
      }
    },
    "@babel/helper-remap-async-to-generator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz",
-      "integrity": "sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==",
+      "version": "7.11.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz",
+      "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==",
      "requires": {
        "@babel/helper-annotate-as-pure": "^7.10.4",
        "@babel/helper-wrap-function": "^7.10.4",
        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
        "@babel/types": "^7.10.4"
      }
    },
@@ -309,9 +313,9 @@
      },
      "dependencies": {
        "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
          "requires": {
            "@babel/helper-validator-identifier": "^7.10.4",
            "lodash": "^4.17.19",
@@ -624,9 +628,9 @@
      }
    },
    "@babel/plugin-transform-block-scoping": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.5.tgz",
-      "integrity": "sha512-6Ycw3hjpQti0qssQcA6AMSFDHeNJ++R6dIMnpRqUjFeBBTmTDPa8zgF90OVfTvAo11mXZTlVUViY1g8ffrURLg==",
+      "version": "7.11.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz",
+      "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==",
      "requires": {
        "@babel/helper-plugin-utils": "^7.10.4"
      }
@@ -881,9 +885,9 @@
      }
    },
    "@babel/preset-env": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz",
-      "integrity": "sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg==",
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz",
+      "integrity": "sha512-kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA==",
      "requires": {
        "@babel/compat-data": "^7.11.0",
        "@babel/helper-compilation-targets": "^7.10.4",
@@ -947,7 +951,7 @@
        "@babel/plugin-transform-unicode-escapes": "^7.10.4",
        "@babel/plugin-transform-unicode-regex": "^7.10.4",
        "@babel/preset-modules": "^0.1.3",
-        "@babel/types": "^7.11.0",
+        "@babel/types": "^7.11.5",
        "browserslist": "^4.12.0",
        "core-js-compat": "^3.6.2",
        "invariant": "^2.2.2",
@@ -956,9 +960,9 @@
      },
      "dependencies": {
        "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
          "requires": {
            "@babel/helper-validator-identifier": "^7.10.4",
            "lodash": "^4.17.19",
@@ -968,9 +972,9 @@
      }
    },
    "@babel/preset-modules": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz",
-      "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
+      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
      "requires": {
        "@babel/helper-plugin-utils": "^7.0.0",
        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
@@ -980,9 +984,9 @@
      }
    },
    "@babel/register": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.10.5.tgz",
-      "integrity": "sha512-eYHdLv43nyvmPn9bfNfrcC4+iYNwdQ8Pxk1MFJuU/U5LpSYl/PH4dFMazCYZDFVi8ueG3shvO+AQfLrxpYulQw==",
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.11.5.tgz",
+      "integrity": "sha512-CAml0ioKX+kOAvBQDHa/+t1fgOt3qkTIz0TrRtRAT6XY0m5qYZXR85k6/sLCNPMGhYDlCFHCYuU0ybTJbvlC6w==",
      "requires": {
        "find-cache-dir": "^2.0.0",
        "lodash": "^4.17.19",
@@ -992,9 +996,9 @@
      }
    },
    "@babel/runtime": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.0.tgz",
-      "integrity": "sha512-qArkXsjJq7H+T86WrIFV0Fnu/tNOkZ4cgXmjkzAu3b/58D5mFIO8JH/y77t7C9q0OdDRdh9s7Ue5GasYssxtXw==",
+      "version": "7.11.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
+      "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
      "requires": {
        "regenerator-runtime": "^0.13.4"
      }
@@ -1154,9 +1158,9 @@
      }
    },
    "@sindresorhus/is": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-3.1.0.tgz",
-      "integrity": "sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-3.1.2.tgz",
+      "integrity": "sha512-JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ=="
    },
    "@sinonjs/commons": {
      "version": "1.8.1",
@@ -1399,9 +1403,9 @@
      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
    },
    "@types/mongodb": {
-      "version": "3.5.25",
-      "resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.5.25.tgz",
-      "integrity": "sha512-2H/Owt+pHCl9YmBOYnXc3VdnxejJEjVdH+QCWL5ZAfPehEn3evygKBX3/vKRv7aTwfNbUd0E5vjJdQklH/9a6w==",
+      "version": "3.5.27",
+      "resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.5.27.tgz",
+      "integrity": "sha512-1jxKDgdfJEOO9zp+lv43p8jOqRs02xPrdUTzAZIVK9tVEySfCEmktL2jEu9A3wOBEOs18yKzpVIKUh8b8ALk3w==",
      "dev": true,
      "requires": {
        "@types/bson": "*",
@@ -2825,9 +2829,9 @@
      }
    },
    "bl": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
-      "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz",
+      "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==",
      "requires": {
        "readable-stream": "^2.3.5",
        "safe-buffer": "^5.1.1"
@@ -3003,14 +3007,14 @@
      "dev": true
    },
    "browserslist": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz",
-      "integrity": "sha512-MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ==",
+      "version": "4.14.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.1.tgz",
+      "integrity": "sha512-zyBTIHydW37pnb63c7fHFXUG6EcqWOqoMdDx6cdyaDFriZ20EoVxcE95S54N+heRqY8m8IUgB5zYta/gCwSaaA==",
      "requires": {
-        "caniuse-lite": "^1.0.30001093",
-        "electron-to-chromium": "^1.3.488",
-        "escalade": "^3.0.1",
-        "node-releases": "^1.1.58"
+        "caniuse-lite": "^1.0.30001124",
+        "electron-to-chromium": "^1.3.562",
+        "escalade": "^3.0.2",
+        "node-releases": "^1.1.60"
      }
    },
    "bson": {
@@ -3163,9 +3167,9 @@
      "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
    },
    "caniuse-lite": {
-      "version": "1.0.30001109",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001109.tgz",
-      "integrity": "sha512-4JIXRodHzdS3HdK8nSgIqXYLExOvG+D2/EenSvcub2Kp3QEADjo2v2oUn5g0n0D+UNwG9BtwKOyGcSq2qvQXvQ=="
+      "version": "1.0.30001124",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001124.tgz",
+      "integrity": "sha512-zQW8V3CdND7GHRH6rxm6s59Ww4g/qGWTheoboW9nfeMg7sUoopIfKCcNZUjwYRCOrvereh3kwDpZj4VLQ7zGtA=="
    },
    "caseless": {
      "version": "0.12.0",
@@ -4624,9 +4628,9 @@
      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
    },
    "electron-to-chromium": {
-      "version": "1.3.516",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.516.tgz",
-      "integrity": "sha512-WDM5AAQdOrvLqSX8g3Zd5AujBXfMxf96oeZkff0U2HF5op3tjShE+on2yay3r1UD4M9I3p0iHpAS4+yV8U8A9A=="
+      "version": "1.3.562",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.562.tgz",
+      "integrity": "sha512-WhRe6liQ2q/w1MZc8mD8INkenHivuHdrr4r5EQHNomy3NJux+incP6M6lDMd0paShP3MD0WGe5R1TWmEClf+Bg=="
    },
    "emitter-listener": {
      "version": "1.1.2",
@@ -6696,18 +6700,18 @@
      }
    },
    "got": {
-      "version": "11.5.2",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.5.2.tgz",
-      "integrity": "sha512-yUhpEDLeuGiGJjRSzEq3kvt4zJtAcjKmhIiwNp/eUs75tRlXfWcHo5tcBaMQtnjHWC7nQYT5HkY/l0QOQTkVww==",
+      "version": "11.6.2",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.6.2.tgz",
+      "integrity": "sha512-/21qgUePCeus29Jk7MEti8cgQUNXFSWfIevNIk4H7u1wmXNDrGPKPY6YsPY+o9CIT/a2DjCjRz0x1nM9FtS2/A==",
      "requires": {
-        "@sindresorhus/is": "^3.0.0",
+        "@sindresorhus/is": "^3.1.1",
        "@szmarczak/http-timer": "^4.0.5",
        "@types/cacheable-request": "^6.0.1",
        "@types/responselike": "^1.0.0",
        "cacheable-lookup": "^5.0.3",
        "cacheable-request": "^7.0.1",
        "decompress-response": "^6.0.0",
-        "http2-wrapper": "^1.0.0-beta.5.0",
+        "http2-wrapper": "^1.0.0-beta.5.2",
        "lowercase-keys": "^2.0.0",
        "p-cancelable": "^2.0.0",
        "responselike": "^2.0.0"
@@ -7056,9 +7060,9 @@
      }
    },
    "habitica-markdown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/habitica-markdown/-/habitica-markdown-2.0.2.tgz",
-      "integrity": "sha512-GGzWuDKbFBMI+GqmQnSPUD5Zi/WPZDDuC2dC2La6uvu1zVNW7uHyQG0lxwCO43t5EdYXtOoOPin1rhhLdTuZfA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/habitica-markdown/-/habitica-markdown-3.0.0.tgz",
+      "integrity": "sha512-rw1LJ5Vsjx8sfjNa4e2wFuZf5eqqyb5/kfZXPxqfMMgJCCgIhWStDqY3nIclnpGWpemlKd+qbdh2rLiLgm9kng==",
      "requires": {
        "habitica-markdown-emoji": "1.2.4",
        "markdown-it": "10.0.0",
@@ -7422,9 +7426,9 @@
      }
    },
    "image-size": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.8.3.tgz",
-      "integrity": "sha512-SMtq1AJ+aqHB45c3FsB4ERK0UCiA2d3H1uq8s+8T0Pf8A3W4teyBQyaFaktH6xvZqh+npwlKU7i4fJo0r7TYTg==",
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.9.1.tgz",
+      "integrity": "sha512-yBo6xGGjiWtApYroCGR9wTvaIgande5vmAfTYIld5ss5kN4tyDG5lrW1qGomOXgB05ss7GLXLpDYXEiFqSqkzg==",
      "requires": {
        "queue": "6.0.1"
      }
@@ -9351,9 +9355,9 @@
      "integrity": "sha1-EUyUlnPiqKNenTV4hSeqN7Z52is="
    },
    "moment": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
-      "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
+      "version": "2.28.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.28.0.tgz",
+      "integrity": "sha512-Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw=="
    },
    "moment-recur": {
      "version": "1.0.7",
@@ -9364,9 +9368,9 @@
      }
    },
    "mongodb": {
-      "version": "3.5.9",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.9.tgz",
-      "integrity": "sha512-vXHBY1CsGYcEPoVWhwgxIBeWqP3dSu9RuRDsoLRPTITrcrgm1f0Ubu1xqF9ozMwv53agmEiZm0YGo+7WL3Nbug==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.1.tgz",
+      "integrity": "sha512-uH76Zzr5wPptnjEKJRQnwTsomtFOU/kQEU8a9hKHr2M7y9qVk7Q4Pkv0EQVp88742z9+RwvsdTw6dRjDZCNu1g==",
      "dev": true,
      "requires": {
        "bl": "^2.2.0",
@@ -9378,9 +9382,9 @@
      },
      "dependencies": {
        "bl": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.0.tgz",
-          "integrity": "sha512-wbgvOpqopSr7uq6fJrLH8EsvYMJf9gzfo2jCsL2eTy75qXPukA4pCgHamOQkZtY5vmfVtjB+P3LNlMHW5CEZXA==",
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz",
+          "integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==",
          "dev": true,
          "requires": {
            "readable-stream": "^2.3.5",
@@ -9451,13 +9455,13 @@
      }
    },
    "mongoose": {
-      "version": "5.10.2",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.10.2.tgz",
-      "integrity": "sha512-VO5eZawEMFh2gx9XPg9ZafzFg5eIVs4R7PW6kK1MFqBq34YD7GomkalYWVt02HctvTPDI1mkXsm52LXNZR1NxA==",
+      "version": "5.10.3",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.10.3.tgz",
+      "integrity": "sha512-FLemltuzcsCHlFpEZ3bYOiNhJfHful+GoS+3uRgdEWGlY0HKfOjm9xsISM/tql8vRvhjr7qveuRfoBBGO3xNtw==",
      "requires": {
        "bson": "^1.1.4",
        "kareem": "2.3.1",
-        "mongodb": "3.6.0",
+        "mongodb": "3.6.1",
        "mongoose-legacy-pluralize": "1.0.2",
        "mpath": "0.7.0",
        "mquery": "3.2.2",
@@ -9478,9 +9482,9 @@
          }
        },
        "mongodb": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.0.tgz",
-          "integrity": "sha512-/XWWub1mHZVoqEsUppE0GV7u9kanLvHxho6EvBxQbShXTKYF9trhZC2NzbulRGeG7xMJHD8IOWRcdKx5LPjAjQ==",
+          "version": "3.6.1",
+          "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.1.tgz",
+          "integrity": "sha512-uH76Zzr5wPptnjEKJRQnwTsomtFOU/kQEU8a9hKHr2M7y9qVk7Q4Pkv0EQVp88742z9+RwvsdTw6dRjDZCNu1g==",
          "requires": {
            "bl": "^2.2.0",
            "bson": "^1.1.4",
@@ -9539,9 +9543,9 @@
      "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ=="
    },
    "monk": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/monk/-/monk-7.3.1.tgz",
-      "integrity": "sha512-09+K52A7vfdH7ZxyZyXS6E5C3LUMxXvd8ZLAYLJclXVbqxb6dsmA1ArIWGblhGFEgYOaTI9MOfWO3uE4b5IQkA==",
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/monk/-/monk-7.3.2.tgz",
+      "integrity": "sha512-rf44p/l4HRDnrQXWci9SOz5uFAEQsHERVmE0tgya8OjOwqzeztE1sIcZ7JdxqpVk0Y1QyzApZWyBFWfvFB6sfQ==",
      "dev": true,
      "requires": {
        "@types/mongodb": "^3.5.25",
@@ -9925,9 +9929,9 @@
      "integrity": "sha1-GA6scAPgxwdhjvMTaPYvhLKmkJE="
    },
    "node-fetch": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
    },
    "node-forge": {
      "version": "0.9.1",
@@ -12987,9 +12991,9 @@
      },
      "dependencies": {
        "bl": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz",
-          "integrity": "sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==",
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
+          "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
          "dev": true,
          "requires": {
            "buffer": "^5.5.0",
@@ -1,12 +1,12 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.156.1",
+  "version": "4.159.0",
  "main": "./website/server/index.js",
  "dependencies": {
-    "@babel/core": "^7.11.4",
-    "@babel/preset-env": "^7.11.0",
-    "@babel/register": "^7.10.3",
+    "@babel/core": "^7.11.6",
+    "@babel/preset-env": "^7.11.5",
+    "@babel/register": "^7.11.5",
    "@google-cloud/trace-agent": "^5.1.0",
    "@slack/client": "^4.12.0",
    "accepts": "^1.3.5",
@@ -30,15 +30,15 @@
    "express-basic-auth": "^1.1.5",
    "express-validator": "^5.2.0",
    "glob": "^7.1.6",
-    "got": "^11.5.2",
+    "got": "^11.6.2",
    "gulp": "^4.0.0",
    "gulp-babel": "^8.0.0",
    "gulp-imagemin": "^7.1.0",
    "gulp-nodemon": "^2.5.0",
    "gulp.spritesmith": "^6.9.0",
-    "habitica-markdown": "^2.0.2",
+    "habitica-markdown": "^3.0.0",
    "helmet": "^3.23.3",
-    "image-size": "^0.8.3",
+    "image-size": "^0.9.1",
    "in-app-purchase": "^1.11.3",
    "js2xmlparser": "^4.0.1",
    "jsonwebtoken": "^8.5.1",
@@ -46,9 +46,9 @@
    "lodash": "^4.17.20",
    "merge-stream": "^2.0.0",
    "method-override": "^3.0.0",
-    "moment": "^2.27.0",
+    "moment": "^2.28.0",
    "moment-recur": "^1.0.7",
-    "mongoose": "^5.10.2",
+    "mongoose": "^5.10.3",
    "morgan": "^1.10.0",
    "nconf": "^0.10.0",
    "node-gcm": "^1.0.3",
@@ -118,7 +118,7 @@
    "expect.js": "^0.3.1",
    "istanbul": "^1.1.0-alpha.1",
    "mocha": "^5.1.1",
-    "monk": "^7.3.1",
+    "monk": "^7.3.2",
    "require-again": "^2.0.0",
    "run-rs": "^0.6.2",
    "sinon": "^9.0.3",
@@ -2,13 +2,14 @@ import { model as User } from '../../../../../../website/server/models/user';
 import amzLib from '../../../../../../website/server/libs/payments/amazon';
 import payments from '../../../../../../website/server/libs/payments/payments';
 import common from '../../../../../../website/common';
+import apiError from '../../../../../../website/server/libs/apiError';

 const { i18n } = common;

 describe('Amazon Payments - Checkout', () => {
  const subKey = 'basic_3mo';
  let user; let orderReferenceId; let
-    headers;
+    headers; const gemsBlockKey = '21gems'; const gemsBlock = common.content.gems[gemsBlockKey];
  let setOrderReferenceDetailsSpy;
  let confirmOrderReferenceSpy;
  let authorizeSpy;
@@ -16,7 +17,7 @@ describe('Amazon Payments - Checkout', () => {

  let paymentBuyGemsStub;
  let paymentCreateSubscritionStub;
-  let amount = 5;
+  let amount = gemsBlock.price / 100;

  function expectOrderReferenceSpy () {
    expect(setOrderReferenceDetailsSpy).to.be.calledOnce;
@@ -107,13 +108,20 @@ describe('Amazon Payments - Checkout', () => {
      paymentMethod,
      headers,
    };
-    if (gift) expectedArgs.gift = gift;
+    if (gift) {
+      expectedArgs.gift = gift;
+      expectedArgs.gemsBlock = undefined;
+    } else {
+      expectedArgs.gemsBlock = gemsBlock;
+    }
    expect(paymentBuyGemsStub).to.be.calledWith(expectedArgs);
  }

  it('should purchase gems', async () => {
    sinon.stub(user, 'canGetGems').resolves(true);
-    await amzLib.checkout({ user, orderReferenceId, headers });
+    await amzLib.checkout({
+      user, orderReferenceId, headers, gemsBlock: gemsBlockKey,
+    });

    expectBuyGemsStub(amzLib.constants.PAYMENT_METHOD);
    expectAmazonStubs();
@@ -144,7 +152,9 @@ describe('Amazon Payments - Checkout', () => {

  it('should error if user cannot get gems gems', async () => {
    sinon.stub(user, 'canGetGems').resolves(false);
-    await expect(amzLib.checkout({ user, orderReferenceId, headers }))
+    await expect(amzLib.checkout({
+      user, orderReferenceId, headers, gemsBlock: gemsBlockKey,
+    }))
      .to.eventually.be.rejected.and.to.eql({
        httpCode: 401,
        message: i18n.t('groupPolicyCannotGetGems'),
@@ -153,6 +163,17 @@ describe('Amazon Payments - Checkout', () => {
    user.canGetGems.restore();
  });

+  it('should error if gems block is not valid', async () => {
+    await expect(amzLib.checkout({
+      user, orderReferenceId, headers, gemsBlock: 'invalid',
+    }))
+      .to.eventually.be.rejected.and.to.eql({
+        httpCode: 400,
+        message: apiError('invalidGemsBlock'),
+        name: 'BadRequest',
+      });
+  });
+
  it('should gift gems', async () => {
    const receivingUser = new User();
    await receivingUser.save();
@@ -195,6 +216,7 @@ describe('Amazon Payments - Checkout', () => {
      paymentMethod: amzLib.constants.PAYMENT_METHOD_GIFT,
      headers,
      gift,
+      gemsBlock: undefined,
    });
    expectAmazonStubs();
  });
@@ -5,7 +5,6 @@ import applePayments from '../../../../../website/server/libs/payments/apple';
 import iap from '../../../../../website/server/libs/inAppPurchases';
 import { model as User } from '../../../../../website/server/models/user';
 import common from '../../../../../website/common';
-import { mockFindById, restoreFindById } from '../../../../helpers/mongoose.helper';

 const { i18n } = common;

@@ -84,7 +83,7 @@ describe('Apple Payments', () => {
      user.canGetGems.restore();
    });

-    it('errors if amount does not exist', async () => {
+    it('errors if gemsBlock does not exist', async () => {
      sinon.stub(user, 'canGetGems').resolves(true);
      iapGetPurchaseDataStub.restore();
      iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
@@ -106,23 +105,23 @@ describe('Apple Payments', () => {
    const gemsCanPurchase = [
      {
        productId: 'com.habitrpg.ios.Habitica.4gems',
-        amount: 1,
+        gemsBlock: '4gems',
      },
      {
        productId: 'com.habitrpg.ios.Habitica.20gems',
-        amount: 5.25,
+        gemsBlock: '21gems',
      },
      {
        productId: 'com.habitrpg.ios.Habitica.21gems',
-        amount: 5.25,
+        gemsBlock: '21gems',
      },
      {
        productId: 'com.habitrpg.ios.Habitica.42gems',
-        amount: 10.5,
+        gemsBlock: '42gems',
      },
      {
        productId: 'com.habitrpg.ios.Habitica.84gems',
-        amount: 21,
+        gemsBlock: '84gems',
      },
    ];

@@ -149,8 +148,9 @@ describe('Apple Payments', () => {
        expect(paymentBuyGemsStub).to.be.calledWith({
          user,
          paymentMethod: applePayments.constants.PAYMENT_METHOD_APPLE,
-          amount: gemTest.amount,
+          gemsBlock: common.content.gems[gemTest.gemsBlock],
          headers,
+          gift: undefined,
        });
        expect(user.canGetGems).to.be.calledOnce;
        user.canGetGems.restore();
@@ -161,8 +161,6 @@ describe('Apple Payments', () => {
      const receivingUser = new User();
      await receivingUser.save();

-      mockFindById(receivingUser);
-
      iapGetPurchaseDataStub.restore();
      iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
        .returns([{
@@ -184,12 +182,17 @@ describe('Apple Payments', () => {

      expect(paymentBuyGemsStub).to.be.calledOnce;
      expect(paymentBuyGemsStub).to.be.calledWith({
-        user: receivingUser,
+        user,
        paymentMethod: applePayments.constants.PAYMENT_METHOD_APPLE,
-        amount: gemsCanPurchase[0].amount,
        headers,
+        gift: {
+          type: 'gems',
+          gems: { amount: 4 },
+          member: sinon.match({ _id: receivingUser._id }),
+          uuid: receivingUser._id,
+        },
+        gemsBlock: common.content.gems['4gems'],
      });
-      restoreFindById();
    });
  });

@@ -0,0 +1,14 @@
+import common from '../../../../../website/common';
+import { getGemsBlock } from '../../../../../website/server/libs/payments/gems';
+
+describe('payments/gems', () => {
+  describe('#getGemsBlock', () => {
+    it('throws an error if the gem block key is invalid', () => {
+      expect(() => getGemsBlock('invalid')).to.throw;
+    });
+
+    it('returns the gem block for the given key', () => {
+      expect(getGemsBlock('21gems')).to.equal(common.content.gems['21gems']);
+    });
+  });
+});
@@ -5,7 +5,6 @@ import googlePayments from '../../../../../website/server/libs/payments/google';
 import iap from '../../../../../website/server/libs/inAppPurchases';
 import { model as User } from '../../../../../website/server/models/user';
 import common from '../../../../../website/common';
-import { mockFindById, restoreFindById } from '../../../../helpers/mongoose.helper';

 const { i18n } = common;

@@ -14,7 +13,7 @@ describe('Google Payments', () => {

  describe('verifyGemPurchase', () => {
    let sku; let user; let token; let receipt; let signature; let
-      headers;
+      headers; const gemsBlock = common.content.gems['21gems'];
    let iapSetupStub; let iapValidateStub; let iapIsValidatedStub; let
      paymentBuyGemsStub;

@@ -103,8 +102,9 @@ describe('Google Payments', () => {
      expect(paymentBuyGemsStub).to.be.calledWith({
        user,
        paymentMethod: googlePayments.constants.PAYMENT_METHOD_GOOGLE,
-        amount: 5.25,
+        gemsBlock,
        headers,
+        gift: undefined,
      });
      expect(user.canGetGems).to.be.calledOnce;
      user.canGetGems.restore();
@@ -114,8 +114,6 @@ describe('Google Payments', () => {
      const receivingUser = new User();
      await receivingUser.save();

-      mockFindById(receivingUser);
-
      const gift = { uuid: receivingUser._id };
      await googlePayments.verifyGemPurchase({
        user, gift, receipt, signature, headers,
@@ -132,12 +130,17 @@ describe('Google Payments', () => {

      expect(paymentBuyGemsStub).to.be.calledOnce;
      expect(paymentBuyGemsStub).to.be.calledWith({
-        user: receivingUser,
+        user,
        paymentMethod: googlePayments.constants.PAYMENT_METHOD_GOOGLE,
-        amount: 5.25,
+        gemsBlock,
        headers,
+        gift: {
+          type: 'gems',
+          gems: { amount: 21 },
+          member: sinon.match({ _id: receivingUser._id }),
+          uuid: receivingUser._id,
+        },
      });
-      restoreFindById();
    });
  });

@@ -1,6 +1,7 @@
 import moment from 'moment';

 import * as sender from '../../../../../website/server/libs/email';
+import common from '../../../../../website/common';
 import api from '../../../../../website/server/libs/payments/payments';
 import * as analytics from '../../../../../website/server/libs/analyticsService';
 import * as notifications from '../../../../../website/server/libs/pushNotifications';
@@ -9,6 +10,7 @@ import { translate as t } from '../../../../helpers/api-integration/v3';
 import {
  generateGroup,
 } from '../../../../helpers/api-unit.helper';
+import * as worldState from '../../../../../website/server/libs/worldState';

 describe('payments/index', () => {
  let user; let group; let data; let
@@ -555,6 +557,7 @@ describe('payments/index', () => {
    beforeEach(() => {
      data = {
        user,
+        gemsBlock: common.content.gems['21gems'],
        paymentMethod: 'payment',
        headers: {
          'x-client': 'habitica-web',
@@ -564,22 +567,6 @@ describe('payments/index', () => {
    });

    context('Self Purchase', () => {
-      it('amount property defaults to 5', async () => {
-        expect(user.balance).to.eql(0);
-
-        await api.buyGems(data);
-
-        expect(user.balance).to.eql(5);
-      });
-
-      it('can set amount that is purchased', async () => {
-        data.amount = 13;
-
-        await api.buyGems(data);
-
-        expect(user.balance).to.eql(13);
-      });
-
      it('sends a donation email', async () => {
        await api.buyGems(data);

@@ -588,6 +575,51 @@ describe('payments/index', () => {
      });
    });

+    context('No Active Promotion', () => {
+      beforeEach(() => {
+        sinon.stub(worldState, 'getCurrentEvent').returns(null);
+      });
+
+      afterEach(() => {
+        worldState.getCurrentEvent.restore();
+      });
+
+      it('does not apply a discount', async () => {
+        const balanceBefore = user.balance;
+
+        await api.buyGems(data);
+
+        const balanceAfter = user.balance;
+        const balanceDiff = balanceAfter - balanceBefore;
+
+        expect(balanceDiff * 4).to.eql(21);
+      });
+    });
+
+    context('Active Promotion', () => {
+      beforeEach(() => {
+        sinon.stub(worldState, 'getCurrentEvent').returns({
+          ...common.content.events.fall2020,
+          event: 'fall2020',
+        });
+      });
+
+      afterEach(() => {
+        worldState.getCurrentEvent.restore();
+      });
+
+      it('applies a discount', async () => {
+        const balanceBefore = user.balance;
+
+        await api.buyGems(data);
+
+        const balanceAfter = user.balance;
+        const balanceDiff = balanceAfter - balanceBefore;
+
+        expect(balanceDiff * 4).to.eql(30);
+      });
+    });
+
    context('Gift', () => {
      let recipient;

@@ -2,11 +2,13 @@
 import paypalPayments from '../../../../../../website/server/libs/payments/paypal';
 import payments from '../../../../../../website/server/libs/payments/payments';
 import { model as User } from '../../../../../../website/server/models/user';
+import common from '../../../../../../website/common';

-describe('checkout success', () => {
+describe('paypal - checkout success', () => {
  const subKey = 'basic_3mo';
  let user; let gift; let customerId; let
    paymentId;
+  const gemsBlockKey = '21gems'; const gemsBlock = common.content.gems[gemsBlockKey];
  let paypalPaymentExecuteStub; let paymentBuyGemsStub; let
    paymentsCreateSubscritionStub;

@@ -28,7 +30,7 @@ describe('checkout success', () => {

  it('purchases gems', async () => {
    await paypalPayments.checkoutSuccess({
-      user, gift, paymentId, customerId,
+      user, gift, paymentId, customerId, gemsBlock: gemsBlockKey,
    });

    expect(paypalPaymentExecuteStub).to.be.calledOnce;
@@ -38,6 +40,7 @@ describe('checkout success', () => {
      user,
      customerId,
      paymentMethod: 'Paypal',
+      gemsBlock,
    });
  });

@@ -4,12 +4,14 @@ import nconf from 'nconf';
 import paypalPayments from '../../../../../../website/server/libs/payments/paypal';
 import { model as User } from '../../../../../../website/server/models/user';
 import common from '../../../../../../website/common';
+import apiError from '../../../../../../website/server/libs/apiError';

 const BASE_URL = nconf.get('BASE_URL');
 const { i18n } = common;

-describe('checkout', () => {
+describe('paypal - checkout', () => {
  const subKey = 'basic_3mo';
+  const gemsBlockKey = '21gems';
  let paypalPaymentCreateStub;
  let approvalHerf;

@@ -53,10 +55,10 @@ describe('checkout', () => {
  });

  it('creates a link for gem purchases', async () => {
-    const link = await paypalPayments.checkout({ user: new User() });
+    const link = await paypalPayments.checkout({ user: new User(), gemsBlock: gemsBlockKey });

    expect(paypalPaymentCreateStub).to.be.calledOnce;
-    expect(paypalPaymentCreateStub).to.be.calledWith(getPaypalCreateOptions('Habitica Gems', 5.00));
+    expect(paypalPaymentCreateStub).to.be.calledWith(getPaypalCreateOptions('Habitica Gems', 4.99));
    expect(link).to.eql(approvalHerf);
  });

@@ -83,11 +85,23 @@ describe('checkout', () => {
    const user = new User();
    sinon.stub(user, 'canGetGems').resolves(false);

-    await expect(paypalPayments.checkout({ user })).to.eventually.be.rejected.and.to.eql({
-      httpCode: 401,
-      message: i18n.t('groupPolicyCannotGetGems'),
-      name: 'NotAuthorized',
-    });
+    await expect(paypalPayments.checkout({ user, gemsBlock: gemsBlockKey }))
+      .to.eventually.be.rejected.and.to.eql({
+        httpCode: 401,
+        message: i18n.t('groupPolicyCannotGetGems'),
+        name: 'NotAuthorized',
+      });
+  });
+
+  it('should error if the gems block is not valid', async () => {
+    const user = new User();
+
+    await expect(paypalPayments.checkout({ user, gemsBlock: 'invalid' }))
+      .to.eventually.be.rejected.and.to.eql({
+        httpCode: 400,
+        message: apiError('invalidGemsBlock'),
+        name: 'BadRequest',
+      });
  });

  it('creates a link for gifting gems', async () => {
@@ -6,7 +6,7 @@ import {
 } from '../../../../../helpers/api-unit.helper';
 import { model as User } from '../../../../../../website/server/models/user';

-describe('ipn', () => {
+describe('paypal - ipn', () => {
  const subKey = 'basic_3mo';
  let user; let group; let txn_type; let userPaymentId; let
    groupPaymentId;
@@ -10,7 +10,7 @@ import { createNonLeaderGroupMember } from '../paymentHelpers';

 const { i18n } = common;

-describe('subscribeCancel', () => {
+describe('paypal - subscribeCancel', () => {
  const subKey = 'basic_3mo';
  let user; let group; let groupId; let customerId; let groupCustomerId; let
    nextBillingDate;
@@ -7,7 +7,7 @@ import {
 import { model as User } from '../../../../../../website/server/models/user';
 import common from '../../../../../../website/common';

-describe('subscribeSuccess', () => {
+describe('paypal - subscribeSuccess', () => {
  const subKey = 'basic_3mo';
  let user; let group; let block; let groupId; let token; let headers; let
    customerId;
@@ -8,7 +8,7 @@ import common from '../../../../../../website/common';

 const { i18n } = common;

-describe('subscribe', () => {
+describe('paypal - subscribe', () => {
  const subKey = 'basic_3mo';
  let coupon; let sub; let
    approvalHerf;
@@ -4,7 +4,7 @@ import api from '../../../../../../website/server/libs/payments/payments';

 const groupPlanId = api.constants.GROUP_PLAN_CUSTOMER_ID;

-describe('#calculateSubscriptionTerminationDate', () => {
+describe('stripe - #calculateSubscriptionTerminationDate', () => {
  let plan;
  let nextBill;

@@ -10,7 +10,7 @@ import common from '../../../../../../website/common';

 const { i18n } = common;

-describe('cancel subscription', () => {
+describe('stripe - cancel subscription', () => {
  const subKey = 'basic_3mo';
  const stripe = stripeModule('test');
  let user; let groupId; let
@@ -12,7 +12,7 @@ import common from '../../../../../../website/common';

 const { i18n } = common;

-describe('checkout with subscription', () => {
+describe('stripe - checkout with subscription', () => {
  const subKey = 'basic_3mo';
  const stripe = stripeModule('test');
  let user; let group; let data; let gift; let sub;
@@ -4,16 +4,17 @@ import { model as User } from '../../../../../../website/server/models/user';
 import stripePayments from '../../../../../../website/server/libs/payments/stripe';
 import payments from '../../../../../../website/server/libs/payments/payments';
 import common from '../../../../../../website/common';
+import apiError from '../../../../../../website/server/libs/apiError';

 const { i18n } = common;

-describe('checkout', () => {
+describe('stripe - checkout', () => {
  const subKey = 'basic_3mo';
  const stripe = stripeModule('test');
  let stripeChargeStub; let paymentBuyGemsStub; let
    paymentCreateSubscritionStub;
  let user; let gift; let groupId; let email; let headers; let coupon; let customerIdResponse; let
-    token;
+    token; const gemsBlockKey = '21gems'; const gemsBlock = common.content.gems[gemsBlockKey];

  beforeEach(() => {
    user = new User();
@@ -89,6 +90,7 @@ describe('checkout', () => {
    await expect(stripePayments.checkout({
      token,
      user,
+      gemsBlock: gemsBlockKey,
      gift,
      groupId,
      email,
@@ -101,6 +103,25 @@ describe('checkout', () => {
    });
  });

+  it('should error if the gems block is invalid', async () => {
+    gift = undefined;
+
+    await expect(stripePayments.checkout({
+      token,
+      user,
+      gemsBlock: 'invalid',
+      gift,
+      groupId,
+      email,
+      headers,
+      coupon,
+    }, stripe)).to.eventually.be.rejected.and.to.eql({
+      httpCode: 400,
+      message: apiError('invalidGemsBlock'),
+      name: 'BadRequest',
+    });
+  });
+
  it('should purchase gems', async () => {
    gift = undefined;
    sinon.stub(user, 'canGetGems').resolves(true);
@@ -108,6 +129,7 @@ describe('checkout', () => {
    await stripePayments.checkout({
      token,
      user,
+      gemsBlock: gemsBlockKey,
      gift,
      groupId,
      email,
@@ -117,7 +139,7 @@ describe('checkout', () => {

    expect(stripeChargeStub).to.be.calledOnce;
    expect(stripeChargeStub).to.be.calledWith({
-      amount: 500,
+      amount: 499,
      currency: 'usd',
      card: token,
    });
@@ -128,6 +150,7 @@ describe('checkout', () => {
      customerId: customerIdResponse,
      paymentMethod: 'Stripe',
      gift,
+      gemsBlock,
    });
    expect(user.canGetGems).to.be.calledOnce;
    user.canGetGems.restore();
@@ -167,6 +190,7 @@ describe('checkout', () => {
      customerId: customerIdResponse,
      paymentMethod: 'Gift',
      gift,
+      gemsBlock: undefined,
    });
  });

@@ -205,6 +229,7 @@ describe('checkout', () => {
      customerId: customerIdResponse,
      paymentMethod: 'Gift',
      gift,
+      gemsBlock: undefined,
    });
  });
 });
@@ -9,7 +9,7 @@ import common from '../../../../../../website/common';

 const { i18n } = common;

-describe('edit subscription', () => {
+describe('stripe - edit subscription', () => {
  const subKey = 'basic_3mo';
  const stripe = stripeModule('test');
  let user; let groupId; let group; let
@@ -6,8 +6,8 @@ import {

 describe('GET challenges/user', () => {
  context('no official challenges', () => {
-    let user; let member; let nonMember; let challenge; let challenge2; let
-      publicGuild;
+    let user; let member; let nonMember; let challenge; let challenge2;
+    let publicGuild; let userData; let groupData;

    before(async () => {
      const { group, groupLeader, members } = await createAndPopulateGroup({
@@ -19,225 +19,197 @@ describe('GET challenges/user', () => {
        members: 1,
      });

-      user = groupLeader;
      publicGuild = group;
+      groupData = {
+        _id: publicGuild._id,
+        categories: [],
+        id: publicGuild._id,
+        type: publicGuild.type,
+        privacy: publicGuild.privacy,
+        name: publicGuild.name,
+        summary: publicGuild.name,
+        leader: publicGuild.leader._id,
+      };
+
+      user = groupLeader;
+      userData = {
+        _id: publicGuild.leader._id,
+        id: publicGuild.leader._id,
+        profile: { name: user.profile.name },
+        auth: {
+          local: {
+            username: user.auth.local.username,
+          },
+        },
+        flags: {
+          verifiedUsername: true,
+        },
+      };
+
      member = members[0]; // eslint-disable-line prefer-destructuring
      nonMember = await generateUser();

      challenge = await generateChallenge(user, group);
-      await user.post(`/challenges/${challenge._id}/join`);
      challenge2 = await generateChallenge(user, group);
-      await user.post(`/challenges/${challenge2._id}/join`);
-    });

-    it('should return challenges user has joined', async () => {
      await nonMember.post(`/challenges/${challenge._id}/join`);
+    });
+    context('all challenges', () => {
+      it('should return challenges user has joined', async () => {
+        const challenges = await nonMember.get('/challenges/user');

-      const challenges = await nonMember.get('/challenges/user');
+        const foundChallenge = _.find(challenges, { _id: challenge._id });
+        expect(foundChallenge).to.exist;
+        expect(foundChallenge.leader).to.eql(userData);
+        expect(foundChallenge.group).to.eql(groupData);
+      });

-      const foundChallenge = _.find(challenges, { _id: challenge._id });
-      expect(foundChallenge).to.exist;
-      expect(foundChallenge.leader).to.eql({
-        _id: publicGuild.leader._id,
-        id: publicGuild.leader._id,
-        profile: { name: user.profile.name },
-        auth: {
-          local: {
-            username: user.auth.local.username,
+      it('should not return challenges a non-member has not joined', async () => {
+        const challenges = await nonMember.get('/challenges/user');
+
+        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
+        expect(foundChallenge2).to.not.exist;
+      });
+
+      it('should return challenges user has created', async () => {
+        const challenges = await user.get('/challenges/user');
+
+        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
+        expect(foundChallenge1).to.exist;
+        expect(foundChallenge1.leader).to.eql(userData);
+        expect(foundChallenge1.group).to.eql(groupData);
+        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
+        expect(foundChallenge2).to.exist;
+        expect(foundChallenge2.leader).to.eql(userData);
+        expect(foundChallenge2.group).to.eql(groupData);
+      });
+
+      it('should return challenges in user\'s group', async () => {
+        const challenges = await member.get('/challenges/user');
+
+        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
+        expect(foundChallenge1).to.exist;
+        expect(foundChallenge1.leader).to.eql(userData);
+        expect(foundChallenge1.group).to.eql(groupData);
+        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
+        expect(foundChallenge2).to.exist;
+        expect(foundChallenge2.leader).to.eql(userData);
+        expect(foundChallenge2.group).to.eql(groupData);
+      });
+
+      it('should return newest challenges first', async () => {
+        let challenges = await user.get('/challenges/user');
+
+        let foundChallengeIndex = _.findIndex(challenges, { _id: challenge2._id });
+        expect(foundChallengeIndex).to.eql(0);
+
+        const newChallenge = await generateChallenge(user, publicGuild);
+        await user.post(`/challenges/${newChallenge._id}/join`);
+
+        challenges = await user.get('/challenges/user');
+
+        foundChallengeIndex = _.findIndex(challenges, { _id: newChallenge._id });
+        expect(foundChallengeIndex).to.eql(0);
+      });
+
+      it('should not return challenges user doesn\'t have access to', async () => {
+        const { group, groupLeader } = await createAndPopulateGroup({
+          groupDetails: {
+            name: 'TestPrivateGuild',
+            summary: 'summary for TestPrivateGuild',
+            type: 'guild',
+            privacy: 'private',
          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
-      });
-      expect(foundChallenge.group).to.eql({
-        _id: publicGuild._id,
-        categories: [],
-        id: publicGuild._id,
-        type: publicGuild.type,
-        privacy: publicGuild.privacy,
-        name: publicGuild.name,
-        summary: publicGuild.name,
-        leader: publicGuild.leader._id,
-      });
-    });
+        });

-    it('should return challenges user has created', async () => {
-      const challenges = await user.get('/challenges/user');
+        const privateChallenge = await generateChallenge(groupLeader, group);
+        await groupLeader.post(`/challenges/${privateChallenge._id}/join`);

-      const foundChallenge1 = _.find(challenges, { _id: challenge._id });
-      expect(foundChallenge1).to.exist;
-      expect(foundChallenge1.leader).to.eql({
-        _id: publicGuild.leader._id,
-        id: publicGuild.leader._id,
-        profile: { name: user.profile.name },
-        auth: {
-          local: {
-            username: user.auth.local.username,
+        const challenges = await nonMember.get('/challenges/user');
+
+        const foundChallenge = _.find(challenges, { _id: privateChallenge._id });
+        expect(foundChallenge).to.not.exist;
+      });
+
+      it('should not return challenges user doesn\'t have access to, even with query parameters', async () => {
+        const { group, groupLeader } = await createAndPopulateGroup({
+          groupDetails: {
+            name: 'TestPrivateGuild',
+            summary: 'summary for TestPrivateGuild',
+            type: 'guild',
+            privacy: 'private',
          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
-      });
-      expect(foundChallenge1.group).to.eql({
-        _id: publicGuild._id,
-        categories: [],
-        id: publicGuild._id,
-        type: publicGuild.type,
-        privacy: publicGuild.privacy,
-        name: publicGuild.name,
-        summary: publicGuild.name,
-        leader: publicGuild.leader._id,
-      });
-      const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
-      expect(foundChallenge2).to.exist;
-      expect(foundChallenge2.leader).to.eql({
-        _id: publicGuild.leader._id,
-        id: publicGuild.leader._id,
-        profile: { name: user.profile.name },
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
-      });
-      expect(foundChallenge2.group).to.eql({
-        _id: publicGuild._id,
-        categories: [],
-        id: publicGuild._id,
-        type: publicGuild.type,
-        privacy: publicGuild.privacy,
-        name: publicGuild.name,
-        summary: publicGuild.name,
-        leader: publicGuild.leader._id,
+        });
+
+        const privateChallenge = await generateChallenge(groupLeader, group, {
+          categories: [{
+            name: 'academics',
+            slug: 'academics',
+          }],
+        });
+        await groupLeader.post(`/challenges/${privateChallenge._id}/join`);
+
+        const challenges = await nonMember.get('/challenges/user?categories=academics&owned=not_owned');
+
+        const foundChallenge = _.find(challenges, { _id: privateChallenge._id });
+        expect(foundChallenge).to.not.exist;
      });
    });

-    it('should return challenges in user\'s group', async () => {
-      const challenges = await member.get('/challenges/user');
+    context('my challenges', () => {
+      it('should return challenges user has joined', async () => {
+        const challenges = await nonMember.get(`/challenges/user?member=${true}`);

-      const foundChallenge1 = _.find(challenges, { _id: challenge._id });
-      expect(foundChallenge1).to.exist;
-      expect(foundChallenge1.leader).to.eql({
-        _id: publicGuild.leader._id,
-        id: publicGuild.leader._id,
-        profile: { name: user.profile.name },
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
-      });
-      expect(foundChallenge1.group).to.eql({
-        _id: publicGuild._id,
-        categories: [],
-        id: publicGuild._id,
-        type: publicGuild.type,
-        privacy: publicGuild.privacy,
-        name: publicGuild.name,
-        summary: publicGuild.name,
-        leader: publicGuild.leader._id,
-      });
-      const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
-      expect(foundChallenge2).to.exist;
-      expect(foundChallenge2.leader).to.eql({
-        _id: publicGuild.leader._id,
-        id: publicGuild.leader._id,
-        profile: { name: user.profile.name },
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
-      });
-      expect(foundChallenge2.group).to.eql({
-        _id: publicGuild._id,
-        categories: [],
-        id: publicGuild._id,
-        type: publicGuild.type,
-        privacy: publicGuild.privacy,
-        name: publicGuild.name,
-        summary: publicGuild.name,
-        leader: publicGuild.leader._id,
-      });
-    });
-
-    it('should not return challenges in user groups if we send member true param', async () => {
-      const challenges = await member.get(`/challenges/user?member=${true}`);
-
-      const foundChallenge1 = _.find(challenges, { _id: challenge._id });
-      expect(foundChallenge1).to.not.exist;
-
-      const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
-      expect(foundChallenge2).to.not.exist;
-    });
-
-    it('should return newest challenges first', async () => {
-      let challenges = await user.get('/challenges/user');
-
-      let foundChallengeIndex = _.findIndex(challenges, { _id: challenge2._id });
-      expect(foundChallengeIndex).to.eql(0);
-
-      const newChallenge = await generateChallenge(user, publicGuild);
-      await user.post(`/challenges/${newChallenge._id}/join`);
-
-      challenges = await user.get('/challenges/user');
-
-      foundChallengeIndex = _.findIndex(challenges, { _id: newChallenge._id });
-      expect(foundChallengeIndex).to.eql(0);
-    });
-
-    it('should not return challenges user doesn\'t have access to', async () => {
-      const { group, groupLeader } = await createAndPopulateGroup({
-        groupDetails: {
-          name: 'TestPrivateGuild',
-          summary: 'summary for TestPrivateGuild',
-          type: 'guild',
-          privacy: 'private',
-        },
+        const foundChallenge = _.find(challenges, { _id: challenge._id });
+        expect(foundChallenge).to.exist;
+        expect(foundChallenge.leader).to.eql(userData);
+        expect(foundChallenge.group).to.eql(groupData);
      });

-      const privateChallenge = await generateChallenge(groupLeader, group);
-      await groupLeader.post(`/challenges/${privateChallenge._id}/join`);
+      it('should return challenges user has created', async () => {
+        const challenges = await user.get(`/challenges/user?member=${true}`);

-      const challenges = await nonMember.get('/challenges/user');
-
-      const foundChallenge = _.find(challenges, { _id: privateChallenge._id });
-      expect(foundChallenge).to.not.exist;
-    });
-
-    it('should not return challenges user doesn\'t have access to, even with query parameters', async () => {
-      const { group, groupLeader } = await createAndPopulateGroup({
-        groupDetails: {
-          name: 'TestPrivateGuild',
-          summary: 'summary for TestPrivateGuild',
-          type: 'guild',
-          privacy: 'private',
-        },
+        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
+        expect(foundChallenge1).to.exist;
+        expect(foundChallenge1.leader).to.eql(userData);
+        expect(foundChallenge1.group).to.eql(groupData);
+        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
+        expect(foundChallenge2).to.exist;
+        expect(foundChallenge2.leader).to.eql(userData);
+        expect(foundChallenge2.group).to.eql(groupData);
      });

-      const privateChallenge = await generateChallenge(groupLeader, group, {
-        categories: [{
-          name: 'academics',
-          slug: 'academics',
-        }],
+      it('should return challenges user has created if filter by owned', async () => {
+        const challenges = await user.get(`/challenges/user?member=${true}&owned=owned`);
+
+        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
+        expect(foundChallenge1).to.exist;
+        expect(foundChallenge1.leader).to.eql(userData);
+        expect(foundChallenge1.group).to.eql(groupData);
+        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
+        expect(foundChallenge2).to.exist;
+        expect(foundChallenge2.leader).to.eql(userData);
+        expect(foundChallenge2.group).to.eql(groupData);
      });
-      await groupLeader.post(`/challenges/${privateChallenge._id}/join`);

-      const challenges = await nonMember.get('/challenges/user?categories=academics&owned=not_owned');
+      it('should not return challenges user has created if filter by not owned', async () => {
+        const challenges = await user.get(`/challenges/user?owned=not_owned&member=${true}`);

-      const foundChallenge = _.find(challenges, { _id: privateChallenge._id });
-      expect(foundChallenge).to.not.exist;
+        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
+        expect(foundChallenge1).to.not.exist;
+        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
+        expect(foundChallenge2).to.not.exist;
+      });
+
+      it('should not return challenges in user groups', async () => {
+        const challenges = await member.get(`/challenges/user?member=${true}`);
+
+        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
+        expect(foundChallenge1).to.not.exist;
+
+        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
+        expect(foundChallenge2).to.not.exist;
+      });
    });
  });

@@ -159,7 +159,7 @@ describe('POST /challenges/:challengeId/winner/:winnerId', () => {

      expect(testTask.challenge.broken).to.eql('CHALLENGE_CLOSED');
      expect(testTask.challenge.winner).to.eql(winningUser.profile.name);
-      expect(challengeTag.challenge).to.eql('false');
+      expect(challengeTag.challenge).to.eql(false);
    });
  });
 });
@@ -14,7 +14,6 @@ import {
  TAVERN_ID,
 } from '../../../../../website/server/models/group';
 import { CHAT_FLAG_FROM_SHADOW_MUTE, MAX_MESSAGE_LENGTH } from '../../../../../website/common/script/constants';
-import guildsAllowingBannedWords from '../../../../../website/server/libs/guildsAllowingBannedWords';
 import * as email from '../../../../../website/server/libs/email';

 const BASE_URL = nconf.get('BASE_URL');
@@ -329,7 +328,8 @@ describe('POST /chat', () => {
        members: 1,
      });

-      guildsAllowingBannedWords[group._id] = true;
+      // Update the bannedWordsAllowed property for the group
+      group.update({ bannedWordsAllowed: true });

      const message = await members[0].post(`/groups/${group._id}/chat`, { message: testBannedWordMessage });

@@ -503,8 +503,8 @@ describe('POST /chat', () => {
    const memberUsername = 'memberUsername';
    await member.update({ 'auth.local.username': memberUsername });

-    const messageWithMentions = `hi @${memberUsername} 123456789 
-    123456789 123456789 123456789 123456789 123456789 123456789 89 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345678 END.`;
+    const messageWithMentions = `hi @${memberUsername} 123456789
+     123456789 123456789 123456789 123456789 123456789 123456789 89 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345678 END.`;
    expect(messageWithMentions.length).to.equal(MAX_MESSAGE_LENGTH);
    const newMessage = await user.post(`/groups/${groupWithChat._id}/chat`, { message: messageWithMentions });
    const groupMessages = await user.get(`/groups/${groupWithChat._id}/chat`);
@@ -79,4 +79,56 @@ describe('PUT /group', () => {
    expect(updatedGroup.leader.profile.name).to.eql(nonLeader.profile.name);
    expect(updatedGroup.name).to.equal(groupUpdatedName);
  });
+
+  it('allows for an admin to update the bannedWordsAllow property for an existing guild', async () => {
+    const { group, groupLeader } = await createAndPopulateGroup({
+      groupDetails: {
+        name: 'public guild',
+        type: 'guild',
+        privacy: 'public',
+      },
+    });
+
+    const updateGroupDetails = {
+      id: group._id,
+      name: 'public guild',
+      type: 'guild',
+      privacy: 'public',
+      bannedWordsAllowed: true,
+    };
+
+    // Make guild leader into admin
+    await groupLeader.post('/debug/make-admin');
+    await groupLeader.sync();
+
+    // Update the bannedWordsAllowed property for the group
+    const response = await groupLeader.put(`/groups/${group._id}`, updateGroupDetails);
+
+    expect(groupLeader.contributor.admin).to.eql(true);
+    expect(response.bannedWordsAllowed).to.eql(true);
+  });
+
+  it('does not allow for a non-admin to update the bannedWordsAllow property for an existing guild', async () => {
+    const { group, groupLeader } = await createAndPopulateGroup({
+      groupDetails: {
+        name: 'public guild',
+        type: 'guild',
+        privacy: 'public',
+      },
+    });
+
+    const updateGroupDetails = {
+      id: group._id,
+      name: 'public guild',
+      type: 'guild',
+      privacy: 'public',
+      bannedWordsAllowed: true,
+    };
+
+    // Update the bannedWordsAllowed property for the group
+    const response = await groupLeader.put(`/groups/${group._id}`, updateGroupDetails);
+
+    expect(groupLeader.contributor.admin).to.eql(undefined);
+    expect(response.bannedWordsAllowed).to.eql(undefined);
+  });
 });
@@ -14,7 +14,10 @@ describe('payments - stripe - #checkout', () => {
  });

  it('verifies credentials', async () => {
-    await expect(user.post(endpoint, { id: 123 })).to.eventually.be.rejected.and.include({
+    await expect(user.post(
+      `${endpoint}?gemsBlock=4gems`,
+      { id: 123 },
+    )).to.eventually.be.rejected.and.include({
      code: 401,
      error: 'Error',
      // message: 'Invalid API Key provided: aaaabbbb********************1111',
@@ -4,6 +4,8 @@ import {
  requester,
  resetHabiticaDB,
 } from '../../../../helpers/api-integration/v3';
+import * as worldState from '../../../../../website/server/libs/worldState';
+import common from '../../../../../website/common';

 describe('GET /world-state', () => {
  before(async () => {
@@ -39,4 +41,41 @@ describe('GET /world-state', () => {
    expect(res).to.have.nested.property('npcImageSuffix');
    expect(res.npcImageSuffix).to.be.a('string');
  });
+
+  context('no current event', () => {
+    beforeEach(async () => {
+      sinon.stub(worldState, 'getCurrentEvent').returns(null);
+    });
+
+    afterEach(() => {
+      worldState.getCurrentEvent.restore();
+    });
+
+    it('returns null for the current event when there is none active', async () => {
+      const res = await requester().get('/world-state');
+
+      expect(res.currentEvent).to.be.null;
+    });
+  });
+
+  context('no current event', () => {
+    const evt = {
+      ...common.content.events.fall2020,
+      event: 'fall2020',
+    };
+
+    beforeEach(async () => {
+      sinon.stub(worldState, 'getCurrentEvent').returns(evt);
+    });
+
+    afterEach(() => {
+      worldState.getCurrentEvent.restore();
+    });
+
+    it('returns the current event when there is an active one', async () => {
+      const res = await requester().get('/world-state');
+
+      expect(res.currentEvent).to.eql(evt);
+    });
+  });
 });
@@ -18,31 +18,31 @@
    "@storybook/addon-links": "^5.3.19",
    "@storybook/addon-notes": "^5.3.21",
    "@storybook/vue": "^5.3.19",
-    "@vue/cli-plugin-babel": "^4.5.4",
-    "@vue/cli-plugin-eslint": "^4.5.4",
-    "@vue/cli-plugin-router": "^4.5.4",
-    "@vue/cli-plugin-unit-mocha": "^4.5.4",
-    "@vue/cli-service": "^4.5.4",
+    "@vue/cli-plugin-babel": "^4.5.6",
+    "@vue/cli-plugin-eslint": "^4.5.6",
+    "@vue/cli-plugin-router": "^4.5.6",
+    "@vue/cli-plugin-unit-mocha": "^4.5.6",
+    "@vue/cli-service": "^4.5.6",
    "@vue/test-utils": "1.0.0-beta.29",
    "amplitude-js": "^7.1.1",
    "axios": "^0.19.2",
    "axios-progress-bar": "^1.2.0",
    "babel-eslint": "^10.1.0",
    "bootstrap": "^4.5.2",
-    "bootstrap-vue": "^2.16.0",
+    "bootstrap-vue": "^2.17.0",
    "chai": "^4.1.2",
    "core-js": "^3.6.5",
    "eslint": "^6.8.0",
    "eslint-config-habitrpg": "^6.2.0",
    "eslint-plugin-mocha": "^5.3.0",
    "eslint-plugin-vue": "^6.2.2",
-    "habitica-markdown": "^2.0.2",
+    "habitica-markdown": "^3.0.0",
    "hellojs": "^1.18.4",
    "inspectpack": "^4.5.2",
    "intro.js": "^2.9.3",
    "jquery": "^3.5.1",
    "lodash": "^4.17.20",
-    "moment": "^2.27.0",
+    "moment": "^2.28.0",
    "nconf": "^0.10.0",
    "sass": "^1.26.10",
    "sass-loader": "^8.0.2",
@@ -26,7 +26,6 @@
      id="app"
      :class="{
        'casting-spell': castingSpell,
-        'resting': showRestingBanner
      }"
    >
      <!-- <banned-account-modal /> -->
@@ -38,31 +37,8 @@
      <router-view v-if="!isUserLoggedIn || isStaticPage" />
      <template v-else>
        <template v-if="isUserLoaded">
-          <div
-            v-show="showRestingBanner"
-            ref="restingBanner"
-            class="resting-banner"
-          >
-            <span class="content">
-              <span class="label d-inline d-sm-none">{{ $t('innCheckOutBannerShort') }}</span>
-              <span class="label d-none d-sm-inline">{{ $t('innCheckOutBanner') }}</span>
-              <span class="separator">|</span>
-              <span
-                class="resume"
-                @click="resumeDamage()"
-              >{{ $t('resumeDamage') }}</span>
-            </span>
-            <div
-              class="closepadding"
-              @click="hideBanner()"
-            >
-              <span
-                class="svg-icon inline icon-10"
-                aria-hidden="true"
-                v-html="icons.close"
-              ></span>
-            </div>
-          </div>
+          <damage-paused-banner />
+          <gems-promo-banner />
          <notifications-display />
          <app-menu />
          <div
@@ -99,20 +75,11 @@

 <style lang='scss' scoped>
  @import '~@/assets/scss/colors.scss';
-  @import '~@/assets/scss/variables.scss';

  #app {
    display: flex;
    flex-direction: column;
    overflow-x: hidden;
-
-    &.resting {
-      --banner-resting-height: #{$restingToolbarHeight};
-    }
-
-    &.giftingBanner {
-      --banner-gifting-height: 2.5rem;
-    }
  }

  #loading-screen-inapp {
@@ -143,15 +110,6 @@
    cursor: crosshair;
  }

-  .closepadding {
-    margin: 11px 24px;
-    display: inline-block;
-    position: relative;
-    right: 0;
-    top: 0;
-    cursor: pointer;
-  }
-
  .container-fluid {
    flex: 1 0 auto;
  }
@@ -172,51 +130,11 @@
    margin-top: .5em;
    margin-bottom: .5em;
  }
-
-  .resting-banner {
-    width: 100%;
-    height: $restingToolbarHeight;
-    background-color: $blue-10;
-    top: 0;
-    z-index: 1300;
-    display: flex;
-
-    .content {
-      line-height: 1.71;
-      text-align: center;
-      color: $white;
-      padding: 8px 38px 8px 8px;
-      margin: auto;
-    }
-
-    @media only screen and (max-width: 768px) {
-      .content {
-        font-size: 12px;
-        line-height: 1.4;
-      }
-    }
-
-    .separator {
-      color: $blue-100;
-      margin: 0px 15px;
-    }
-
-    .resume {
-      font-weight: bold;
-      cursor: pointer;
-      white-space:nowrap;
-    }
-  }
 </style>

 <style lang='scss'>
  @import '~@/assets/scss/colors.scss';

-  .closepadding span svg path {
-    stroke: #FFF;
-    opacity: 0.48;
-  }
-
  .modal-backdrop {
    opacity: .9 !important;
    background-color: $purple-100 !important;
@@ -234,6 +152,8 @@ import { loadProgressBar } from 'axios-progress-bar';

 import AppMenu from './components/header/menu';
 import AppHeader from './components/header/index';
+import DamagePausedBanner from './components/header/banners/damagePaused';
+import GemsPromoBanner from './components/header/banners/gemsPromo';
 import AppFooter from './components/appFooter';
 import notificationsDisplay from './components/notifications';
 import snackbars from './components/snackbars/notifications';
@@ -255,8 +175,6 @@ import {
  removeLocalSetting,
 } from '@/libs/userlocalManager';

-import svgClose from '@/assets/svg/close.svg';
-
 const COMMUNITY_MANAGER_EMAIL = process.env.EMAILS_COMMUNITY_MANAGER_EMAIL; // eslint-disable-line

 export default {
@@ -265,6 +183,8 @@ export default {
    AppMenu,
    AppHeader,
    AppFooter,
+    DamagePausedBanner,
+    GemsPromoBanner,
    notificationsDisplay,
    snackbars,
    BuyModal,
@@ -277,9 +197,6 @@ export default {
  mixins: [notifications, spellsMixin],
  data () {
    return {
-      icons: Object.freeze({
-        close: svgClose,
-      }),
      selectedItemToBuy: null,
      selectedSpellToBuy: null,

@@ -299,9 +216,6 @@ export default {
    castingSpell () {
      return this.$store.state.spellOptions.castingSpell;
    },
-    showRestingBanner () {
-      return !this.bannerHidden && this.user && this.user.preferences.sleep;
-    },
    noMargin () {
      return ['privateMessages'].includes(this.$route.name);
    },
@@ -589,12 +503,6 @@ export default {
    hideLoadingScreen () {
      this.loading = false;
    },
-    hideBanner () {
-      this.bannerHidden = true;
-    },
-    resumeDamage () {
-      this.$store.dispatch('user:sleep');
-    },
  },
 };
 </script>
@@ -1,78 +1,42 @@
-.promo_armoire_backgrounds_202007 {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -376px 0px;
-  width: 423px;
-  height: 147px;
-}
-.promo_armoire_backgrounds_202008 {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -376px -148px;
-  width: 423px;
-  height: 147px;
-}
 .promo_armoire_backgrounds_202009 {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -383px;
+  background-position: 0px -434px;
  width: 423px;
  height: 147px;
 }
-.promo_golden_achievements {
+.promo_fall_festival_2019 {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -295px -531px;
-  width: 246px;
-  height: 112px;
+  background-position: 0px -244px;
+  width: 360px;
+  height: 189px;
 }
-.promo_mystery_202008 {
+.promo_fall_festival_2020 {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -531px;
-  width: 294px;
-  height: 156px;
+  background-position: -532px 0px;
+  width: 360px;
+  height: 174px;
 }
 .promo_mystery_202009 {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -383px;
+  background-position: -532px -175px;
  width: 282px;
  height: 147px;
 }
 .promo_take_this {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -800px -537px;
+  background-position: -532px -323px;
  width: 96px;
  height: 69px;
 }
-.promo_time_travelers {
+.scene_positivity {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
  background-position: 0px 0px;
-  width: 375px;
-  height: 186px;
+  width: 531px;
+  height: 243px;
 }
-.scene_CernyPie {
+.scene_squall {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -688px;
+  background-position: -361px -244px;
  width: 141px;
-  height: 167px;
-}
-.scene_achievement {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -800px 0px;
-  width: 210px;
-  height: 210px;
-}
-.scene_public_space {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -187px;
-  width: 345px;
-  height: 195px;
-}
-.scene_reading {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -800px -392px;
-  width: 171px;
-  height: 144px;
-}
-.scene_rewards {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -800px -211px;
-  width: 207px;
-  height: 180px;
+  height: 169px;
 }
@@ -1,396 +1,576 @@
+.weapon_special_mammothRiderSpear {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1428px -1315px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_nomadsScimitar {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1519px -1315px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_pageBanner {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -190px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_roguishRainbowMessage {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -281px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_skeletonKey {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -372px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_tachi {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -463px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_taskwoodsLantern {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -554px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_tridentOfCrashingTides {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -645px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_warrior_0 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -736px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_warrior_1 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -827px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_warrior_2 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -918px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_warrior_3 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1009px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_warrior_4 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1100px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_warrior_5 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1191px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_warrior_6 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1282px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_0 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1373px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_1 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1464px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_2 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1555px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_3 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1646px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_4 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: 0px -1671px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_5 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -91px -1671px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_6 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -182px -1671px;
+  width: 90px;
+  height: 90px;
+}
 .Pet_Currency_Gem {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1344px -1583px;
+  background-position: -1214px -1671px;
  width: 68px;
  height: 68px;
 }
 .Pet_Currency_Gem1x {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1477px -1287px;
+  background-position: -1778px -596px;
  width: 15px;
  height: 13px;
 }
 .Pet_Currency_Gem2x {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1025px -838px;
+  background-position: -1746px -828px;
  width: 30px;
  height: 26px;
 }
 .PixelPaw-Gold {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -473px -220px;
+  background-position: -1746px -724px;
  width: 51px;
  height: 51px;
 }
 .PixelPaw {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -473px -272px;
+  background-position: -1746px -776px;
  width: 51px;
  height: 51px;
 }
 .PixelPaw002 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -473px -324px;
+  background-position: -1748px -856px;
  width: 51px;
  height: 51px;
 }
+.avatar_floral_healer {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1627px -1401px;
+  width: 99px;
+  height: 99px;
+}
+.avatar_floral_rogue {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1128px -1315px;
+  width: 99px;
+  height: 99px;
+}
+.avatar_floral_warrior {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1228px -1315px;
+  width: 99px;
+  height: 99px;
+}
+.avatar_floral_wizard {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1328px -1315px;
+  width: 99px;
+  height: 99px;
+}
+.avatar_snowball_healer {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1627px -856px;
+  width: 120px;
+  height: 105px;
+}
+.avatar_snowball_rogue {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1627px -962px;
+  width: 120px;
+  height: 105px;
+}
+.avatar_snowball_warrior {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1627px -1068px;
+  width: 120px;
+  height: 105px;
+}
+.avatar_snowball_wizard {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1627px -1174px;
+  width: 120px;
+  height: 105px;
+}
 .empty_bottles {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1620px -1583px;
+  background-position: -222px -1466px;
  width: 64px;
  height: 54px;
 }
 .ghost {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1627px -1444px;
+  background-position: -273px -1671px;
  width: 90px;
  height: 90px;
 }
 .inventory_present {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -1233px;
+  background-position: -1100px -944px;
  width: 68px;
  height: 68px;
 }
 .inventory_present_01 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -324px;
+  background-position: -1712px -1280px;
  width: 68px;
  height: 68px;
 }
 .inventory_present_02 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -435px;
+  background-position: -1727px -1401px;
  width: 68px;
  height: 68px;
 }
 .inventory_present_03 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -504px;
+  background-position: -220px -203px;
  width: 68px;
  height: 68px;
 }
 .inventory_present_04 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -573px;
+  background-position: -220px -272px;
  width: 68px;
  height: 68px;
 }
 .inventory_present_05 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -655px;
+  background-position: -220px -341px;
  width: 68px;
  height: 68px;
 }
 .inventory_present_06 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -724px;
+  background-position: -660px -435px;
  width: 68px;
  height: 68px;
 }
 .inventory_present_07 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -793px;
+  background-position: -660px -504px;
  width: 68px;
  height: 68px;
 }
 .inventory_present_08 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -875px;
+  background-position: -660px -573px;
  width: 68px;
  height: 68px;
 }
 .inventory_present_09 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -944px;
+  background-position: -880px -655px;
  width: 68px;
  height: 68px;
 }
 .inventory_present_10 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -1013px;
+  background-position: -880px -724px;
  width: 68px;
  height: 68px;
 }
 .inventory_present_11 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -1095px;
+  background-position: -880px -793px;
  width: 68px;
  height: 68px;
 }
 .inventory_present_12 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -1164px;
+  background-position: -1100px -875px;
  width: 68px;
  height: 68px;
 }
 .inventory_special_birthday {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -309px -1583px;
+  background-position: -1100px -1013px;
  width: 68px;
  height: 68px;
 }
 .inventory_special_congrats {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -378px -1583px;
+  background-position: -1320px -1095px;
  width: 68px;
  height: 68px;
 }
 .inventory_special_fortify {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -447px -1583px;
+  background-position: -1320px -1164px;
  width: 68px;
  height: 68px;
 }
 .inventory_special_getwell {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -516px -1583px;
+  background-position: -1320px -1233px;
  width: 68px;
  height: 68px;
 }
 .inventory_special_goodluck {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -585px -1583px;
+  background-position: -455px -1671px;
  width: 68px;
  height: 68px;
 }
 .inventory_special_greeting {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -654px -1583px;
+  background-position: -524px -1671px;
  width: 68px;
  height: 68px;
 }
 .inventory_special_nye {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -723px -1583px;
+  background-position: -593px -1671px;
  width: 68px;
  height: 68px;
 }
 .inventory_special_opaquePotion {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -792px -1583px;
+  background-position: -662px -1671px;
  width: 68px;
  height: 68px;
 }
 .inventory_special_seafoam {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -861px -1583px;
+  background-position: -731px -1671px;
  width: 68px;
  height: 68px;
 }
 .inventory_special_shinySeed {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -930px -1583px;
+  background-position: -800px -1671px;
  width: 68px;
  height: 68px;
 }
 .inventory_special_snowball {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -999px -1583px;
+  background-position: -869px -1671px;
  width: 68px;
  height: 68px;
 }
 .inventory_special_spookySparkles {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1068px -1583px;
+  background-position: -938px -1671px;
  width: 68px;
  height: 68px;
 }
 .inventory_special_thankyou {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1137px -1583px;
+  background-position: -1007px -1671px;
  width: 68px;
  height: 68px;
 }
 .inventory_special_trinket {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1206px -1583px;
+  background-position: -1076px -1671px;
  width: 68px;
  height: 68px;
 }
 .inventory_special_valentine {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1275px -1583px;
+  background-position: -1145px -1671px;
  width: 68px;
  height: 68px;
 }
 .knockout {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -309px -1535px;
+  background-position: -1407px -1251px;
  width: 120px;
  height: 47px;
 }
 .pet_key {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1413px -1583px;
+  background-position: -1283px -1671px;
  width: 68px;
  height: 68px;
 }
 .rebirth_orb {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1482px -1583px;
+  background-position: -1352px -1671px;
  width: 68px;
  height: 68px;
 }
 .seafoam_star {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1718px -1444px;
+  background-position: -364px -1671px;
  width: 90px;
  height: 90px;
 }
 .shop_armoire {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1551px -1583px;
+  background-position: -1421px -1671px;
  width: 68px;
  height: 68px;
 }
 .zzz {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -702px -261px;
+  background-position: -1748px -962px;
  width: 40px;
  height: 40px;
 }
 .zzz_light {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -702px -220px;
+  background-position: -1748px -908px;
  width: 40px;
  height: 40px;
 }
 .notif_inventory_present_01 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1809px -1444px;
+  background-position: -1748px -1003px;
  width: 28px;
  height: 28px;
 }
 .notif_inventory_present_02 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1809px -1473px;
+  background-position: -1748px -1032px;
  width: 28px;
  height: 28px;
 }
 .notif_inventory_present_03 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1809px -1502px;
+  background-position: -1748px -1068px;
  width: 28px;
  height: 28px;
 }
 .notif_inventory_present_04 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1187px -1061px;
+  background-position: -1748px -1097px;
  width: 28px;
  height: 28px;
 }
 .notif_inventory_present_05 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1216px -1061px;
+  background-position: -1748px -1126px;
  width: 28px;
  height: 28px;
 }
 .notif_inventory_present_06 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1245px -1061px;
+  background-position: -1748px -1174px;
  width: 28px;
  height: 28px;
 }
 .notif_inventory_present_07 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1274px -1061px;
+  background-position: -1748px -1203px;
  width: 28px;
  height: 28px;
 }
 .notif_inventory_present_08 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1303px -1061px;
+  background-position: -1748px -1232px;
  width: 28px;
  height: 28px;
 }
 .notif_inventory_present_09 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1332px -1061px;
+  background-position: -1712px -1368px;
  width: 28px;
  height: 28px;
 }
 .notif_inventory_present_10 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1361px -1061px;
+  background-position: -1741px -1368px;
  width: 28px;
  height: 28px;
 }
 .notif_inventory_present_11 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -967px -838px;
+  background-position: -1770px -1368px;
  width: 28px;
  height: 28px;
 }
 .notif_inventory_present_12 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -996px -838px;
+  background-position: -1727px -1470px;
  width: 28px;
  height: 28px;
 }
 .notif_inventory_special_birthday {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1102px -838px;
+  background-position: -1778px -449px;
  width: 20px;
  height: 24px;
 }
 .notif_inventory_special_congrats {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1165px -838px;
+  background-position: -1778px -524px;
  width: 20px;
  height: 22px;
 }
 .notif_inventory_special_getwell {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -747px -618px;
+  background-position: -1778px -547px;
  width: 20px;
  height: 22px;
 }
 .notif_inventory_special_goodluck {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1081px -838px;
+  background-position: -1778px -422px;
  width: 20px;
  height: 26px;
 }
 .notif_inventory_special_greeting {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -768px -618px;
+  background-position: -1778px -573px;
  width: 20px;
  height: 22px;
 }
 .notif_inventory_special_nye {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1056px -838px;
+  background-position: -1777px -828px;
  width: 24px;
  height: 26px;
 }
 .notif_inventory_special_thankyou {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1123px -838px;
+  background-position: -1778px -474px;
  width: 20px;
  height: 24px;
 }
 .notif_inventory_special_valentine {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1144px -838px;
+  background-position: -1778px -499px;
  width: 20px;
  height: 24px;
 }
 .npc_bailey {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -302px -1677px;
+  background-position: -1737px -1529px;
  width: 60px;
  height: 72px;
 }
 .npc_justin {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -203px;
+  background-position: -1627px -1280px;
  width: 84px;
  height: 120px;
 }
 .npc_matt {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1375px -1315px;
+  background-position: -932px -1315px;
  width: 195px;
  height: 138px;
 }
@@ -402,19 +582,19 @@
 }
 .banner_flair_dysheartener {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1407px -1287px;
+  background-position: -1712px -1349px;
  width: 69px;
  height: 18px;
 }
 .phobia_dysheartener {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1627px -1061px;
+  background-position: -1187px -880px;
  width: 201px;
  height: 195px;
 }
 .quest_alligator {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1627px -645px;
+  background-position: -1407px -648px;
  width: 201px;
  height: 213px;
 }
@@ -432,19 +612,19 @@
 }
 .quest_atom1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -665px -1315px;
+  background-position: -222px -1315px;
  width: 250px;
  height: 150px;
 }
 .quest_atom2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1167px -1315px;
+  background-position: -724px -1315px;
  width: 207px;
  height: 138px;
 }
 .quest_atom3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1187px -880px;
+  background-position: -747px -440px;
  width: 216px;
  height: 180px;
 }
@@ -462,13 +642,13 @@
 }
 .quest_basilist {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -1535px;
+  background-position: 0px -1529px;
  width: 189px;
  height: 141px;
 }
 .quest_beetle {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1627px -859px;
+  background-position: -1407px -862px;
  width: 204px;
  height: 201px;
 }
@@ -480,7 +660,7 @@
 }
 .quest_bunny {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1627px -1257px;
+  background-position: -967px -660px;
  width: 210px;
  height: 186px;
 }
@@ -498,7 +678,7 @@
 }
 .quest_cow {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -527px -220px;
+  background-position: -1627px 0px;
  width: 174px;
  height: 213px;
 }
@@ -510,13 +690,13 @@
 }
 .quest_dilatoryDistress1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1627px -434px;
+  background-position: -1407px -437px;
  width: 210px;
  height: 210px;
 }
 .quest_dilatoryDistress2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -1677px;
+  background-position: -1627px -422px;
  width: 150px;
  height: 150px;
 }
@@ -546,13 +726,13 @@
 }
 .quest_egg {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -307px -220px;
+  background-position: -1627px -214px;
  width: 165px;
  height: 207px;
 }
 .quest_evilsanta {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -190px -1535px;
+  background-position: -1627px -724px;
  width: 118px;
  height: 131px;
 }
@@ -582,7 +762,7 @@
 }
 .quest_frog {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -1315px;
+  background-position: 0px -1315px;
  width: 221px;
  height: 213px;
 }
@@ -600,7 +780,7 @@
 }
 .quest_goldenknight2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -916px -1315px;
+  background-position: -473px -1315px;
  width: 250px;
  height: 150px;
 }
@@ -612,7 +792,7 @@
 }
 .quest_gryphon {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -967px -660px;
+  background-position: -527px -220px;
  width: 216px;
  height: 177px;
 }
@@ -630,7 +810,7 @@
 }
 .quest_hedgehog {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1407px -1100px;
+  background-position: -1407px -1064px;
  width: 219px;
  height: 186px;
 }
@@ -654,7 +834,7 @@
 }
 .quest_kraken {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -747px -440px;
+  background-position: -307px -220px;
  width: 216px;
  height: 177px;
 }
@@ -678,7 +858,7 @@
 }
 .quest_mayhemMistiflying1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -151px -1677px;
+  background-position: -1627px -573px;
  width: 150px;
  height: 150px;
 }
@@ -702,7 +882,7 @@
 }
 .quest_moon1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1627px 0px;
+  background-position: -1407px -220px;
  width: 216px;
  height: 216px;
 }
@@ -712,45 +892,3 @@
  width: 219px;
  height: 219px;
 }
-.quest_moon3 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1407px -220px;
-  width: 219px;
-  height: 219px;
-}
-.quest_moonstone1 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1407px -440px;
-  width: 219px;
-  height: 219px;
-}
-.quest_moonstone2 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1407px -660px;
-  width: 219px;
-  height: 219px;
-}
-.quest_moonstone3 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1407px -880px;
-  width: 219px;
-  height: 219px;
-}
-.quest_nudibranch {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1627px -217px;
-  width: 216px;
-  height: 216px;
-}
-.quest_octopus {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -442px -1315px;
-  width: 222px;
-  height: 177px;
-}
-.quest_owl {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -1315px;
-  width: 219px;
-  height: 219px;
-}
@@ -1080,7 +1080,7 @@
 }
 .body_armoire_cozyScarf {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -230px -819px;
+  background-position: -345px -819px;
  width: 114px;
  height: 87px;
 }
@@ -1260,9 +1260,9 @@
 }
 .broad_armor_armoire_guardiansGown {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -345px -819px;
+  background-position: -345px -273px;
  width: 114px;
-  height: 87px;
+  height: 90px;
 }
 .broad_armor_armoire_heroicHerbalistRobe {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
@@ -1278,7 +1278,7 @@
 }
 .broad_armor_armoire_invernessCape {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -345px -273px;
+  background-position: 0px -364px;
  width: 114px;
  height: 90px;
 }
@@ -1308,7 +1308,7 @@
 }
 .broad_armor_armoire_layerCakeArmor {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: 0px -364px;
+  background-position: -115px -364px;
  width: 114px;
  height: 90px;
 }
@@ -1320,7 +1320,7 @@
 }
 .broad_armor_armoire_matchMakersApron {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -115px -364px;
+  background-position: -230px -364px;
  width: 114px;
  height: 90px;
 }
@@ -1344,7 +1344,7 @@
 }
 .broad_armor_armoire_nephriteArmor {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -230px -364px;
+  background-position: -345px -364px;
  width: 114px;
  height: 90px;
 }
@@ -1356,13 +1356,13 @@
 }
 .broad_armor_armoire_pirateOutfit {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -345px -364px;
+  background-position: -460px 0px;
  width: 114px;
  height: 90px;
 }
 .broad_armor_armoire_piraticalPrincessGown {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -460px 0px;
+  background-position: -460px -91px;
  width: 114px;
  height: 90px;
 }
@@ -1392,13 +1392,13 @@
 }
 .broad_armor_armoire_robeOfDiamonds {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -460px -91px;
+  background-position: -460px -182px;
  width: 114px;
  height: 90px;
 }
 .broad_armor_armoire_robeOfSpades {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -460px -182px;
+  background-position: -460px -273px;
  width: 114px;
  height: 90px;
 }
@@ -1410,13 +1410,13 @@
 }
 .broad_armor_armoire_scribesRobe {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -460px -273px;
+  background-position: -460px -364px;
  width: 114px;
  height: 90px;
 }
 .broad_armor_armoire_shadowMastersRobe {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -460px -364px;
+  background-position: 0px -455px;
  width: 114px;
  height: 90px;
 }
@@ -1428,19 +1428,19 @@
 }
 .broad_armor_armoire_softBlueSuit {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: 0px -455px;
+  background-position: -115px -455px;
  width: 114px;
  height: 90px;
 }
 .broad_armor_armoire_softGreenSuit {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -115px -455px;
+  background-position: -230px -455px;
  width: 114px;
  height: 90px;
 }
 .broad_armor_armoire_softRedSuit {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -230px -455px;
+  background-position: -345px -455px;
  width: 114px;
  height: 90px;
 }
@@ -1452,7 +1452,7 @@
 }
 .broad_armor_armoire_swanDancerTutu {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -345px -455px;
+  background-position: -460px -455px;
  width: 114px;
  height: 90px;
 }
@@ -1464,7 +1464,7 @@
 }
 .broad_armor_armoire_vernalVestment {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -460px -455px;
+  background-position: -575px 0px;
  width: 114px;
  height: 90px;
 }
@@ -1482,7 +1482,7 @@
 }
 .broad_armor_armoire_wovenRobes {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -575px 0px;
+  background-position: -575px -91px;
  width: 114px;
  height: 90px;
 }
@@ -1512,13 +1512,13 @@
 }
 .headAccessory_armoire_gogglesOfBookbinding {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -230px -637px;
+  background-position: -345px -637px;
  width: 114px;
  height: 90px;
 }
 .head_armoire_alchemistsHat {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -575px -91px;
+  background-position: -575px -182px;
  width: 114px;
  height: 90px;
 }
@@ -1530,7 +1530,7 @@
 }
 .head_armoire_astronomersHat {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -575px -182px;
+  background-position: -575px -273px;
  width: 114px;
  height: 90px;
 }
@@ -1542,7 +1542,7 @@
 }
 .head_armoire_baseballCap {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -575px -273px;
+  background-position: -575px -364px;
  width: 114px;
  height: 90px;
 }
@@ -1584,7 +1584,7 @@
 }
 .head_armoire_boaterHat {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -575px -364px;
+  background-position: -575px -455px;
  width: 114px;
  height: 90px;
 }
@@ -1602,13 +1602,13 @@
 }
 .head_armoire_coachDriversHat {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -575px -455px;
+  background-position: 0px -546px;
  width: 114px;
  height: 90px;
 }
 .head_armoire_crownOfDiamonds {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: 0px -546px;
+  background-position: -115px -546px;
  width: 114px;
  height: 90px;
 }
@@ -1626,7 +1626,7 @@
 }
 .head_armoire_deerstalkerCap {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -115px -546px;
+  background-position: -230px -546px;
  width: 114px;
  height: 90px;
 }
@@ -1638,7 +1638,7 @@
 }
 .head_armoire_earflapHat {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -230px -546px;
+  background-position: -345px -546px;
  width: 114px;
  height: 90px;
 }
@@ -1650,19 +1650,19 @@
 }
 .head_armoire_fiddlersCap {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -345px -546px;
+  background-position: -460px -546px;
  width: 114px;
  height: 90px;
 }
 .head_armoire_flutteryWig {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -460px -546px;
+  background-position: -575px -546px;
  width: 114px;
  height: 90px;
 }
 .head_armoire_frostedHelm {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -575px -546px;
+  background-position: -690px 0px;
  width: 114px;
  height: 90px;
 }
@@ -1674,7 +1674,7 @@
 }
 .head_armoire_glassblowersHat {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -690px 0px;
+  background-position: -690px -91px;
  width: 114px;
  height: 90px;
 }
@@ -1746,7 +1746,7 @@
 }
 .head_armoire_matchMakersBeret {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -690px -91px;
+  background-position: -690px -182px;
  width: 114px;
  height: 90px;
 }
@@ -1770,7 +1770,7 @@
 }
 .head_armoire_nephriteHelm {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -690px -182px;
+  background-position: -690px -273px;
  width: 114px;
  height: 90px;
 }
@@ -1794,7 +1794,7 @@
 }
 .head_armoire_piraticalPrincessHeaddress {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -690px -273px;
+  background-position: -690px -364px;
  width: 114px;
  height: 90px;
 }
@@ -1836,7 +1836,7 @@
 }
 .head_armoire_shadowMastersHood {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -690px -364px;
+  background-position: -690px -455px;
  width: 114px;
  height: 90px;
 }
@@ -1854,19 +1854,19 @@
 }
 .head_armoire_toqueBlanche {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -690px -455px;
+  background-position: -690px -546px;
  width: 114px;
  height: 90px;
 }
 .head_armoire_tricornHat {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -690px -546px;
+  background-position: 0px -637px;
  width: 114px;
  height: 90px;
 }
 .head_armoire_veilOfSpades {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: 0px -637px;
+  background-position: -115px -637px;
  width: 114px;
  height: 90px;
 }
@@ -1878,7 +1878,7 @@
 }
 .head_armoire_vernalHennin {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -115px -637px;
+  background-position: -230px -637px;
  width: 114px;
  height: 90px;
 }
@@ -1908,7 +1908,7 @@
 }
 .shield_armoire_alchemistsScale {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -345px -637px;
+  background-position: -460px -637px;
  width: 114px;
  height: 90px;
 }
@@ -1920,13 +1920,13 @@
 }
 .shield_armoire_baseballGlove {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -460px -637px;
+  background-position: -575px -637px;
  width: 114px;
  height: 90px;
 }
 .shield_armoire_birthdayBanner {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -575px -637px;
+  background-position: -690px -637px;
  width: 114px;
  height: 90px;
 }
@@ -1938,7 +1938,7 @@
 }
 .shield_armoire_fancyBlownGlassVase {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -690px -637px;
+  background-position: -805px 0px;
  width: 114px;
  height: 90px;
 }
@@ -1956,7 +1956,7 @@
 }
 .shield_armoire_fiddle {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -805px 0px;
+  background-position: -805px -91px;
  width: 114px;
  height: 90px;
 }
@@ -1968,7 +1968,7 @@
 }
 .shield_armoire_flutteryFan {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -805px -91px;
+  background-position: -805px -182px;
  width: 114px;
  height: 90px;
 }
@@ -1992,7 +1992,7 @@
 }
 .shield_armoire_hobbyHorse {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -805px -182px;
+  background-position: -805px -273px;
  width: 114px;
  height: 90px;
 }
@@ -2004,13 +2004,13 @@
 }
 .shield_armoire_lifeBuoy {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -805px -273px;
+  background-position: -805px -364px;
  width: 114px;
  height: 90px;
 }
 .shield_armoire_masteredShadow {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -805px -364px;
+  background-position: -805px -455px;
  width: 114px;
  height: 90px;
 }
@@ -2022,13 +2022,13 @@
 }
 .shield_armoire_mightyPizza {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -805px -455px;
+  background-position: -805px -546px;
  width: 114px;
  height: 90px;
 }
 .shield_armoire_mightyQuill {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -805px -546px;
+  background-position: -805px -637px;
  width: 114px;
  height: 90px;
 }
@@ -2058,25 +2058,25 @@
 }
 .shield_armoire_perfectMatch {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -805px -637px;
+  background-position: 0px -728px;
  width: 114px;
  height: 90px;
 }
 .shield_armoire_piratesCompanion {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: 0px -728px;
+  background-position: -115px -728px;
  width: 114px;
  height: 90px;
 }
 .shield_armoire_piraticalSkullShield {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -115px -728px;
+  background-position: -230px -728px;
  width: 114px;
  height: 90px;
 }
 .shield_armoire_polishedPocketwatch {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -230px -728px;
+  background-position: -345px -728px;
  width: 114px;
  height: 90px;
 }
@@ -2106,25 +2106,25 @@
 }
 .shield_armoire_shieldOfDiamonds {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -345px -728px;
+  background-position: -460px -728px;
  width: 114px;
  height: 90px;
 }
 .shield_armoire_softBluePillow {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -460px -728px;
+  background-position: -575px -728px;
  width: 114px;
  height: 90px;
 }
 .shield_armoire_softGreenPillow {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -575px -728px;
+  background-position: -690px -728px;
  width: 114px;
  height: 90px;
 }
 .shield_armoire_softRedPillow {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -690px -728px;
+  background-position: -805px -728px;
  width: 114px;
  height: 90px;
 }
@@ -2136,13 +2136,13 @@
 }
 .shield_armoire_trustyUmbrella {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -805px -728px;
+  background-position: 0px -819px;
  width: 114px;
  height: 90px;
 }
 .shield_armoire_unfinishedTome {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: 0px -819px;
+  background-position: -115px -819px;
  width: 114px;
  height: 90px;
 }
@@ -2154,7 +2154,7 @@
 }
 .shield_armoire_weaversShuttle {
  background-image: url('~@/assets/images/sprites/spritesmith-main-6.png');
-  background-position: -115px -819px;
+  background-position: -230px -819px;
  width: 114px;
  height: 90px;
 }
--- a/Show More
+++ b/Show More