Fix weapon damage display on Actor tooltips

This was using a very naive combatDamage call on each slot instead of doing the interpreting the character sheet does.  Now they both use the same method, though I'm not 100% I covered all the special casing.