Made Doors/Rooms more flexible.  Fixed some attack stuff

After testing.