Weapon lockon rework