Updated some NPC scripts

Updated some NPC scripts to reflect the latest changed to OPtionBitmask