added auto-swap equipment and functionality for different melee weapon types in Attacker
fixed merge conflicts due to autoswap commit