Refactor combat controller

[Eein]

This updates the encounter code to be more static - this may work for the bugs being experienced.