Traverse traps by trap type

[kgaskell01]

Please change the trap traverse so that they traverse by trap type (ambush, mine, caltrops, etc) instead of current wait traverses through all of them. It would make it a lot easier to assess the state of your traps...