Affection bonuses are not included, and I think jewelry isn't included in the count either. Either or both may still apply while in combat though, that data is a bit harder to figure out and would require a lot of testing.