Draw weapon uses remaining
Wands can be used up
Refactor map generation a little to allow for new map types