Big Update

Changed how combat works, added functionality for combat.