Revert "Swap isshield for weapontype == shield"

This reverts commit 11f4e9f89bd1c48426eab44faf8361564eb99f71.