Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
Corrected guard calculation to match OH3.
Merge branch 'RMG' of https://github.com/vcmi/vcmi into RMG