What you are proposing is the way its now unless i have misunderstood.

After association matches, player condition returns to the same level as start of association match.