improved weaponcheck