Finished new weapon generation code