fixed simple pathing
merged
added basic combat