&& weapon->sub_type  != WPN_QUARTERSTAFF) )

                    && weapon_skill(*weapon) != SK_STAVES))

    // Quarterstaves can be wielded with a worn shield, but are much
    // less effective.

    // Staves can be wielded with a worn shield, but are much less
    // effective.

        && weapon->sub_type == WPN_QUARTERSTAFF

        && weapon_skill(*weapon) == SK_STAVES