Change collision detection and improve combat system

- Make collision detection based on if you can walk on that space