more combatscript changes