Changing up AtkVar storage again

Switched it back to map, changed search.  Thinking on it, with weapons
sorted out as they are they should never have a collision between two
variables, as they are all unique besides weapons.