Added an otherwise effect to conditional effects and cleaned up sources so that decks with discard piles can deal with having cards only in their discard pile