Merge branch 'develop' into client-monorepo

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

@@ -899,6 +899,20 @@ let backgrounds = {
       notes: t('backgroundInAClassroomNotes'),
     },
   },
+  backgrounds102019: {
+    foggy_moor: {
+      text: t('backgroundFoggyMoorText'),
+      notes: t('backgroundFoggyMoorNotes'),
+    },
+    monster_makers_workshop: {
+      text: t('backgroundMonsterMakersWorkshopText'),
+      notes: t('backgroundMonsterMakersWorkshopNotes'),
+    },
+    pumpkin_carriage: {
+      text: t('backgroundPumpkinCarriageText'),
+      notes: t('backgroundPumpkinCarriageNotes'),
+    },
+  },
   incentiveBackgrounds: {
     violet: {
       text: t('backgroundVioletText'),

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

@@ -490,6 +490,14 @@ let armor = {
     set: 'detective',
     canOwn: ownsItem('armor_armoire_invernessCape'),
   },
+  shadowMastersRobe: {
+    text: t('armorArmoireShadowMastersRobeText'),
+    notes: t('armorArmoireShadowMastersRobeNotes', { con: 12 }),
+    value: 100,
+    con: 12,
+    set: 'shadowMaster',
+    canOwn: ownsItem('armor_armoire_shadowMastersRobe'),
+  },
 };
 
 let body = {
@@ -1003,6 +1011,15 @@ let head = {
     set: 'detective',
     canOwn: ownsItem('head_armoire_deerstalkerCap'),
   },
+  shadowMastersHood: {
+    text: t('headArmoireShadowMastersHoodText'),
+    notes: t('headArmoireShadowMastersHoodNotes', { attrs: 5 }),
+    value: 100,
+    per: 5,
+    con: 5,
+    set: 'shadowMaster',
+    canOwn: ownsItem('head_armoire_shadowMastersHood'),
+  },
 };
 
 let shield = {
@@ -1273,6 +1290,15 @@ let shield = {
     int: 9,
     canOwn: ownsItem('shield_armoire_polishedPocketwatch'),
   },
+  masteredShadow: {
+    text: t('shieldArmoireMasteredShadowText'),
+    notes: t('shieldArmoireMasteredShadowNotes', { attrs: 5 }),
+    value: 100,
+    per: 5,
+    con: 5,
+    set: 'shadowMaster',
+    canOwn: ownsItem('shield_armoire_masteredShadow'),
+  },
 };
 
 let headAccessory = {
@@ -1711,6 +1737,14 @@ let weapon = {
     per: 9,
     canOwn: ownsItem('weapon_armoire_resplendentRapier'),
   },
+  shadowMastersMace: {
+    text: t('weaponArmoireShadowMastersMaceText'),
+    notes: t('weaponArmoireShadowMastersMaceNotes', { per: 12 }),
+    value: 100,
+    per: 12,
+    set: 'shadowMaster',
+    canOwn: ownsItem('weapon_armoire_shadowMastersMace'),
+  },
 };
 
 export {

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

@@ -22,12 +22,12 @@ const featuredItems = {
   ],
   quests: [
     {
-      type: 'bundles',
-      path: 'bundles.rockingReptiles',
+      type: 'quests',
+      path: 'quests.bronze',
     },
     {
       type: 'quests',
-      path: 'quests.dilatoryDistress1',
+      path: 'quests.taskwoodsTerror1',
     },
     {
       type: 'quests',