Improving weapons to handle attack stages more generically