Modify more #defines, alignment, and NPC rate

Restored a couple more #define expressions that had been commented out,
fixed a few more formatting (alignment) issues, and increased the rate
of random NPC generation.