fixed bug with damage calculation, fixed rewind time and added rewind
time test
implemented more tests of combat, fixed a few damage calculation bugs