Backport changes from trunk
Backporting a change from trunk:
python/items/ring_occidental_mages.py:
scorn/shops/potionshop:
Backporting a change from trunk:
set the 'difficulty' value on some maps
port_joseph/pirates/tortship3:
Backport changes from trunk