Not sure if this is complete, or even correct. #7255
Included more fixes.
No comma there.
Merge Wishbringer PR

Conflicts:
	src/creature.cpp
	src/creature.h