Do not penalize effects modifying structure resistance
Revert "Fix Bastion resists"

This reverts commit 09d5beb69e7cdd3b0ee73956bc1aee254342eacc.
Merge remote-tracking branch 'upstream/master'