Combat takes account of stat and stat_modified

stat = base leveling stat
stat_modified = what equipment/buffs give
Merge pull request #1 from ProjectSWGCore/master

Combat takes account of stat and stat_modified