Modified checks for spell screen effects to be based on weapon (tomes) instead of affinity. Minor code cleanup.