for attack types, use the longer text as "label" as well as "text",

* Fixes #490
* Jenkins: http://jenkins.buttonweavers.com:8080/job/buttonmen-cgolubi1/112/