It works. Seems like a lot of work, though, for a stopgap fix. I mean, in the short term it will do the job,but it'll require that all weapons are updated to include the appropriate Melee or Ranged and damage type into their Equipment Types. And, that'll have to be added for all data sets. While the coding side of it is more complicated, allowing for multiple AND types would be future friendly and not require changes to the data to work properly. I guess that's really something for James to decide, ja?