Issue #5: Attribute modifiers remain when weapon is switched