[c2512] Reorganize code to allow rage rewarded for critter type. (z2477)