Merge branch 'develop' into release

test/content/gear.test.js

@@ -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;
 

website/common/script/content/gear/sets/special/index.js

@@ -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,
         });