Fist mostly working, takedmg takes in boolean for magic now

magic ignores armor.  poison ignores armor.