fix and test for gaining/losing first strike between combat damage steps