Common Event Targets for Skills?

I'm trying to figure out how to set up a common events activated by a skill, so that

>if the player is the target of the skill, the common event targets the player

>if an enemy is the target of the skill, the common event targets the enemy

mainly the first one (target the player) would be nice, otherwise when I give a particular skill to say, Aluxes, and then someone else gets it, like Dorothy, then Aluxes is always (healed/hasted/shielded/etc.) even if Dorthy activates it.

Have the skill inflict a state on its target. Make sure the state has the "nonresistance" box checked, and has a rating of zero. Then make the common event check who has the state applied, do whatever the skill does, and remove the state.