Made some further changes to combat and combatGraphics class, mainly
concerning the logic of combat