[12616] Reorganize code to allow rage rewarded for critter type.

Fix cmangos/issues#231