Combat continued

clearing out errors and ensuring combat mechanics repeat