Fixed Combat and Added doors

More testing. Almost there!