Energy regen points integrated into maps
Merge branch 'master' of https://github.com/corpusc/Paramancer