krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into refactor-content

Browse Source
This commit is contained in:
Blade Barringer
2015-09-23 07:52:36 -05:00
parent 90387707d8 6a6b67b9c1
commit 955c163544
193 changed files with 4855 additions and 4069 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/script/src/content/events.js
View File

@@ -11,7 +11,8 @@ let events = {
fall: {start:'2014-09-21',end:'2014-11-01'},
winter2015: {start:'2014-12-21',end:'2015-02-02'},
spring2015: {start:'2015-03-20',end:'2015-05-02'},
summer2015: {start:'2015-06-20',end:'2015-08-02'}
summer2015: {start:'2015-06-20',end:'2015-08-02'},
fall2015: {start:'2015-09-21',end:'2015-11-01'},
}
export default events;

4
common/script/src/content/food/base.js
View File

@@ -3,8 +3,8 @@ import {
setFoodDefaults
} from '../helpers';
const CAN_BUY = true;
const CAN_DROP = true;
const CAN_BUY = false;
const CAN_DROP = false;
let baseFood = {
Meat: {

4
common/script/src/content/food/fall.js
View File

@@ -3,8 +3,8 @@ import {
setFoodDefaults
} from '../helpers';
const CAN_BUY = false;
const CAN_DROP = false;
const CAN_BUY = true;
const CAN_DROP = true;
let candy = {
Candy_Skeleton: {

1
common/script/src/content/gear/eyewear.js
View File

@@ -74,6 +74,7 @@ let eyewear = {
plagueDoctorMask: {
text: t('eyewearArmoirePlagueDoctorMaskText'),
notes: t('eyewearArmoirePlagueDoctorMaskNotes'),
value: 100,
set: 'plagueDoctor',
canOwn: (function(u) {
return u.items.gear.owned.eyewear_armoire_plagueDoctorMask != null;

43
common/script/src/content/gear/head.js
View File

@@ -487,6 +487,46 @@ let head = {
value: 60,
int: 7
},
fall2015Rogue: {
event: events.fall2015,
specialClass: 'rogue',
text: t('headSpecialFall2015RogueText'),
notes: t('headSpecialFall2015RogueNotes', {
per: 9
}),
value: 60,
per: 9
},
fall2015Warrior: {
event: events.fall2015,
specialClass: 'warrior',
text: t('headSpecialFall2015WarriorText'),
notes: t('headSpecialFall2015WarriorNotes', {
str: 9
}),
value: 60,
str: 9
},
fall2015Mage: {
event: events.fall2015,
specialClass: 'wizard',
text: t('headSpecialFall2015MageText'),
notes: t('headSpecialFall2015MageNotes', {
per: 7
}),
value: 60,
per: 7
},
fall2015Healer: {
event: events.fall2015,
specialClass: 'healer',
text: t('headSpecialFall2015HealerText'),
notes: t('headSpecialFall2015HealerNotes', {
int: 7
}),
value: 60,
int: 7
},
gaymerx: {
event: events.gaymerx,
text: t('headSpecialGaymerxText'),
@@ -702,6 +742,7 @@ let head = {
notes: t('headArmoireYellowHairbowNotes', {
attrs: 5
}),
value: 100,
int: 5,
per: 5,
str: 5,
@@ -714,6 +755,7 @@ let head = {
notes: t('headArmoireRedFloppyHatNotes', {
attrs: 6
}),
value: 100,
con: 6,
int: 6,
per: 6,
@@ -728,6 +770,7 @@ let head = {
str: 6,
con: 5
}),
value: 100,
int: 5,
str: 6,
con: 5,

1
common/script/src/content/gear/sets/armoire.js
View File

@@ -80,6 +80,7 @@ export var armor = {
str: 5,
con: 6
}),
value: 100,
int: 6,
str: 5,
con: 6,

40
common/script/src/content/gear/sets/special.js
View File

@@ -347,6 +347,46 @@ export var armor = {
value: 90,
con: 15
},
fall2015Rogue: {
event: events.fall2015,
specialClass: 'rogue',
text: t('armorSpecialFall2015RogueText'),
notes: t('armorSpecialFall2015RogueNotes', {
per: 15
}),
value: 90,
per: 15
},
fall2015Warrior: {
event: events.fall2015,
specialClass: 'warrior',
text: t('armorSpecialFall2015WarriorText'),
notes: t('armorSpecialFall2015WarriorNotes', {
con: 9
}),
value: 90,
con: 9
},
fall2015Mage: {
event: events.fall2015,
specialClass: 'wizard',
text: t('armorSpecialFall2015MageText'),
notes: t('armorSpecialFall2015MageNotes', {
int: 9
}),
value: 90,
int: 9
},
fall2015Healer: {
event: events.fall2015,
specialClass: 'healer',
text: t('armorSpecialFall2015HealerText'),
notes: t('armorSpecialFall2015HealerNotes', {
con: 15
}),
value: 90,
con: 15
},
gaymerx: {
event: events.gaymerx,
text: t('armorSpecialGaymerxText'),

30
common/script/src/content/gear/shield.js
View File

@@ -373,6 +373,36 @@ let shield = {
}),
value: 70,
con: 9
},
fall2015Rogue: {
event: events.fall2015,
specialClass: 'rogue',
text: t('shieldSpecialFall2015RogueText'),
notes: t('shieldSpecialFall2015RogueNotes', {
str: 8
}),
value: 80,
str: 8
},
fall2015Warrior: {
event: events.fall2015,
specialClass: 'warrior',
text: t('shieldSpecialFall2015WarriorText'),
notes: t('shieldSpecialFall2015WarriorNotes', {
con: 7
}),
value: 70,
con: 7
},
fall2015Healer: {
event: events.fall2015,
specialClass: 'healer',
text: t('shieldSpecialFall2015HealerText'),
notes: t('shieldSpecialFall2015HealerNotes', {
con: 9
}),
value: 70,
con: 9
}
},
mystery: {

43
common/script/src/content/gear/weapon.js
View File

@@ -579,6 +579,49 @@ let weapon = {
}),
value: 90,
int: 9
},
fall2015Rogue: {
event: events.fall2015,
specialClass: 'rogue',
text: t('weaponSpecialFall2015RogueText'),
notes: t('weaponSpecialFall2015RogueNotes', {
str: 8
}),
value: 80,
str: 8
},
fall2015Warrior: {
event: events.fall2015,
specialClass: 'warrior',
text: t('weaponSpecialFall2015WarriorText'),
notes: t('weaponSpecialFall2015WarriorNotes', {
str: 15
}),
value: 90,
str: 15
},
fall2015Mage: {
event: events.fall2015,
specialClass: 'wizard',
twoHanded: true,
text: t('weaponSpecialFall2015MageText'),
notes: t('weaponSpecialFall2015MageNotes', {
int: 15,
per: 7
}),
value: 160,
int: 15,
per: 7
},
fall2015Healer: {
event: events.fall2015,
specialClass: 'healer',
text: t('weaponSpecialFall2015HealerText'),
notes: t('weaponSpecialFall2015HealerNotes', {
int: 9
}),
value: 90,
int: 9
}
},
mystery: {