Cleaned up the setting of combat abilities and weapons in Combat. We now only consider weapons equipped in the right hand to be useable.