Best way to have a different form in combat?

[Foodstamp]

I'm trying to figure out the optimal way to have a different form in combat than in the overland map.

Here is the best way I can come up:

Give the commander two forms.

Create a #onebattlespell that kills the commander at the start of combat, thus shape changing him to the second form.

After combat, the unit should revert to the first form again on the overland map.


Two questions:

Is there an easier way to do this?

Will the spell that kills the first form unit cause afflictions?


Thanks!