Merge branch 'develop' into sabrecat/teams-rebase

website/common/script/content/achievements.js

@@ -272,6 +272,11 @@ const basicAchievs = {
     titleKey: 'achievementZodiacZookeeper',
     textKey: 'achievementZodiacZookeeperText',
   },
+  birdsOfAFeather: {
+    icon: 'achievement-birdsOfAFeather',
+    titleKey: 'achievementBirdsOfAFeather',
+    textKey: 'achievementBirdsOfAFeatherText',
+  },
 };
 Object.assign(achievementsData, basicAchievs);
 

website/common/script/content/appearance/backgrounds.js

@@ -485,6 +485,11 @@ const backgrounds = {
     orange_grove: { },
     iridescent_clouds: { },
   },
+  backgrounds032022: {
+    animals_den: { },
+    brick_wall_with_ivy: { },
+    flowering_prairie: { },
+  },
   timeTravelBackgrounds: {
     airship: {
       price: 1,

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

@@ -11,6 +11,21 @@ const ANIMAL_SET_ACHIEVEMENTS = {
     achievementKey: 'legendaryBestiary',
     notificationType: 'ACHIEVEMENT_LEGENDARY_BESTIARY',
   },
+  birdsOfAFeather: {
+    type: 'pet',
+    species: [
+      'FlyingPig',
+      'Owl',
+      'Parrot',
+      'Pterodactyl',
+      'Gryphon',
+      'Falcon',
+      'Rooster',
+      'Peacock',
+    ],
+    achievementKey: 'birdsOfAFeather',
+    notificationType: 'ACHIEVEMENT_BIRDS_OF_A_FEATHER',
+  },
   domesticated: {
     type: 'pet',
     species: [

website/common/script/content/gear/sets/armoire.js

@@ -388,6 +388,10 @@ const armor = {
     str: 7,
     set: 'violetLoungewear',
   },
+  gardenersOveralls: {
+    con: 7,
+    set: 'gardenerSet',
+  },
 };
 
 const body = {
@@ -787,6 +791,10 @@ const head = {
     per: 10,
     set: 'shootingStar',
   },
+  gardenersSunHat: {
+    per: 7,
+    set: 'gardenerSet',
+  },
 };
 
 const shield = {
@@ -1056,6 +1064,10 @@ const shield = {
     int: 10,
     set: 'violetLoungewear',
   },
+  gardenersSpade: {
+    str: 8,
+    set: 'gardenerSet',
+  },
 };
 
 const headAccessory = {
@@ -1436,6 +1448,10 @@ const weapon = {
     str: 5,
     twoHanded: true,
   },
+  gardenersWateringCan: {
+    int: 8,
+    set: 'gardenerSet',
+  },
 };
 
 forEach({

website/common/script/libs/achievements.js

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