Merge branch 'release' into develop

This commit is contained in:
Sabe Jones
2019-08-06 16:59:08 -05:00
80 changed files with 21659 additions and 21503 deletions
@@ -871,6 +871,20 @@ let backgrounds = {
notes: t('backgroundAmongGiantAnemonesNotes'),
},
},
backgrounds082019: {
amid_ancient_ruins: {
text: t('backgroundAmidAncientRuinsText'),
notes: t('backgroundAmidAncientRuinsNotes'),
},
giant_dandelions: {
text: t('backgroundGiantDandelionsText'),
notes: t('backgroundGiantDandelionsNotes'),
},
treehouse: {
text: t('backgroundTreehouseText'),
notes: t('backgroundTreehouseNotes'),
},
},
incentiveBackgrounds: {
violet: {
text: t('backgroundVioletText'),
@@ -481,6 +481,15 @@ let armor = {
set: 'astronomer',
canOwn: ownsItem('armor_armoire_astronomersRobe'),
},
invernessCape: {
text: t('armorArmoireInvernessCapeText'),
notes: t('armorArmoireInvernessCapeNotes', { attrs: 7 }),
value: 100,
per: 7,
int: 7,
set: 'detective',
canOwn: ownsItem('armor_armoire_invernessCape'),
},
};
let body = {
@@ -986,6 +995,14 @@ let head = {
set: 'astronomer',
canOwn: ownsItem('head_armoire_astronomersHat'),
},
deerstalkerCap: {
text: t('headArmoireDeerstalkerCapText'),
notes: t('headArmoireDeerstalkerCapNotes', { int: 14 }),
value: 100,
int: 14,
set: 'detective',
canOwn: ownsItem('head_armoire_deerstalkerCap'),
},
};
let shield = {
@@ -1241,6 +1258,14 @@ let shield = {
set: 'chef',
canOwn: ownsItem('shield_armoire_mightyPizza'),
},
trustyUmbrella: {
text: t('shieldArmoireTrustyUmbrellaText'),
notes: t('shieldArmoireTrustyUmbrellaNotes', { int: 7 }),
value: 100,
int: 7,
set: 'detective',
canOwn: ownsItem('shield_armoire_trustyUmbrella'),
},
};
let headAccessory = {
@@ -1657,6 +1682,14 @@ let weapon = {
set: 'astronomer',
canOwn: ownsItem('weapon_armoire_astronomersTelescope'),
},
magnifyingGlass: {
text: t('weaponArmoireMagnifyingGlassText'),
notes: t('weaponArmoireMagnifyingGlassNotes', { per: 7 }),
value: 100,
per: 7,
set: 'detective',
canOwn: ownsItem('weapon_armoire_magnifyingGlass'),
},
};
let armoireSet = {