-
{{ $t('g1g1Announcement') }}
-
{{ $t('g1g1Details') }}
+
+ {{ $t('g1g1Announcement') }}
+
+
+ {{ $t('g1g1Details') }}
+
-
{{ $t('sendGift') }}
+
+ {{ $t('sendGift') }}
+
diff --git a/website/client/src/store/actions/shops.js b/website/client/src/store/actions/shops.js
index fea30216b8..52c2aea350 100644
--- a/website/client/src/store/actions/shops.js
+++ b/website/client/src/store/actions/shops.js
@@ -78,9 +78,8 @@ async function buyArmoire (store, params) {
// @TODO: We might need to abstract notifications to library rather than mixin
const notificationOptions = isExperience
? {
- text: `+ ${item.value}`,
- type: 'xp',
- flavorMessage: message,
+ text: message,
+ type: 'success',
}
: {
text: message,
@@ -93,6 +92,10 @@ async function buyArmoire (store, params) {
timeout: true,
...notificationOptions,
});
+
+ if (isExperience) {
+ await store.dispatch('user:fetch', { forceLoad: true });
+ }
}
}
diff --git a/website/common/script/content/quests.js b/website/common/script/content/quests.js
index 425c1656dd..0e552c87a9 100644
--- a/website/common/script/content/quests.js
+++ b/website/common/script/content/quests.js
@@ -1067,7 +1067,7 @@ const quests = {
notes: t('questBasilistNotes'),
group: 'questGroupEarnable',
completion: t('questBasilistCompletion'),
- value: 4,
+ goldValue: 100,
category: 'unlockable',
unlockCondition: {
condition: 'party invite',
@@ -2238,7 +2238,7 @@ const quests = {
notes: t('questDustBunniesNotes'),
group: 'questGroupEarnable',
completion: t('questDustBunniesCompletion'),
- value: 4,
+ value: 1,
category: 'unlockable',
unlockCondition: {
condition: 'party invite',
@@ -2262,7 +2262,7 @@ const quests = {
value: 4,
category: 'unlockable',
unlockCondition: {
- condition: 'party invite',
+ condition: 'login reward',
incentiveThreshold: 7,
text: t('loginReward', { count: 7 }),
},
@@ -2293,7 +2293,7 @@ const quests = {
value: 4,
category: 'unlockable',
unlockCondition: {
- condition: 'party invite',
+ condition: 'login reward',
incentiveThreshold: 22,
text: t('loginReward', { count: 22 }),
},
@@ -2323,7 +2323,7 @@ const quests = {
value: 4,
category: 'unlockable',
unlockCondition: {
- condition: 'party invite',
+ condition: 'login reward',
incentiveThreshold: 40,
text: t('loginReward', { count: 40 }),
},
diff --git a/website/common/script/ops/buy/buyArmoire.js b/website/common/script/ops/buy/buyArmoire.js
index fab02460d7..9a7f91e200 100644
--- a/website/common/script/ops/buy/buyArmoire.js
+++ b/website/common/script/ops/buy/buyArmoire.js
@@ -10,6 +10,7 @@ import {
import randomVal, * as randomValFns from '../../libs/randomVal';
import { removeItemByPath } from '../pinnedGearUtils';
import { AbstractGoldItemOperation } from './abstractBuyOperation';
+import updateStats from '../../fns/updateStats';
// TODO this is only used on the server
// move out of common?
@@ -156,6 +157,7 @@ export class BuyArmoireOperation extends AbstractGoldItemOperation { // eslint-d
_experienceResult (user) {
const armoireExp = Math.floor(randomValFns.trueRandom() * 40 + 10);
user.stats.exp += armoireExp;
+ updateStats(user, user.stats, this.req);
return {
message: this.i18n('armoireExp'),
diff --git a/website/common/script/ops/buy/buyQuestGold.js b/website/common/script/ops/buy/buyQuestGold.js
index a4f16d4bfd..10a0cfadcb 100644
--- a/website/common/script/ops/buy/buyQuestGold.js
+++ b/website/common/script/ops/buy/buyQuestGold.js
@@ -42,7 +42,7 @@ export class BuyQuestWithGoldOperation extends AbstractGoldItemOperation { // es
if (!item) throw new NotFound(errorMessage('questNotFound', { key }));
- if (!(item.category === 'gold' && item.goldValue)) {
+ if (!(item.goldValue)) {
throw new NotAuthorized(this.i18n('questNotGoldPurchasable', { key }));
}
diff --git a/website/raw_sprites/spritesmith_large/scene_gaining_achievement.png b/website/raw_sprites/spritesmith_large/scene_gaining_achievement.png
new file mode 100644
index 0000000000..0c900350ca
Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_gaining_achievement.png differ
diff --git a/website/raw_sprites/spritesmith_large/scene_shanaqui.png b/website/raw_sprites/spritesmith_large/scene_shanaqui.png
new file mode 100644
index 0000000000..fe9d7035dc
Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_shanaqui.png differ
diff --git a/website/server/controllers/api-v3/auth.js b/website/server/controllers/api-v3/auth.js
index 745afb0750..9d1befafb8 100644
--- a/website/server/controllers/api-v3/auth.js
+++ b/website/server/controllers/api-v3/auth.js
@@ -29,7 +29,7 @@ const api = {};
/**
* @api {post} /api/v3/user/auth/local/register Register
* @apiDescription Register a new user with email, login name, and password or
- * attach local auth to a social user
+ * attach local authentication to a social auth user
* @apiName UserRegisterLocal
* @apiGroup User
*
@@ -148,12 +148,14 @@ api.loginSocial = {
/**
* @api {put} /api/v3/user/auth/update-username Update username
- * @apiDescription Update the username of a local user
+ * @apiDescription Update and verify the user's username
* @apiName UpdateUsername
* @apiGroup User
*
* @apiParam (Body) {String} username The new username
-
+ * @apiParam (Body) {String} password The user's password if they use local authentication.
+ * Omit if they use social auth.
+ *
* @apiSuccess {String} data.username The new username
* */
api.updateUsername = {
@@ -196,6 +198,8 @@ api.updateUsername = {
// save username
user.auth.local.lowerCaseUsername = newUsername.toLowerCase();
user.auth.local.username = newUsername;
+
+ // reward user for verifying their username
if (!user.flags.verifiedUsername) {
user.flags.verifiedUsername = true;
if (user.items.pets['Bear-Veteran']) {
@@ -277,7 +281,7 @@ api.updatePassword = {
};
/**
- * @api {post} /api/v3/user/reset-password Reset password
+ * @api {post} /api/v3/user/reset-password Reset password (email a reset link)
* @apiDescription Send the user an email to let them reset their password
* @apiName ResetPassword
* @apiGroup User
@@ -371,7 +375,7 @@ api.updateEmail = {
};
/**
- * @api {post} /api/v3/user/auth/reset-password-set-new-one Reset Password Set New one
+ * @api {post} /api/v3/user/auth/reset-password-set-new-one Reset password (set a new one)
* @apiDescription Set a new password for a user that reset theirs. Not meant for public usage.
* @apiName ResetPasswordSetNewOne
* @apiGroup User
@@ -424,8 +428,8 @@ api.resetPasswordSetNewOne = {
/**
* @api {delete} /api/v3/user/auth/social/:network Delete social authentication method
- * @apiDescription Remove a social authentication method (only facebook supported)
- * from a user profile. The user must have local authentication enabled
+ * @apiDescription Remove a social authentication method from a user profile.
+ * The user must have another authentication method enabled.
* @apiName UserDeleteSocial
* @apiGroup User
*
diff --git a/website/server/controllers/api-v3/challenges.js b/website/server/controllers/api-v3/challenges.js
index 00e283add7..a68e08ffa3 100644
--- a/website/server/controllers/api-v3/challenges.js
+++ b/website/server/controllers/api-v3/challenges.js
@@ -513,7 +513,7 @@ api.getGroupChallenges = {
};
/**
- * @api {get} /api/v3/challenges/:challengeId Get a challenge given its id
+ * @api {get} /api/v3/challenges/:challengeId Get a challenge
* @apiName GetChallenge
* @apiGroup Challenge
*
diff --git a/website/server/controllers/api-v3/cron.js b/website/server/controllers/api-v3/cron.js
index 0016650bcf..bea3e41201 100644
--- a/website/server/controllers/api-v3/cron.js
+++ b/website/server/controllers/api-v3/cron.js
@@ -4,8 +4,11 @@ import cron from '../../middlewares/cron';
const api = {};
/**
- * @api {post} /api/v3/cron Runs cron
+ * @api {post} /api/v3/cron Run cron
* @apiName Cron
+ * @apiDescription This causes cron to run. It assumes that the user has already been shown
+ * the Record Yesterday's Activity ("Check off any Dailies you did yesterday") screen and
+ * so it will immediately apply damage for incomplete due Dailies.
* @apiGroup Cron
*
* @apiSuccess {Object} data An empty Object
diff --git a/website/server/controllers/api-v3/hall.js b/website/server/controllers/api-v3/hall.js
index 8e28fbc17a..81b6c97999 100644
--- a/website/server/controllers/api-v3/hall.js
+++ b/website/server/controllers/api-v3/hall.js
@@ -93,7 +93,7 @@ api.getPatrons = {
};
/**
- * @api {get} /api/v3/hall/heroes Get all Heroes
+ * @api {get} /api/v3/hall/heroes Get all Heroes (contributors)
* @apiName GetHeroes
* @apiGroup Hall
*
@@ -154,7 +154,7 @@ const heroAdminFields = 'contributor balance profile.name purchased items auth f
* @apiGroup Hall
* @apiPermission Admin
*
- * @apiDescription Returns the profile of the given user
+ * @apiDescription Returns the profile of the given user. User does not need to be a contributor.
*
* @apiSuccess {Object} data The user object
*
@@ -208,9 +208,9 @@ const gemsPerTier = {
* @apiGroup Hall
* @apiPermission Admin
*
- * @apiDescription Update user's gem balance, contributions & contribution tier
- * and admin status. Grant items, block / unblock user's account
- * and revoke / unrevoke chat privileges.
+ * @apiDescription Update user's gem balance, contributions and contribution tier,
+ * or admin status. Grant items. Block / unblock user's account.
+ * Revoke / unrevoke chat privileges.
*
* @apiExample Example Body:
* {
diff --git a/website/server/controllers/api-v3/members.js b/website/server/controllers/api-v3/members.js
index 126546d4f4..e7d3e0dfe9 100644
--- a/website/server/controllers/api-v3/members.js
+++ b/website/server/controllers/api-v3/members.js
@@ -658,8 +658,8 @@ api.getObjectionsToInteraction = {
* @apiName SendPrivateMessage
* @apiGroup Member
*
- * @apiParam (Body) {String} message Body parameter - The message
- * @apiParam (Body) {UUID} toUserId Body parameter - The user to contact
+ * @apiParam (Body) {String} message The message
+ * @apiParam (Body) {UUID} toUserId The id of the user to contact
*
* @apiSuccess {Object} data.message The message just sent
*
@@ -698,7 +698,7 @@ api.sendPrivateMessage = {
* @apiGroup Member
*
* @apiParam (Body) {String} message The message to the user
- * @apiParam (Body) {UUID} toUserId The toUser _id
+ * @apiParam (Body) {UUID} toUserId The user to send the gift to
* @apiParam (Body) {Integer} gemAmount The number of gems to send
*
* @apiSuccess {Object} data An empty Object
diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js
index 863a80605b..a3fa4223f2 100644
--- a/website/server/controllers/api-v3/news.js
+++ b/website/server/controllers/api-v3/news.js
@@ -4,7 +4,7 @@ const api = {};
// @TODO export this const, cannot export it from here because only routes are exported from
// controllers
-const LAST_ANNOUNCEMENT_TITLE = 'NEW PET COLLECTION BADGES!';
+const LAST_ANNOUNCEMENT_TITLE = 'BLOG POSTS: PARTY PARTICIPATION AND OUR FAVO(U)RITE GUILDS!';
const worldDmg = { // @TODO
bailey: false,
};
@@ -31,23 +31,43 @@ api.getNews = {
${res.t('newStuff')}
- 2/18/2020 - ${LAST_ANNOUNCEMENT_TITLE}
+ 2/20/2020 - ${LAST_ANNOUNCEMENT_TITLE}
- We're releasing a new achievement so you can celebrate your successes in the world of
- Habitican pet collecting! Earn the Tickled Pink and Rosy Outlook achievements by
- collecting Cotton Candy Pink pets and mounts and you'll earn a nifty badge for your
- profile.
+ This month's Use Case Spotlight is about Party Participation! It features a number
+ of great suggestions submitted by Habiticans in the Use Case Spotlights Guild.
+ We hope it helps any of you who might be looking for ways to keep your quest party
+ engaged and excited to win battles with good habits.
- If you already have all the Cotton Candy Pink pets and/or mounts in your stable, you'll
- receive the badge automatically! Check your profile and celebrate your new achievement
- with pride in your pink prowess.
+ Plus, we're collecting user submissions for the next spotlight! How do you use Habitica
+ to manage conflicting needs, like productivity versus self-care? We’ll be featuring
+ player-submitted examples in Use Case Spotlights on the Habitica Blog next month, so post
+ your suggestions in the Use Case Spotlight Guild now. We look forward to learning more
+ about how you use Habitica to improve your life and get things done!
-
+ For this year's Guild Spotlight series, we're highlighting some favourites from
+ Habitica's staff, moderators, and maybe some high-level contributors!
+
+