Merge branch 'sabrecat/kickstarter-2019' into release

This commit is contained in:
Sabe Jones
2019-09-30 13:07:18 -05:00
25 changed files with 173 additions and 1 deletions

View File

@@ -193,6 +193,11 @@ let specialAchievs = {
pluralTitleKey: 'helped',
pluralTextKey: 'surveysMultiple',
},
kickstarter2019: {
icon: 'achievement-kickstarter2019',
titleKey: 'achievementKickstarter2019',
textKey: 'achievementKickstarter2019Text',
},
};
Object.assign(achievementsData, specialAchievs);

View File

@@ -1257,6 +1257,13 @@ let armor = {
value: 90,
con: 15,
},
ks2019: {
text: t('armorSpecialKS2019Text'),
notes: t('armorSpecialKS2019Notes', { con: 20 }),
value: 0,
con: 20,
canOwn: ownsItem('armor_special_ks2019'),
},
};
let back = {
@@ -1602,6 +1609,12 @@ let eyewear = {
notes: t('eyewearSpecialFall2019HealerNotes'),
value: 20,
},
ks2019: {
text: t('eyewearSpecialKS2019Text'),
notes: t('eyewearSpecialKS2019Notes'),
value: 0,
canOwn: ownsItem('eyewear_special_ks2019'),
},
};
let head = {
@@ -2865,6 +2878,13 @@ let head = {
value: 60,
int: 7,
},
ks2019: {
text: t('headSpecialKS2019Text'),
notes: t('headSpecialKS2019Notes', { int: 20 }),
value: 0,
int: 20,
canOwn: ownsItem('head_special_ks2019'),
},
};
let headAccessory = {
@@ -4079,6 +4099,13 @@ let shield = {
value: 70,
con: 9,
},
ks2019: {
text: t('shieldSpecialKS2019Text'),
notes: t('shieldSpecialKS2019Notes', { per: 20 }),
value: 0,
per: 20,
canOwn: ownsItem('shield_special_ks2019'),
},
};
let weapon = {
@@ -5332,6 +5359,13 @@ let weapon = {
value: 90,
int: 9,
},
ks2019: {
text: t('weaponSpecialKS2019Text'),
notes: t('weaponSpecialKS2019Notes', { str: 20 }),
value: 0,
str: 20,
canOwn: ownsItem('weapon_special_ks2019'),
},
};
let specialSet = {

View File

@@ -103,6 +103,7 @@ let specialPets = {
'Hippogriff-Hopeful': 'hopefulHippogriffPet',
'Fox-Veteran': 'veteranFox',
'JackOLantern-Glow': 'glowJackolantern',
'Gryphon-Gryphatrice': 'gryphatrice',
};
let specialMounts = {
@@ -121,6 +122,7 @@ let specialMounts = {
'Aether-Invisible': 'invisibleAether',
'JackOLantern-Ghost': 'ghostJackolantern',
'Hippogriff-Hopeful': 'hopefulHippogriffMount',
'Gryphon-Gryphatrice': 'gryphatrice',
};
each(specialPets, (translationString, key) => {

View File

@@ -300,6 +300,10 @@ function _getSpecialAchievements (user, language) {
_addSimple(result, user, {path: 'originalUser', language});
}
if (user.achievements.kickstarter2019) {
_addSimple(result, user, {path: 'kickstarter2019', language});
}
return result;
}