removed roomdata and adjusted the movemenposition calculations
 fixed indentation such that reading does not generate headache
Added NpcType test and made adjustments to model accordingly