[BUG] Captain armour set - Tyrant's Charm

[Kmarad]

So there is a weird bug with captain armour set, when you move someone inside the tyrant's charm aura, your turn is passed.

I'm at the beginning of act 2, just freed Meistr, so the magisters are attacking me.

At the very beginning of the fight, one of the magister whistles, and then pass.
So it was my turn, but while I was thinking about my next move, the archers and the dog came by my character, there was a charm check I guess, and then my turn was passed even though I didn't play at all.

One turn later, I used the teleportation spell to tp the dog next to me. Since it has no magic armor, that's free ally. As soon as the dog dropped by my character, it was charmed and my turn passed even though I was nearly full of AP (-2 for tp).


So my thought about this is that after anyone enters charm aura there is a check.
And after this check the character turn is passed if it is its turn.

Please fix this <3

[Kmarad]

Trying various things, I think that I understood the problem.

When its a NPC turn, if he enters the aura and gets charmed, then his turn is passed even if it has AP left. Which sounds logical.

The problem is that, when it's my turn, and I teleport a NPC in the aura, that's my turn that is passed.

So an idea to fix this would be to make sure that the turn that is passed is that of the charmed character (or nobody if its not the charmed character's turn).


Weirdly enough the same thing doesn't happen with Medusa's head.
I can teleport someone in my aura, they get petrified, and I can still play my turn.

And, if I use another character to teleport the NPC inside my other character tyrant aura, his turn isn't passed.