Needs New EncounterGen

Needs new encounter generation things and how combat is triggered. Going
to merge then pull and finish maze.