Weapon Update

Tested the current weapon generation mechanic and changed variable names
accordingly.