use roll proc at dice.

I hope to christ you tested all these changes