Altered code to properly handle asymmetric twin swing dice

Fixes #1467.

http://jenkins.buttonweavers.com:8080/job/buttonmen-blackshadowshade/555/
This is not exactly a nit, since it requires changes to pretty much everything, but I'm happy to do the rework.