Merge branch 'release' into develop

website/common/locales/en/backgrounds.json

@@ -545,5 +545,13 @@
   "backgroundFlyingInAThunderstormText": "Tumultuous Thunderstorm",
   "backgroundFlyingInAThunderstormNotes": "Chase a Tumultuous Thunderstorm as closely as you dare.",
   "backgroundPotionShopText": "Potion Shop",
-  "backgroundPotionShopNotes": "Find an elixir for any ailment at a Potion Shop."
+  "backgroundPotionShopNotes": "Find an elixir for any ailment at a Potion Shop.",
+
+  "backgrounds122019": "SET 67: Released December 2019",
+  "backgroundHolidayMarketText": "Holiday Market",
+  "backgroundHolidayMarketNotes": "Find the perfect gifts and decorations at a Holiday Market.",
+  "backgroundHolidayWreathText": "Holiday Wreath",
+  "backgroundHolidayWreathNotes": "Festoon your avatar with a fragrant Holiday Wreath.",
+  "backgroundWinterNocturneText": "Winter Nocturne",
+  "backgroundWinterNocturneNotes": "Bask in the starlight of a Winter Nocturne."
 }

website/common/locales/en/gear.json

@@ -992,6 +992,8 @@
   "armorArmoireShadowMastersRobeNotes": "The fabric of this flowy robe is woven from the darkest shadows in the deepest caves of Habitica. Increases Constitution by <%= con %>. Enchanted Armoire: Shadow Master Set (Item 1 of 4).",
   "armorArmoireAlchemistsRobeText": "Alchemist's Robe",
   "armorArmoireAlchemistsRobeNotes": "Any number of dangerous elixirs are involved in creating arcane metals and gems, and these heavy robes will protect you from harm and unintended side effects! Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Alchemist Set (Item 1 of 4).",
+  "armorArmoireDuffleCoatText": "Duffle Coat",
+  "armorArmoireDuffleCoatNotes": "Travel frosty realms in style with this cozy wool coat. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Duffle Coat Set (Item 1 of 2).",
 
   "headgear": "helm",
   "headgearCapitalized": "Headgear",
@@ -1538,6 +1540,8 @@
   "headArmoireShadowMastersHoodNotes": "This hood grants you the power to see through even the deepest darkness. It may occasionally require eyedrops, though. Increases Perception and Constitution by <%= attrs %> each. Enchanted Armoire: Shadow Master Set (Item 2 of 4).",
   "headArmoireAlchemistsHatText": "Alchemist's Hat",
   "headArmoireAlchemistsHatNotes": "While hats are not strictly necessary for alchemical practice, looking cool certainly doesn't hurt anything! Increases Perception by <%= per %>. Enchanted Armoire: Alchemist Set (Item 2 of 4).",
+  "headArmoireEarflapHatText": "Earflap Hat",
+  "headArmoireEarflapHatNotes": "If you're looking to keep your head toasty warm, this hat has you covered! Increases Intelligence and Strength by <%= attrs %> each. Enchanted Armoire: Duffle Coat Set (Item 2 of 2).",
 
   "offhand": "off-hand item",
   "offhandCapitalized": "Off-Hand Item",

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

@@ -927,6 +927,20 @@ const backgrounds = {
       notes: t('backgroundPotionShopNotes'),
     },
   },
+  backgrounds122019: {
+    holiday_market: {
+      text: t('backgroundHolidayMarketText'),
+      notes: t('backgroundHolidayMarketNotes'),
+    },
+    holiday_wreath: {
+      text: t('backgroundHolidayWreathText'),
+      notes: t('backgroundHolidayWreathNotes'),
+    },
+    winter_nocturne: {
+      text: t('backgroundWinterNocturneText'),
+      notes: t('backgroundWinterNocturneNotes'),
+    },
+  },
   incentiveBackgrounds: {
     violet: {
       text: t('backgroundVioletText'),

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

@@ -507,6 +507,15 @@ const armor = {
     set: 'alchemist',
     canOwn: ownsItem('armor_armoire_alchemistsRobe'),
   },
+  duffleCoat: {
+    text: t('armorArmoireDuffleCoatText'),
+    notes: t('armorArmoireDuffleCoatNotes', { attrs: 7 }),
+    value: 100,
+    con: 7,
+    per: 7,
+    set: 'duffle',
+    canOwn: ownsItem('armor_armoire_duffleCoat'),
+  },
 };
 
 const body = {
@@ -1037,6 +1046,15 @@ const head = {
     set: 'alchemist',
     canOwn: ownsItem('head_armoire_alchemistsHat'),
   },
+  earflapHat: {
+    text: t('headArmoireEarflapHatText'),
+    notes: t('headArmoireEarflapHatNotes', { attrs: 7 }),
+    value: 100,
+    int: 7,
+    str: 7,
+    set: 'duffle',
+    canOwn: ownsItem('head_armoire_earflapHat'),
+  },
 };
 
 const shield = {