Change order of updateMyState back to the original

In the rebasing, I accidentally reversed the order of the argument from { X: pX, Y: pY } to { Y: pY, X: pX}. I change it back here.
Updated shooter zone.
Better handling of metadata layers.
Fix zone detection for zones other than the first.
Fix desert caverns layer handling.