moved weaponfactory