Fixed Combat calculator, added x2/x4