Moved custom triggers to separate events so they won't interfere with turn/step structure, added types and subtypes for cards