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