Tweaked stamina/focus regeneration to make combat more interesting

Stamina now regenerates faster, to speed up combat. Focus regenerates
in combat to make it last longer.