So a "warrior class" Hero would be "good warrior", and a "warrior class evil character" would be "evil warrior"? That makes sense. In the ORCID, there were already a few cards that used weapon in place of weapon class enhancement, which is why I made that consistent. I'd have to check with the rest of the playtest team to verify that it works, but I'd be for it.