Trig Conditions feature requests

[bibenu]

@generalkustard

The ability to combine certain non-contradictory trig conditions

Also requested here

@bibenu

Combined conditions on trigs