State Changes Based on a Variable and State of Another Object

Hello,

I am trying to change the state of a shape (Highlight 1), from Hidden to Normal when a media file (Voiceover 1) completes if a text variable is equal to something (Variable: Role and the text value: Role 1) AND the state of another shape (Shape 1) is equal to number of things (X, or Y, or Z). I have the trigger set up as follows: 

Action: Change the state of 

Object: Highlight 1

State: to Normal

When: When the media completes

Media: Voiceover 1

Conditions: If Role = Role 1

and the state of Shape 1 = X

or the state of Shape 1 = Y

or the state of Shape 1 = Z

The above doesn't seem to be working. The shapes are changing from Hidden to Normal at random. There are 10 shapes (Hightlights) that could potentially be adjusted from Hidden to Normal based on 6 different variables (Roles) and 14 different states (X, Y, Z). Because there are so many different potential combinations, I don't want to separate the triggers - I want to have as many conditions on one trigger as possible. Can anyone think of a way to do this without doing the following for each Hightlight shape?

Action: Change the state of 

Object: Highlight 1

State: to Normal

When: When the media completes

Media: Voiceover 1

Conditions: If Role = Role 1

and the state of Shape 1 = X

AND

Action: Change the state of

Object: Highlight 1

State: to Normal

When: When the media completes

Media: Voiceover 1

Conditions: If Role = Role 1

and the state of Shape 1 = Y

AND

Action: Change the state of

Object: Highlight 1

State: to Normal

When: When the media completes

Media: Voiceover 1

Conditions: If Role = Role 1

and the state of Shape 1 = Z

Etc. 

Any help would be greatly appreciated!