adding stats to combat controller, implementing attack action
merging attack implementation and new combat