+
Perk month count:
- {{ hero.purchased.plan.perkMonthCount }}
+
Next Mystic Hourglass:
diff --git a/website/common/locales/en/achievements.json b/website/common/locales/en/achievements.json
index 7650882af5..7e4aba8355 100644
--- a/website/common/locales/en/achievements.json
+++ b/website/common/locales/en/achievements.json
@@ -147,5 +147,8 @@
"achievementPolarProModalText": "You collected all the Polar Pets!",
"achievementPlantParent": "Plant Parent",
"achievementPlantParentText": "Has hatched all standard colors of Plant pets: Cactus and Treeling!",
- "achievementPlantParentModalText": "You collected all the Plant Pets!"
+ "achievementPlantParentModalText": "You collected all the Plant Pets!",
+ "achievementDinosaurDynasty": "Dinosaur Dynasty",
+ "achievementDinosaurDynastyText": "Has hatched all standard colors of bird and dinosaur pets: Falcon, Owl, Parrot, Peacock, Penguin, Rooster, Pterodactyl, T-Rex, Triceratops, and Velociraptor!",
+ "achievementDinosaurDynastyModalText": "You collected all the bird and dinosaur pets!"
}
diff --git a/website/common/script/content/achievements.js b/website/common/script/content/achievements.js
index dfc0e46df4..a7e843d23d 100644
--- a/website/common/script/content/achievements.js
+++ b/website/common/script/content/achievements.js
@@ -178,6 +178,11 @@ const animalSetAchievs = {
titleKey: 'achievementBirdsOfAFeather',
textKey: 'achievementBirdsOfAFeatherText',
},
+ dinosaurDynasty: {
+ icon: 'achievement-dinosaurDynasty',
+ titleKey: 'achievementDinosaurDynasty',
+ textKey: 'achievementDinosaurDynastyText',
+ },
domesticated: {
icon: 'achievement-domesticated',
titleKey: 'achievementDomesticated',
diff --git a/website/common/script/content/bundles.js b/website/common/script/content/bundles.js
index 4576c5e727..f9b3666fab 100644
--- a/website/common/script/content/bundles.js
+++ b/website/common/script/content/bundles.js
@@ -178,9 +178,9 @@ const bundles = {
'penguin',
'rooster',
],
- event: EVENTS.bundle202109,
+ event: EVENTS.bundle202305,
canBuy () {
- return moment().isBefore(EVENTS.bundle202109.end);
+ return moment().isBefore(EVENTS.bundle202305.end);
},
type: 'quests',
value: 7,
diff --git a/website/common/script/content/constants/animalSetAchievements.js b/website/common/script/content/constants/animalSetAchievements.js
index 6f6569ff5b..dc49609d12 100644
--- a/website/common/script/content/constants/animalSetAchievements.js
+++ b/website/common/script/content/constants/animalSetAchievements.js
@@ -26,6 +26,23 @@ const ANIMAL_SET_ACHIEVEMENTS = {
achievementKey: 'birdsOfAFeather',
notificationType: 'ACHIEVEMENT_ANIMAL_SET',
},
+ dinosaurDynasty: {
+ type: 'pet',
+ species: [
+ 'Falcon',
+ 'Owl',
+ 'Parrot',
+ 'Peacock',
+ 'Penguin',
+ 'Rooster',
+ 'Pterodactyl',
+ 'TRex',
+ 'Triceratops',
+ 'Velociraptor',
+ ],
+ achievementKey: 'dinosaurDynasty',
+ notificationType: 'ACHIEVEMENT_ANIMAL_SET',
+ },
domesticated: {
type: 'pet',
species: [
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index 2349bcbffc..d68c78ee21 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -15,6 +15,10 @@ export const EVENTS = {
season: 'normal',
npcImageSuffix: '',
},
+ bundle202305: {
+ start:'2023-05-23T08:00-04:00',
+ end:'2023-05-31T23:59-04:00',
+ },
potions202305: {
start:'2023-05-16T08:00-04:00',
end:'2023-05-31T23:59-04:00',
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index 57ca7da7ff..13eb8ddff9 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -45,19 +45,19 @@ const featuredItems = {
];
},
quests () { // start date is 3/28
- if (moment().isBetween(EVENTS.bundle202303.start, EVENTS.bundle202303.end)) {
+ if (moment().isBetween(EVENTS.bundle202305.start, EVENTS.bundle202305.end)) {
return [
{
type: 'bundles',
- path: 'bundles.jungleBuddies',
+ path: 'bundles.birdBuddies',
},
{
type: 'quests',
- path: 'quests.kraken',
+ path: 'quests.harpy',
},
{
type: 'quests',
- path: 'quests.nudibranch',
+ path: 'quests.owl',
},
];
}
diff --git a/website/common/script/libs/achievements.js b/website/common/script/libs/achievements.js
index 380e2b481b..d54469bead 100644
--- a/website/common/script/libs/achievements.js
+++ b/website/common/script/libs/achievements.js
@@ -221,6 +221,7 @@ function _getBasicAchievements (user, language) {
_addSimple(result, user, { path: 'boneToPick', language });
_addSimple(result, user, { path: 'polarPro', language });
_addSimple(result, user, { path: 'plantParent', language });
+ _addSimple(result, user, { path: 'dinosaurDynasty', language });
_addSimpleWithMasterCount(result, user, { path: 'beastMaster', language });
_addSimpleWithMasterCount(result, user, { path: 'mountMaster', language });
diff --git a/website/server/libs/payments/groupPayments.js b/website/server/libs/payments/groupPayments.js
index b59566c2fb..dfd7f7eea5 100644
--- a/website/server/libs/payments/groupPayments.js
+++ b/website/server/libs/payments/groupPayments.js
@@ -180,6 +180,7 @@ async function addSubToGroupUser (member, group) {
}
// save unused hourglass and mystery items
+ plan.perkMonthCount = memberPlan.perkMonthCount;
plan.consecutive.trinkets = memberPlan.consecutive.trinkets;
plan.mysteryItems = memberPlan.mysteryItems;
diff --git a/website/server/libs/payments/subscriptions.js b/website/server/libs/payments/subscriptions.js
index ce609e022d..41e2d1ff26 100644
--- a/website/server/libs/payments/subscriptions.js
+++ b/website/server/libs/payments/subscriptions.js
@@ -253,13 +253,18 @@ async function createSubscription (data) {
} = await prepareSubscriptionValues(data);
// Block sub perks
- if (months > 0 && (!data.gift || !isNewSubscription)) {
+ if (months > 1 && (!data.gift || !isNewSubscription)) {
if (!data.gift && !groupId) {
plan.consecutive.offset = block.months;
}
+ } else if (months === 1) {
+ plan.consecutive.offset = 0;
}
if (months > 1 || data.gift) {
await plan.incrementPerkCounterAndReward(recipient._id, months);
+ } else {
+ // Make sure the perkMonthCount field is initialized.
+ await plan.incrementPerkCounterAndReward(recipient._id, 0);
}
if (recipient !== group) {
diff --git a/website/server/libs/user/index.js b/website/server/libs/user/index.js
index 20f1616310..e3f9e8d604 100644
--- a/website/server/libs/user/index.js
+++ b/website/server/libs/user/index.js
@@ -130,6 +130,7 @@ export async function update (req, res, { isV3 = false }) {
uuid: user._id,
hitType: 'event',
category: 'behavior',
+ headers: req.headers,
});
}
@@ -187,6 +188,7 @@ export async function update (req, res, { isV3 = false }) {
uuid: user._id,
hitType: 'event',
category: 'behavior',
+ headers: req.headers,
});
} else if (key === 'tags') {
if (!Array.isArray(val)) throw new BadRequest('Tag list must be an array.');
@@ -274,6 +276,7 @@ export async function reset (req, res, { isV3 = false }) {
uuid: user._id,
hitType: 'event',
category: 'behavior',
+ headers: req.headers,
});
res.respond(200, ...resetRes);
diff --git a/website/server/models/subscriptionPlan.js b/website/server/models/subscriptionPlan.js
index 31849ceb94..8bc7daa587 100644
--- a/website/server/models/subscriptionPlan.js
+++ b/website/server/models/subscriptionPlan.js
@@ -56,13 +56,20 @@ schema.methods.incrementPerkCounterAndReward = async function incrementPerkCount
if (typeof adding === 'string' || adding instanceof String) {
addingNumber = parseInt(adding, 10);
}
+ const isSingleMonthPlan = this.planId === 'basic_earned' || this.planId === 'group_plan_auto' || this.planId === 'group_monthly';
// if perkMonthCount wasn't used before, initialize it.
if (this.perkMonthCount === undefined || this.perkMonthCount === -1) {
- if (this.planId === 'basic_earned') {
+ if (isSingleMonthPlan && this.consecutive.count > 0) {
this.perkMonthCount = (this.consecutive.count - 1) % SUBSCRIPTION_BASIC_BLOCK_LENGTH;
} else {
this.perkMonthCount = 0;
}
+ } else if (isSingleMonthPlan) {
+ const expectedPerkMonthCount = (this.consecutive.count - 1) % SUBSCRIPTION_BASIC_BLOCK_LENGTH;
+ if (this.perkMonthCount === (expectedPerkMonthCount - 1)) {
+ // User was affected by a bug that makes their perkMonthCount off by one
+ this.perkMonthCount += 1;
+ }
}
this.perkMonthCount += addingNumber;
diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js
index a0148bc7dc..8a98ee17ce 100644
--- a/website/server/models/user/schema.js
+++ b/website/server/models/user/schema.js
@@ -154,6 +154,7 @@ export default new Schema({
boneToPick: Boolean,
polarPro: Boolean,
plantParent: Boolean,
+ dinosaurDynasty: Boolean,
// Onboarding Guide
createdTask: Boolean,
completedTask: Boolean,