forgot to save combat.js