ok, state machine completely re-jiggered to be much simpler and the unit tests have changed to test re-rolls of both attack and defense dice.