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)
Would you mind removing these two elseif's (L27-44) and change the code to metatables?