lchen59 paulkim6 : small changes

Add more functionality to battle system