Altered code to properly handle asymmetric twin swing dice

Fixes #1467. Fixes #539.

http://jenkins.buttonweavers.com:8080/job/buttonmen-blackshadowshade/555/