Fixed Combat Math

Swift does not like floats, so now everything is fractions