Change combat calculation item titles

[megazear7]

Any time a standard item adjustment is put in the combat calculations, the normal item name should be used. If the bonus comes from a custom effect, then use the item_instance.actual_name.