Further Additions And Tweaks To Battles

Moved Damage Calculation routine to be inside a battle scripting
command, and added several more clauses and criteria to the cancellation
command.