added energy drainage and ability enums for player
Merge branch 'master' of https://github.com/blaavogn/GameMaster