Merge branch 'release' into develop

website/common/locales/en/backgrounds.json

@@ -571,6 +571,14 @@
   "backgroundTeaPartyText": "Tea Party",
   "backgroundTeaPartyNotes": "Partake in a fancy Tea Party.",
 
+  "backgrounds032020": "SET 70: Released March 2020",
+  "backgroundAmongGiantFlowersText": "Among Giant Flowers",
+  "backgroundAmongGiantFlowersNotes": "Dally on and Among Giant Flowers.",
+  "backgroundButterflyGardenText": "Butterfly Garden",
+  "backgroundButterflyGardenNotes": "Party with pollinators in a Butterfly Garden.",
+  "backgroundSucculentGardenText": "Succulent Garden",
+  "backgroundSucculentGardenNotes": "Take in the arid beauty of a Succulent Garden.",
+
   "timeTravelBackgrounds": "Steampunk Backgrounds",
   "backgroundAirshipText": "Airship",
   "backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.",

website/common/locales/en/gear.json

@@ -475,6 +475,8 @@
   "weaponArmoireHappyBannerNotes": "Is the “H” for Happy, or Habitica? Your choice! Increases Perception by <%= per %>. Enchanted Armoire: Happy Birthday Set (Item 3 of 4).",
   "weaponArmoireLivelyMatchText": "A Lively Match",
   "weaponArmoireLivelyMatchNotes": "When you're holding this, you're sure to spark someone's interest! Increases Strength by <%= str %>. Enchanted Armoire: Match Maker Set (Item 3 of 4).",
+  "weaponArmoireBaseballBatText": "Baseball Bat",
+  "weaponArmoireBaseballBatNotes": "Get a home run on those good habits! Increases Constitution by <%= con %>. Enchanted Armoire: Baseball Set (Item 3 of 4).",
 
   "armor": "armor",
   "armorCapitalized": "Armor",
@@ -1024,6 +1026,8 @@
   "armorArmoireLayerCakeArmorNotes": "It's protective and tasty! Increases Constitution by <%= con %>. Enchanted Armoire: Happy Birthday Set (Item 2 of 4).",
   "armorArmoireMatchMakersApronText": "Match Maker's Apron",
   "armorArmoireMatchMakersApronNotes": "This apron is for safety, but for humor's sake we can make light of it. Increases Constitution, Strength, and Intelligence by <%= attrs %> each. Enchanted Armoire: Match Maker Set (Item 1 of 4).",
+  "armorArmoireBaseballUniformText": "Baseball Uniform",
+  "armorArmoireBaseballUniformNotes": "Pinstripes never go out of style. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Baseball Set (Item 2 of 4).",
 
   "headgear": "helm",
   "headgearCapitalized": "Headgear",
@@ -1591,6 +1595,8 @@
   "headArmoireFrostedHelmNotes": "The perfect headgear for any celebration! Increases Intelligence by <%= int %>. Enchanted Armoire: Happy Birthday Set (Item 1 of 4).",
   "headArmoireMatchMakersBeretText": "Match Maker's Beret",
   "headArmoireMatchMakersBeretNotes": "You'll look striking wearing this lovely hat! Increases Constitution by <%= con %>. Enchanted Armoire: Match Maker Set (Item 2 of 4).",
+  "headArmoireBaseballCapText": "Baseball Cap",
+  "headArmoireBaseballCapNotes": "Let everyone know that you're on Team Habitica! Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Baseball Set (Item 1 of 4).",
 
   "offhand": "off-hand item",
   "offhandCapitalized": "Off-Hand Item",
@@ -1897,6 +1903,8 @@
   "shieldArmoireBirthdayBannerNotes": "Celebrate your special day, the special day of someone you love, or break this out for Habitica's Birthday on January 31! Increases Strength by <%= str %>. Enchanted Armoire: Happy Birthday Set (Item 4 of 4).",
   "shieldArmoirePerfectMatchText": "The Perfect Match",
   "shieldArmoirePerfectMatchNotes": "Hot take: we think you look great. Increases Perception by <%= per %>. Enchanted Armoire: Match Maker Set (Item 4 of 4).",
