Merge branch 'release' into develop

This commit is contained in:
Sabe Jones 2019-09-24 19:34:39 -05:00
commit 388892ccdd
16 changed files with 3405 additions and 3388 deletions

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.113.0",
"version": "4.113.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View file

@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.113.0",
"version": "4.113.1",
"main": "./website/server/index.js",
"dependencies": {
"@google-cloud/trace-agent": "^4.0.0",

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 118 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 122 KiB

After

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 119 KiB

After

Width:  |  Height:  |  Size: 120 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 149 KiB

After

Width:  |  Height:  |  Size: 147 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 119 KiB

View file

@ -179,6 +179,7 @@ export default {
} else if (heroClass === 'healer') {
return {
armor: 'armor_special_fall2019Healer',
eyewear: 'eyewear_special_fall2019Healer',
head: 'head_special_fall2019Healer',
shield: 'shield_special_fall2019Healer',
weapon: 'weapon_special_fall2019Healer',

View file

@ -1291,8 +1291,8 @@
"headSpecialFall2019WarriorNotes": "The dark eye-sockets of this skull helmet will daunt the bravest of your enemies. Increases Strength by <%= str %>. Limited Edition 2019 Autumn Gear.",
"headSpecialFall2019MageText": "Cyclops Mask",
"headSpecialFall2019MageNotes": "Its single baleful eye does inhibit depth perception, but that is a small price to pay for the way it hones your focus to a single, intense point. Increases Perception by <%= per %>. Limited Edition 2019 Autumn Gear.",
"headSpecialFall2019HealerText": "Dark Visage",
"headSpecialFall2019HealerNotes": "Steel yourself against the toughest foes with this inscrutable mask. Increases Intelligence by <%= int %>. Limited Edition 2019 Autumn Gear.",
"headSpecialFall2019HealerText": "Dark Miter",
"headSpecialFall2019HealerNotes": "Don this dark miter to harness the powers of the fearsome Lich. Increases Intelligence by <%= int %>. Limited Edition 2019 Autumn Gear.",
"headSpecialGaymerxText": "Rainbow Warrior Helm",
"headSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.",
@ -2072,6 +2072,8 @@
"eyewearSpecialFall2019RogueText": "Bone-White Half Mask",
"eyewearSpecialFall2019RogueNotes": "You'd think a full mask would protect your identity better, but people tend to be too awestruck by its stark design to take note of any identifying features left revealed. Confers no benefit. Limited Edition 2019 Autumn Gear.",
"eyewearSpecialFall2019HealerText": "Dark Visage",
"eyewearSpecialFall2019HealerNotes": "Steel yourself against the toughest foes with this inscrutable mask. Confers no benefit. Limited Edition 2019 Autumn Gear.",
"eyewearMystery201503Text": "Aquamarine Eyewear",
"eyewearMystery201503Notes": "Don't get poked in the eye by these shimmering gems! Confers no benefit. March 2015 Subscriber Item.",

View file

@ -1594,6 +1594,14 @@ let eyewear = {
notes: t('eyewearSpecialFall2019RogueNotes'),
value: 20,
},
fall2019Healer: {
event: EVENTS.fall2019,
specialClass: 'healer',
set: 'fall2019LichSet',
text: t('eyewearSpecialFall2019HealerText'),
notes: t('eyewearSpecialFall2019HealerNotes'),
value: 20,
},
};
let head = {

Binary file not shown.

After

Width:  |  Height:  |  Size: 773 B