Improved Crits

passed the attacker and defender to the critcalc function
implemented focus energy
added a check for focused in critcalc
fixed typos in critcalc