Update combat.js

Just a few fixed for changed variable names.