Updated a few NPCs

feel free to check my commit one by one as I did and tell what I need to fix :+1: (specially djinn npcs)
oh yeah, indeed, fixed it and converted :)