Updated combat/targetting v.1