Merge branch 'release' into develop

habitica-images

@@ -1 +1 @@
-Subproject commit 58b8905b0825159b6ba4eb5a37459b97bca79947
+Subproject commit 6e9d17b8a4af295ba2d9dc9870b2904035d6fba7

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.238.0",
+  "version": "4.239.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.238.0",
+  "version": "4.239.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.18.6",

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

@@ -463,6 +463,11 @@
   width: 48px;
   height: 52px;
 }
+.achievement-woodlandWizard2x {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-woodlandWizard2x.png');
+  width: 60px;
+  height: 64px;
+}
 .achievement-zodiac2x {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-zodiac2x.png');
   width: 60px;

website/common/locales/en/achievements.json

@@ -133,7 +133,10 @@
   "achievementReptacularRumble": "Reptacular Rumble",
   "achievementReptacularRumbleText": "Has hatched all the standard colors of reptile pets: Alligator, Pterodactyl, Snake, Triceratops, Turtle, Tyrannosaurus Rex, and Velociraptor!",
   "achievementReptacularRumbleModalText": "You collected all the reptile pets!",
-  "achievementGroupsBeta2022":"Interactive Beta Tester",
-  "achievementGroupsBeta2022Text":"You and your group provided invaluable feedback to help Habitica test.",
-  "achievementGroupsBeta2022ModalText":"You and your groups helped Habitica by testing and providing feedback!"
+  "achievementGroupsBeta2022": "Interactive Beta Tester",
+  "achievementGroupsBeta2022Text": "You and your group provided invaluable feedback to help Habitica test.",
+  "achievementGroupsBeta2022ModalText":"You and your groups helped Habitica by testing and providing feedback!",
+  "achievementWoodlandWizard": "Woodland Wizard",
+  "achievementWoodlandWizardText": "Has hatched all standard colors of forest creatures: Badger, Bear, Deer, Fox, Frog, Hedgehog, Owl, Snail, Squirrel, and Treeling!",
+  "achievementWoodlandWizardModalText": "You collected all the forest pets!"
 }

website/common/script/content/achievements.js

@@ -188,6 +188,11 @@ const animalSetAchievs = {
     titleKey: 'achievementReptacularRumble',
     textKey: 'achievementReptacularRumbleText',
   },
+  woodlandWizard: {
+    icon: 'achievement-woodlandWizard',
+    titleKey: 'achievementWoodlandWizard',
+    textKey: 'achievementWoodlandWizardText',
+  },
   zodiacZookeeper: {
     icon: 'achievement-zodiac',
     titleKey: 'achievementZodiacZookeeper',

website/common/script/content/bundles.js

@@ -144,8 +144,9 @@ const bundles = {
       'hedgehog',
       'treeling',
     ],
+    event: EVENTS.bundle202208,
     canBuy () {
-      return moment().isBetween('2018-09-11', '2018-10-02');
+      return moment().isBetween(EVENTS.bundle202208.start, EVENTS.bundle202208.end);
     },
     type: 'quests',
     value: 7,

website/common/script/content/constants/animalSetAchievements.js

@@ -55,6 +55,23 @@ const ANIMAL_SET_ACHIEVEMENTS = {
     achievementKey: 'reptacularRumble',
     notificationType: 'ACHIEVEMENT_ANIMAL_SET',
   },
+  woodlandWizard: {
+    type: 'pet',
+    species: [
+      'Badger',
+      'BearCub',
+      'Deer',
+      'Fox',
+      'Frog',
+      'Hedgehog',
+      'Owl',
+      'Snail',
+      'Squirrel',
+      'Treeling',
+    ],
+    achievementKey: 'woodlandWizard',
+    notificationType: 'ACHIEVEMENT_ANIMAL_SET',
+  },
   zodiacZookeeper: {
     type: 'pet',
     species: [

website/common/script/content/constants/events.js

@@ -10,11 +10,17 @@ const gemsPromo = {
 
 export const EVENTS = {
   noCurrentEventAfter: {
-    start: '2022-07-31T20:00-04:00',
+    start: '2022-09-30T20:00-04:00',
     end: '2022-12-21T08:00-04:00',
     season: 'normal',
     npcImageSuffix: '',
   },
+  bundle202208: {
+    start: '2022-08-09T08:00-04:00',
+    end: '2022-09-30T20:00-04:00',
+    season: 'normal',
+    npcImageSuffix: '',
+  },
   summer2022: {
     start: '2022-06-21T08:00-04:00',
     end: '2022-07-31T20:00-04:00',

website/common/script/content/shop-featuredItems.js

@@ -40,24 +40,24 @@ const featuredItems = {
       },
       {
         type: 'eggs',
-        path: 'eggs.Cactus',
+        path: 'eggs.BearCub',
       },
     ];
   },
   quests () {
-    if (moment().isBefore(EVENTS.bundle202206.end)) {
+    if (moment().isBetween(EVENTS.bundle202208.start, EVENTS.bundle202208.end)) {
       return [
         {
           type: 'bundles',
-          path: 'bundles.aquaticAmigos',
+          path: 'bundles.forestFriends',
         },
         {
           type: 'quests',
-          path: 'quests.seaserpent',
+          path: 'quests.owl',
         },
         {
           type: 'quests',
-          path: 'quests.dolphin',
+          path: 'quests.snail',
         },
       ];
     }

website/common/script/libs/achievements.js

@@ -218,6 +218,7 @@ function _getBasicAchievements (user, language) {
   _addSimple(result, user, { path: 'zodiacZookeeper', language });
   _addSimple(result, user, { path: 'birdsOfAFeather', language });
   _addSimple(result, user, { path: 'reptacularRumble', language });
+  _addSimple(result, user, { path: 'woodlandWizard', language });
 
   _addSimpleWithMasterCount(result, user, { path: 'beastMaster', language });
   _addSimpleWithMasterCount(result, user, { path: 'mountMaster', language });

website/server/models/user/schema.js

@@ -150,6 +150,7 @@ export default new Schema({
     zodiacZookeeper: Boolean,
     birdsOfAFeather: Boolean,
     reptacularRumble: Boolean,
+    woodlandWizard: Boolean,
     // Onboarding Guide
     createdTask: Boolean,
     completedTask: Boolean,