Add EncounterDifficulty enum and move it into CombatController

So I accidentally left this guy out, kinda important I suppose. :)