Merge branch 'develop' into api-v3

common/script/content/appearance/backgrounds.js

@@ -311,6 +311,20 @@ let backgrounds = {
       notes: t('backgroundStoneCircleNotes'),
     },
   },
+  backgrounds042016: {
+    archery_range: {
+      text: t('backgroundArcheryRangeText'),
+      notes: t('backgroundArcheryRangeNotes'),
+    },
+    giant_florals: {
+      text: t('backgroundGiantFlowersText'),
+      notes: t('backgroundGiantFlowersNotes'),
+    },
+    rainbows_end: {
+      text: t('backgroundRainbowsEndText'),
+      notes: t('backgroundRainbowsEndNotes'),
+    },
+  },
 };
 /* eslint-enable quote-props */
 

common/script/content/gear/head-accessory.js

@@ -2,11 +2,13 @@ import {headAccessory as baseHeadAccessory} from './sets/base';
 
 import {headAccessory as specialHeadAccessory} from './sets/special';
 import {headAccessory as mysteryHeadAccessory} from './sets/mystery';
+import {headAccessory as armoireHeadAccessory} from './sets/armoire';
 
 let headAccessory = {
   base: baseHeadAccessory,
   special: specialHeadAccessory,
   mystery: mysteryHeadAccessory,
+  armoire: armoireHeadAccessory,
 };
 
 module.exports = headAccessory;

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

@@ -118,6 +118,14 @@ let armor = {
     set: 'miner',
     canOwn: ownsItem('armor_armoire_minerOveralls'),
   },
+  basicArcherArmor: {
+    text: t('armorArmoireBasicArcherArmorText'),
+    notes: t('armorArmoireBasicArcherArmorNotes', { per: 12 }),
+    value: 100,
+    per: 12,
+    set: 'basicArcher',
+    canOwn: ownsItem('armor_armoire_basicArcherArmor'),
+  },
 };
 
 let eyewear = {
@@ -314,6 +322,14 @@ let head = {
     set: 'miner',
     canOwn: ownsItem('head_armoire_minerHelmet'),
   },
+  basicArcherCap: {
+    text: t('headArmoireBasicArcherCapText'),
+    notes: t('headArmoireBasicArcherCapNotes', { per: 6 }),
+    value: 100,
+    per: 6,
+    set: 'basicArcher',
+    canOwn: ownsItem('head_armoire_basicArcherCap'),
+  },
 };
 
 let shield = {
@@ -361,6 +377,15 @@ let shield = {
   },
 };
 
+let headAccessory = {
+  comicalArrow: {
+    text: t('headAccessoryArmoireComicalArrowText'),
+    notes: t('headAccessoryArmoireComicalArrowNotes'),
+    value: 100,
+    canOwn: ownsItem('headAccessory_armoire_comicalArrow'),
+  },
+};
+
 let weapon = {
   basicCrossbow: {
     text: t('weaponArmoireBasicCrossbowText'),
@@ -476,6 +501,7 @@ let weapon = {
     value: 100,
     int: 8,
     per: 8,
+    set: 'jester',
     canOwn: ownsItem('weapon_armoire_jesterBaton'),
   },
   miningPickax: {
@@ -483,14 +509,25 @@ let weapon = {
     notes: t('weaponArmoireMiningPickaxNotes', { per: 15 }),
     value: 100,
     per: 15,
+    set: 'miner',
     canOwn: ownsItem('weapon_armoire_miningPickax'),
   },
+  basicLongbow: {
+    text: t('weaponArmoireBasicLongbowText'),
+    notes: t('weaponArmoireBasicLongbowNotes', { str: 6 }),
+    value: 100,
+    str: 6,
+    twoHanded: true,
+    set: 'basicArcher',
+    canOwn: ownsItem('weapon_armoire_basicLongbow'),
+  },
 };
 
 let armoireSet = {
   armor,
   eyewear,
   head,
+  headAccessory,
   shield,
   weapon,
 };