Combine discard into endturn. Fix discard ai issues