Moving enjoyment checks to calc_fun
Fixes incomplete cannibal cookbook logic
Implements calc_fun for comestibles
Implements calc_nutr and calc_quench to tooltips
Comments out some testing stuff
use constants instead of magic values
Merge remote-tracking branch 'BevapDin/magic-values' into FrankenMod
Merge remote-tracking branch '9600bauds/comest_calcs' into FrankenMod

Conflicts:
	src/item.cpp
	src/player.cpp