Updated movement and battle mechanics

Included battle mechanics, updated movement mechanics