Fixed the combat bug, started working on the dungeon method