Collision is much orgasm now

seperate collision types for npc's and objects