+  "shieldArmoireBaseballGloveText": "Baseball Glove",
+  "shieldArmoireBaseballGloveNotes": "Perfect for the big tournament, or a friendly game of catch between tasks. Increases Strength by <%= str %>. Enchanted Armoire: Baseball Set (Item 4 of 4).",
 
   "back": "Back Accessory",
   "backCapitalized": "Back Accessory",

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

@@ -969,6 +969,20 @@ const backgrounds = {
       notes: t('backgroundTeaPartyNotes'),
     },
   },
+  backgrounds032020: {
+    among_giant_flowers: {
+      text: t('backgroundAmongGiantFlowersText'),
+      notes: t('backgroundAmongGiantFlowersNotes'),
+    },
+    butterfly_garden: {
+      text: t('backgroundButterflyGardenText'),
+      notes: t('backgroundButterflyGardenNotes'),
+    },
+    succulent_garden: {
+      text: t('backgroundSucculentGardenText'),
+      notes: t('backgroundSucculentGardenNotes'),
+    },
+  },
   timeTravelBackgrounds: {
     airship: {
       text: t('backgroundAirshipText'),

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

@@ -534,6 +534,15 @@ const armor = {
     set: 'matchMaker',
     canOwn: ownsItem('armor_armoire_matchMakersApron'),
   },
+  baseballUniform: {
+    text: t('armorArmoireBaseballUniformText'),
+    notes: t('armorArmoireBaseballUniformNotes', { attrs: 10 }),
+    value: 100,
+    con: 10,
+    str: 10,
+    set: 'baseball',
+    canOwn: ownsItem('armor_armoire_baseballUniform'),
+  },
 };
 
 const body = {
@@ -1089,6 +1098,15 @@ const head = {
     set: 'matchMaker',
     canOwn: ownsItem('head_armoire_matchMakersBeret'),
   },
+  baseballCap: {
+    text: t('headArmoireBaseballCapText'),
+    notes: t('headArmoireBaseballCapNotes', { attrs: 8 }),
+    value: 100,
+    con: 8,
+    str: 8,
+    set: 'baseball',
+    canOwn: ownsItem('head_armoire_baseballCap'),
+  },
 };
 
 const shield = {
@@ -1392,6 +1410,14 @@ const shield = {
     set: 'matchMaker',
     canOwn: ownsItem('shield_armoire_perfectMatch'),
   },
+  baseballGlove: {
+    text: t('shieldArmoireBaseballGloveText'),
+    notes: t('shieldArmoireBaseballGloveNotes', { str: 9 }),
+    value: 100,
+    str: 9,
+    set: 'baseball',
+    canOwn: ownsItem('shield_armoire_baseballGlove'),
+  },
 };
 
 const headAccessory = {
@@ -1863,6 +1889,14 @@ const weapon = {
     set: 'matchMaker',
     canOwn: ownsItem('weapon_armoire_livelyMatch'),
   },
+  baseballBat: {
+    text: t('weaponArmoireBaseballBatText'),
+    notes: t('weaponArmoireBaseballBatNotes', { con: 9 }),
+    value: 100,
+    con: 9,
+    set: 'baseball',
+    canOwn: ownsItem('weapon_armoire_baseballBat'),
+  },
 };
 
 export {

website/common/script/content/index.js

@@ -164,12 +164,14 @@ api.timeTravelStable = {
     'MantisShrimp-Base': t('mantisShrimp'),
     'Phoenix-Base': t('phoenix'),
     'MagicalBee-Base': t('magicalBee'),
+    'Hippogriff-Hopeful': t('hopefulHippogriffPet'),
   },
   mounts: {
     'Mammoth-Base': t('mammoth'),
     'MantisShrimp-Base': t('mantisShrimp'),
     'Phoenix-Base': t('phoenix'),
     'MagicalBee-Base': t('magicalBee'),
+    'Hippogriff-Hopeful': t('hopefulHippogriffMount'),
   },
 };