Merge branch 'develop' into api-v3

This commit is contained in:
Matteo Pagliazzi
2016-03-21 23:03:28 +01:00
341 changed files with 6763 additions and 5398 deletions

View File

@@ -23,6 +23,7 @@ export const EVENTS = {
fall2015: { start: '2015-09-21', end: '2015-11-01' },
gaymerx: { start: '2015-12-01', end: '2015-12-14' },
winter2016: { start: '2015-12-18', end: '2016-02-02' },
spring2016: { start: '2016-03-18', end: '2016-05-02' },
};
export const GEAR_TYPES = [

View File

@@ -39,10 +39,12 @@ each(GEAR_TYPES, (type) => {
each(allGearTypes, (klass) => {
each(gear[type][klass], (item, index) => {
let key = `${type}_${klass}_${index}`;
let set = `${klass}-${index}`;
defaults(item, {
type,
key,
set,
klass,
index,
str: 0,

View File

@@ -62,6 +62,9 @@ let armor = {
notes: t('armorSpecialSpringRogueNotes', { per: 15 }),
value: 90,
per: 15,
canBuy: () => {
return true;
},
},
springWarrior: {
event: EVENTS.spring,
@@ -70,6 +73,9 @@ let armor = {
notes: t('armorSpecialSpringWarriorNotes', { con: 9 }),
value: 90,
con: 9,
canBuy: () => {
return true;
},
},
springMage: {
event: EVENTS.spring,
@@ -78,6 +84,9 @@ let armor = {
notes: t('armorSpecialSpringMageNotes', { int: 9 }),
value: 90,
int: 9,
canBuy: () => {
return true;
},
},
springHealer: {
event: EVENTS.spring,
@@ -86,6 +95,9 @@ let armor = {
notes: t('armorSpecialSpringHealerNotes', { con: 15 }),
value: 90,
con: 15,
canBuy: () => {
return true;
},
},
summerRogue: {
event: EVENTS.summer,
@@ -196,6 +208,9 @@ let armor = {
notes: t('armorSpecialSpring2015RogueNotes', { per: 15 }),
value: 90,
per: 15,
canBuy: () => {
return true;
},
},
spring2015Warrior: {
event: EVENTS.spring2015,
@@ -204,6 +219,9 @@ let armor = {
notes: t('armorSpecialSpring2015WarriorNotes', { con: 9 }),
value: 90,
con: 9,
canBuy: () => {
return true;
},
},
spring2015Mage: {
event: EVENTS.spring2015,
@@ -212,6 +230,9 @@ let armor = {
notes: t('armorSpecialSpring2015MageNotes', { int: 9 }),
value: 90,
int: 9,
canBuy: () => {
return true;
},
},
spring2015Healer: {
event: EVENTS.spring2015,
@@ -220,6 +241,9 @@ let armor = {
notes: t('armorSpecialSpring2015HealerNotes', { con: 15 }),
value: 90,
con: 15,
canBuy: () => {
return true;
},
},
summer2015Rogue: {
event: EVENTS.summer2015,
@@ -329,6 +353,38 @@ let armor = {
value: 0,
canOwn: ownsItem('armor_special_birthday2016'),
},
spring2016Rogue: {
event: EVENTS.spring2016,
specialClass: 'rogue',
text: t('armorSpecialSpring2016RogueText'),
notes: t('armorSpecialSpring2016RogueNotes', { per: 15 }),
value: 90,
per: 15,
},
spring2016Warrior: {
event: EVENTS.spring2016,
specialClass: 'warrior',
text: t('armorSpecialSpring2016WarriorText'),
notes: t('armorSpecialSpring2016WarriorNotes', { con: 9 }),
value: 90,
con: 9,
},
spring2016Mage: {
event: EVENTS.spring2016,
specialClass: 'wizard',
text: t('armorSpecialSpring2016MageText'),
notes: t('armorSpecialSpring2016MageNotes', { int: 9 }),
value: 90,
int: 9,
},
spring2016Healer: {
event: EVENTS.spring2016,
specialClass: 'healer',
text: t('armorSpecialSpring2016HealerText'),
notes: t('armorSpecialSpring2016HealerNotes', { con: 15 }),
value: 90,
con: 15,
},
};
let back = {
@@ -427,9 +483,6 @@ let head = {
notes: t('headSpecialYetiNotes', { str: 9 }),
str: 9,
value: 60,
canBuy: () => {
return true;
},
},
ski: {
event: EVENTS.winter,
@@ -438,9 +491,6 @@ let head = {
notes: t('headSpecialSkiNotes', { per: 9 }),
per: 9,
value: 60,
canBuy: () => {
return true;
},
},
candycane: {
event: EVENTS.winter,
@@ -449,9 +499,6 @@ let head = {
notes: t('headSpecialCandycaneNotes', { per: 7 }),
per: 7,
value: 60,
canBuy: () => {
return true;
},
},
snowflake: {
event: EVENTS.winter,
@@ -460,9 +507,6 @@ let head = {
notes: t('headSpecialSnowflakeNotes', { int: 7 }),
int: 7,
value: 60,
canBuy: () => {
return true;
},
},
springRogue: {
event: EVENTS.spring,
@@ -471,6 +515,9 @@ let head = {
notes: t('headSpecialSpringRogueNotes', { per: 9 }),
value: 60,
per: 9,
canBuy: () => {
return true;
},
},
springWarrior: {
event: EVENTS.spring,
@@ -479,6 +526,9 @@ let head = {
notes: t('headSpecialSpringWarriorNotes', { str: 9 }),
value: 60,
str: 9,
canBuy: () => {
return true;
},
},
springMage: {
event: EVENTS.spring,
@@ -487,6 +537,9 @@ let head = {
notes: t('headSpecialSpringMageNotes', { per: 7 }),
value: 60,
per: 7,
canBuy: () => {
return true;
},
},
springHealer: {
event: EVENTS.spring,
@@ -495,6 +548,9 @@ let head = {
notes: t('headSpecialSpringHealerNotes', { int: 7 }),
value: 60,
int: 7,
canBuy: () => {
return true;
},
},
summerRogue: {
event: EVENTS.summer,
@@ -535,9 +591,6 @@ let head = {
notes: t('headSpecialFallRogueNotes', { per: 9 }),
value: 60,
per: 9,
canBuy: () => {
return true;
},
},
fallWarrior: {
event: EVENTS.fall,
@@ -546,9 +599,6 @@ let head = {
notes: t('headSpecialFallWarriorNotes', { str: 9 }),
value: 60,
str: 9,
canBuy: () => {
return true;
},
},
fallMage: {
event: EVENTS.fall,
@@ -557,9 +607,6 @@ let head = {
notes: t('headSpecialFallMageNotes', { per: 7 }),
value: 60,
per: 7,
canBuy: () => {
return true;
},
},
fallHealer: {
event: EVENTS.fall,
@@ -568,9 +615,6 @@ let head = {
notes: t('headSpecialFallHealerNotes', { int: 7 }),
value: 60,
int: 7,
canBuy: () => {
return true;
},
},
winter2015Rogue: {
event: EVENTS.winter2015,
@@ -579,9 +623,6 @@ let head = {
notes: t('headSpecialWinter2015RogueNotes', { per: 9 }),
value: 60,
per: 9,
canBuy: () => {
return true;
},
},
winter2015Warrior: {
event: EVENTS.winter2015,
@@ -590,9 +631,6 @@ let head = {
notes: t('headSpecialWinter2015WarriorNotes', { str: 9 }),
value: 60,
str: 9,
canBuy: () => {
return true;
},
},
winter2015Mage: {
event: EVENTS.winter2015,
@@ -601,9 +639,6 @@ let head = {
notes: t('headSpecialWinter2015MageNotes', { per: 7 }),
value: 60,
per: 7,
canBuy: () => {
return true;
},
},
winter2015Healer: {
event: EVENTS.winter2015,
@@ -612,9 +647,6 @@ let head = {
notes: t('headSpecialWinter2015HealerNotes', { int: 7 }),
value: 60,
int: 7,
canBuy: () => {
return true;
},
},
nye2014: {
text: t('headSpecialNye2014Text'),
@@ -629,6 +661,9 @@ let head = {
notes: t('headSpecialSpring2015RogueNotes', { per: 9 }),
value: 60,
per: 9,
canBuy: () => {
return true;
},
},
spring2015Warrior: {
event: EVENTS.spring2015,
@@ -637,6 +672,9 @@ let head = {
notes: t('headSpecialSpring2015WarriorNotes', { str: 9 }),
value: 60,
str: 9,
canBuy: () => {
return true;
},
},
spring2015Mage: {
event: EVENTS.spring2015,
@@ -645,6 +683,9 @@ let head = {
notes: t('headSpecialSpring2015MageNotes', { per: 7 }),
value: 60,
per: 7,
canBuy: () => {
return true;
},
},
spring2015Healer: {
event: EVENTS.spring2015,
@@ -653,6 +694,9 @@ let head = {
notes: t('headSpecialSpring2015HealerNotes', { int: 7 }),
value: 60,
int: 7,
canBuy: () => {
return true;
},
},
summer2015Rogue: {
event: EVENTS.summer2015,
@@ -762,6 +806,38 @@ let head = {
value: 0,
canOwn: ownsItem('head_special_nye2015'),
},
spring2016Rogue: {
event: EVENTS.spring2016,
specialClass: 'rogue',
text: t('headSpecialSpring2016RogueText'),
notes: t('headSpecialSpring2016RogueNotes', { per: 9 }),
value: 60,
per: 9,
},
spring2016Warrior: {
event: EVENTS.spring2016,
specialClass: 'warrior',
text: t('headSpecialSpring2016WarriorText'),
notes: t('headSpecialSpring2016WarriorNotes', { str: 9 }),
value: 60,
str: 9,
},
spring2016Mage: {
event: EVENTS.spring2016,
specialClass: 'wizard',
text: t('headSpecialSpring2016MageText'),
notes: t('headSpecialSpring2016MageNotes', { per: 7 }),
value: 60,
per: 7,
},
spring2016Healer: {
event: EVENTS.spring2016,
specialClass: 'healer',
text: t('headSpecialSpring2016HealerText'),
notes: t('headSpecialSpring2016HealerNotes', { int: 7 }),
value: 60,
int: 7,
},
};
let headAccessory = {
@@ -771,6 +847,9 @@ let headAccessory = {
text: t('headAccessorySpecialSpringRogueText'),
notes: t('headAccessorySpecialSpringRogueNotes'),
value: 20,
canBuy: () => {
return true;
},
},
springWarrior: {
event: EVENTS.spring,
@@ -778,6 +857,9 @@ let headAccessory = {
text: t('headAccessorySpecialSpringWarriorText'),
notes: t('headAccessorySpecialSpringWarriorNotes'),
value: 20,
canBuy: () => {
return true;
},
},
springMage: {
event: EVENTS.spring,
@@ -785,6 +867,9 @@ let headAccessory = {
text: t('headAccessorySpecialSpringMageText'),
notes: t('headAccessorySpecialSpringMageNotes'),
value: 20,
canBuy: () => {
return true;
},
},
springHealer: {
event: EVENTS.spring,
@@ -792,6 +877,9 @@ let headAccessory = {
text: t('headAccessorySpecialSpringHealerText'),
notes: t('headAccessorySpecialSpringHealerNotes'),
value: 20,
canBuy: () => {
return true;
},
},
spring2015Rogue: {
event: EVENTS.spring2015,
@@ -799,6 +887,9 @@ let headAccessory = {
text: t('headAccessorySpecialSpring2015RogueText'),
notes: t('headAccessorySpecialSpring2015RogueNotes'),
value: 20,
canBuy: () => {
return true;
},
},
spring2015Warrior: {
event: EVENTS.spring2015,
@@ -806,6 +897,9 @@ let headAccessory = {
text: t('headAccessorySpecialSpring2015WarriorText'),
notes: t('headAccessorySpecialSpring2015WarriorNotes'),
value: 20,
canBuy: () => {
return true;
},
},
spring2015Mage: {
event: EVENTS.spring2015,
@@ -813,6 +907,9 @@ let headAccessory = {
text: t('headAccessorySpecialSpring2015MageText'),
notes: t('headAccessorySpecialSpring2015MageNotes'),
value: 20,
canBuy: () => {
return true;
},
},
spring2015Healer: {
event: EVENTS.spring2015,
@@ -820,6 +917,9 @@ let headAccessory = {
text: t('headAccessorySpecialSpring2015HealerText'),
notes: t('headAccessorySpecialSpring2015HealerNotes'),
value: 20,
canBuy: () => {
return true;
},
},
bearEars: {
gearSet: 'animal',
@@ -901,6 +1001,34 @@ let headAccessory = {
return true;
},
},
spring2016Rogue: {
event: EVENTS.spring2016,
specialClass: 'rogue',
text: t('headAccessorySpecialSpring2016RogueText'),
notes: t('headAccessorySpecialSpring2016RogueNotes'),
value: 20,
},
spring2016Warrior: {
event: EVENTS.spring2016,
specialClass: 'warrior',
text: t('headAccessorySpecialSpring2016WarriorText'),
notes: t('headAccessorySpecialSpring2016WarriorNotes'),
value: 20,
},
spring2016Mage: {
event: EVENTS.spring2016,
specialClass: 'wizard',
text: t('headAccessorySpecialSpring2016MageText'),
notes: t('headAccessorySpecialSpring2016MageNotes'),
value: 20,
},
spring2016Healer: {
event: EVENTS.spring2016,
specialClass: 'healer',
text: t('headAccessorySpecialSpring2016HealerText'),
notes: t('headAccessorySpecialSpring2016HealerNotes'),
value: 20,
},
};
let shield = {
@@ -928,9 +1056,6 @@ let shield = {
notes: t('shieldSpecialYetiNotes', { con: 7 }),
con: 7,
value: 70,
canBuy: () => {
return true;
},
},
ski: {
event: EVENTS.winter,
@@ -939,9 +1064,6 @@ let shield = {
notes: t('weaponSpecialSkiNotes', { str: 8 }),
str: 8,
value: 90,
canBuy: () => {
return true;
},
},
snowflake: {
event: EVENTS.winter,
@@ -950,9 +1072,6 @@ let shield = {
notes: t('shieldSpecialSnowflakeNotes', { con: 9 }),
con: 9,
value: 70,
canBuy: () => {
return true;
},
},
springRogue: {
event: EVENTS.spring,
@@ -961,6 +1080,9 @@ let shield = {
notes: t('shieldSpecialSpringRogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => {
return true;
},
},
springWarrior: {
event: EVENTS.spring,
@@ -969,6 +1091,9 @@ let shield = {
notes: t('shieldSpecialSpringWarriorNotes', { con: 7 }),
value: 70,
con: 7,
canBuy: () => {
return true;
},
},
springHealer: {
event: EVENTS.spring,
@@ -977,6 +1102,9 @@ let shield = {
notes: t('shieldSpecialSpringHealerNotes', { con: 9 }),
value: 70,
con: 9,
canBuy: () => {
return true;
},
},
summerRogue: {
event: EVENTS.summer,
@@ -1042,9 +1170,6 @@ let shield = {
notes: t('shieldSpecialWinter2015RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => {
return true;
},
},
winter2015Warrior: {
event: EVENTS.winter2015,
@@ -1053,9 +1178,6 @@ let shield = {
notes: t('shieldSpecialWinter2015WarriorNotes', { con: 7 }),
value: 70,
con: 7,
canBuy: () => {
return true;
},
},
winter2015Healer: {
event: EVENTS.winter2015,
@@ -1064,9 +1186,6 @@ let shield = {
notes: t('shieldSpecialWinter2015HealerNotes', { con: 9 }),
value: 70,
con: 9,
canBuy: () => {
return true;
},
},
spring2015Rogue: {
event: EVENTS.spring2015,
@@ -1075,6 +1194,9 @@ let shield = {
notes: t('shieldSpecialSpring2015RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => {
return true;
},
},
spring2015Warrior: {
event: EVENTS.spring2015,
@@ -1083,6 +1205,9 @@ let shield = {
notes: t('shieldSpecialSpring2015WarriorNotes', { con: 7 }),
value: 70,
con: 7,
canBuy: () => {
return true;
},
},
spring2015Healer: {
event: EVENTS.spring2015,
@@ -1091,6 +1216,9 @@ let shield = {
notes: t('shieldSpecialSpring2015HealerNotes', { con: 9 }),
value: 70,
con: 9,
canBuy: () => {
return true;
},
},
summer2015Rogue: {
event: EVENTS.summer2015,
@@ -1099,6 +1227,9 @@ let shield = {
notes: t('shieldSpecialSummer2015RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => {
return true;
},
},
summer2015Warrior: {
event: EVENTS.summer2015,
@@ -1164,6 +1295,30 @@ let shield = {
value: 70,
con: 9,
},
spring2016Rogue: {
event: EVENTS.spring2016,
specialClass: 'rogue',
text: t('shieldSpecialSpring2016RogueText'),
notes: t('shieldSpecialSpring2016RogueNotes', { str: 8 }),
value: 80,
str: 8,
},
spring2016Warrior: {
event: EVENTS.spring2016,
specialClass: 'warrior',
text: t('shieldSpecialSpring2016WarriorText'),
notes: t('shieldSpecialSpring2016WarriorNotes', { con: 7 }),
value: 70,
con: 7,
},
spring2016Healer: {
event: EVENTS.spring2016,
specialClass: 'healer',
text: t('shieldSpecialSpring2016HealerText'),
notes: t('shieldSpecialSpring2016HealerNotes', { con: 9 }),
value: 70,
con: 9,
},
};
let weapon = {
@@ -1186,9 +1341,6 @@ let weapon = {
notes: t('weaponSpecialYetiNotes', { str: 15 }),
str: 15,
value: 90,
canBuy: () => {
return true;
},
},
ski: {
event: EVENTS.winter,
@@ -1197,9 +1349,6 @@ let weapon = {
notes: t('weaponSpecialSkiNotes', { str: 8 }),
str: 8,
value: 90,
canBuy: () => {
return true;
},
},
candycane: {
event: EVENTS.winter,
@@ -1210,9 +1359,6 @@ let weapon = {
int: 15,
per: 7,
value: 160,
canBuy: () => {
return true;
},
},
snowflake: {
event: EVENTS.winter,
@@ -1221,9 +1367,6 @@ let weapon = {
notes: t('weaponSpecialSnowflakeNotes', { int: 9 }),
int: 9,
value: 90,
canBuy: () => {
return true;
},
},
springRogue: {
event: EVENTS.spring,
@@ -1232,6 +1375,9 @@ let weapon = {
notes: t('weaponSpecialSpringRogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => {
return true;
},
},
springWarrior: {
event: EVENTS.spring,
@@ -1240,6 +1386,9 @@ let weapon = {
notes: t('weaponSpecialSpringWarriorNotes', { str: 15 }),
value: 90,
str: 15,
canBuy: () => {
return true;
},
},
springMage: {
event: EVENTS.spring,
@@ -1250,6 +1399,9 @@ let weapon = {
value: 160,
int: 15,
per: 7,
canBuy: () => {
return true;
},
},
springHealer: {
event: EVENTS.spring,
@@ -1258,6 +1410,9 @@ let weapon = {
notes: t('weaponSpecialSpringHealerNotes', { int: 9 }),
value: 90,
int: 9,
canBuy: () => {
return true;
},
},
summerRogue: {
event: EVENTS.summer,
@@ -1300,9 +1455,6 @@ let weapon = {
notes: t('weaponSpecialFallRogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => {
return true;
},
},
fallWarrior: {
event: EVENTS.fall,
@@ -1311,9 +1463,6 @@ let weapon = {
notes: t('weaponSpecialFallWarriorNotes', { str: 15 }),
value: 90,
str: 15,
canBuy: () => {
return true;
},
},
fallMage: {
event: EVENTS.fall,
@@ -1324,9 +1473,6 @@ let weapon = {
value: 160,
int: 15,
per: 7,
canBuy: () => {
return true;
},
},
fallHealer: {
event: EVENTS.fall,
@@ -1335,9 +1481,6 @@ let weapon = {
notes: t('weaponSpecialFallHealerNotes', { int: 9 }),
value: 90,
int: 9,
canBuy: () => {
return true;
},
},
winter2015Rogue: {
event: EVENTS.winter2015,
@@ -1346,9 +1489,6 @@ let weapon = {
notes: t('weaponSpecialWinter2015RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => {
return true;
},
},
winter2015Warrior: {
event: EVENTS.winter2015,
@@ -1357,9 +1497,6 @@ let weapon = {
notes: t('weaponSpecialWinter2015WarriorNotes', { str: 15 }),
value: 90,
str: 15,
canBuy: () => {
return true;
},
},
winter2015Mage: {
event: EVENTS.winter2015,
@@ -1370,9 +1507,6 @@ let weapon = {
value: 160,
int: 15,
per: 7,
canBuy: () => {
return true;
},
},
winter2015Healer: {
event: EVENTS.winter2015,
@@ -1381,9 +1515,6 @@ let weapon = {
notes: t('weaponSpecialWinter2015HealerNotes', { int: 9 }),
value: 90,
int: 9,
canBuy: () => {
return true;
},
},
spring2015Rogue: {
event: EVENTS.spring2015,
@@ -1392,6 +1523,9 @@ let weapon = {
notes: t('weaponSpecialSpring2015RogueNotes', { str: 8 }),
value: 80,
str: 8,
canBuy: () => {
return true;
},
},
spring2015Warrior: {
event: EVENTS.spring2015,
@@ -1400,6 +1534,9 @@ let weapon = {
notes: t('weaponSpecialSpring2015WarriorNotes', { str: 15 }),
value: 90,
str: 15,
canBuy: () => {
return true;
},
},
spring2015Mage: {
event: EVENTS.spring2015,
@@ -1410,6 +1547,9 @@ let weapon = {
value: 160,
int: 15,
per: 7,
canBuy: () => {
return true;
},
},
spring2015Healer: {
event: EVENTS.spring2015,
@@ -1418,6 +1558,9 @@ let weapon = {
notes: t('weaponSpecialSpring2015HealerNotes', { int: 9 }),
value: 90,
int: 9,
canBuy: () => {
return true;
},
},
summer2015Rogue: {
event: EVENTS.summer2015,
@@ -1521,6 +1664,40 @@ let weapon = {
value: 90,
int: 9,
},
spring2016Rogue: {
event: EVENTS.spring2016,
specialClass: 'rogue',
text: t('weaponSpecialSpring2016RogueText'),
notes: t('weaponSpecialSpring2016RogueNotes', { str: 8 }),
value: 80,
str: 8,
},
spring2016Warrior: {
event: EVENTS.spring2016,
specialClass: 'warrior',
text: t('weaponSpecialSpring2016WarriorText'),
notes: t('weaponSpecialSpring2016WarriorNotes', { str: 15 }),
value: 90,
str: 15,
},
spring2016Mage: {
event: EVENTS.spring2016,
specialClass: 'wizard',
twoHanded: true,
text: t('weaponSpecialSpring2016MageText'),
notes: t('weaponSpecialSpring2016MageNotes', { int: 15, per: 7 }),
value: 160,
int: 15,
per: 7,
},
spring2016Healer: {
event: EVENTS.spring2016,
specialClass: 'healer',
text: t('weaponSpecialSpring2016HealerText'),
notes: t('weaponSpecialSpring2016HealerNotes', { int: 9 }),
value: 90,
int: 9,
},
};
let specialSet = {

View File

@@ -1287,7 +1287,7 @@ api.quests = {
completion: t('questEggHuntCompletion'),
value: 1,
canBuy: (function() {
return false;
return true;
}),
category: 'pet',
collect: {