[Fixed] mask scent and conceal are now mutually exclusive
[Fixed] entering combat no longer breaks mask scent or conceal
[Removed] some redundant checks

Change-Id: I037564f8994556bca3df46a15a22f15aa783d1da