Change mage armour mechanics, closes #187
Merge branch 'bugfix/mageArmour' into develop