set the right field here

this was causing an infinite loop in tests if a removed brand was
chosen when trying to generate a good item, since SPWPN_NORMAL ==
WPN_CLUB, and WPN_CLUB always gets rerolled when trying for good items
fix branch depths in tests
travis configuration