dev: more refactoring of Player
Companion collision detection works in all rooms