Big updates to combat system

dmgcalculations done, and a few other stuff.