Rationalize attack logic

Merged username-removed-1354299 requested to merge NHOrus/open-adventure:rationalize_logic into master

Fix the compiler warnings about bunching ands with ors

Merge request reports