Battle and Character status effect interactions

also moved putcharacter in room and current room into  actual character
class.