Made a few irrelevant tweaks.
Fixed a combat bug where NPCs using magic or ranged would be able to attack at the same time.