Combat Update

We have made a major update to the combat and the combat flow.