switches from hashmaps back to tables so drawing is the same as before

this also keeps weapons persistence intact.