Rename struct trap to struct trap_kind
Rename struct trap_type to struct trap, other stuff to disambiguate
Remove most hard coded trap indices