enhanced gun code, removed sword extension