mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-04-14 19:56:23 +00:00
Merge branch 'develop' into release
This commit is contained in:
commit
22bbdd6a28
2 changed files with 11 additions and 1 deletions
|
|
@ -68,6 +68,16 @@ describe('Gear', () => {
|
|||
});
|
||||
});
|
||||
|
||||
it('only assigns mage weapons twoHanded', () => {
|
||||
each([allGear.armor.special, allGear.head.special, allGear.shield.special], gearType => {
|
||||
each(gearType, gear => {
|
||||
if (gear.specialClass === 'wizard') {
|
||||
expect(gear.twoHanded, gear.key).to.not.eql(true);
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('backer gear', () => {
|
||||
let user;
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ function fillSpecialGear (gearItems, gearType, value, stats) {
|
|||
value: actualValue,
|
||||
season,
|
||||
}, actualStats);
|
||||
if (klass === 'wizard') {
|
||||
if (klass === 'wizard' && gearType === 'weapon') {
|
||||
defaults(gearItems[key], {
|
||||
twoHanded: true,
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue