- Make battle end as state based effect - Check death as state based effect - Rename CardId to HCardId