Added extra save capabilities

If a player is in combat when they save they are forced back in to
combat upon loading, room and monster data is now saved with the player
data.

Also fixed a type error with properties.