Damage Calculation Revert + Part of tweak

Attack/Spell:\n- Changes made to the damage calculation last week were reverted.\n- Kept armor buff tweaks for warriors.