Adjust weapon determination and gear set naming for new state vars.
Need to assign them values.