Dice shifting improvements and fixes

Fixed the way the dice are shifted during and after combat. You only get one defense die per turn, but after that everything shifts left.