Some rare NPC fixes
Merge branch 'master' of https://github.com/LianthTwinstarCz/CataTS