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)
I'm going to change all npcs to metatables xD but I didn't understand what you mean with removing those two elseifs from lines 27 and 44 :p