Added more die types to the roll function.
Merge remote-tracking branch 'origin/feature-combatDice' into develop