added map based weapon choice

errors are given