Added current weapon to player

Moved HP properties to the right place