Make trap detection easier

From per/2 + traps to per/2 + traps*2.

I like brackets.
Merge remote-tracking branch 'Izicata/patch-6' into FrankenMod

Conflicts:
	src/trapdef.cpp
Merge fix I forgot to check in.
Merge remote-tracking branch 'CleverRaven/master' into FrankenMod