Lets good genies appear upon lamp collision

Note: the genie appearing is still a hack (uses layers)