change categories of some items
Merge pull request #5621 from illi-kun/categories

Change categories of some items
remove map::traps vector and use g->traps instead