Some combat avoidance logic fixes

See #271
Fixes #225

It appears the method to try and streamline the coding for descriptor selection didn't actually work, and the wetness/tightness descriptions were always being set to ""... at least, that's what looks like what was going on to me.
Merge remote-tracking branch 'upstream/master'