Tightened the spawning code

Kevin's suggestion worked fine and let me add guards to the drug deal
too.  (The 1/20 for Smokers is intentional.  I hate those things but
they seemed a good check, since drug spawns can drop *nice gear*.)

Tests look good so far.