Add fail message for trapping moves
Fix Trapping Implementation

Until the next overhaul
Merge pull request #471 from V4Victini/trapping

Some changes to trapping implementation