removed uid
merge potions, scrolls and weapons into objects.py