Escape Condition: NPC Spawn fixes

Fixed some bad NPC spawns