fixed bugs in combat calculations and items