Fixed a bug that would drain energy when receiver is already full health.

Added some fields to retrieve and pass to the resolve data object in preparation for embedded messages for combat actions.