Shield Master (Expanded Rework)

You use shields not just for protection but also for offense. You gain the following benefits while you are wielding a shield:

• Once per turn, when you take the Attack action on your turn and hit an enemy within 5 feet of you with a melee attack, you can try to shove that creature with your shield in place of one of those attacks.
• If you aren't incapacitated, you can add your shield's AC bonus to any Dexterity saving throw you make against a spell or other harmful effect.
• If you are subjected to an effect that allows you to make a Dexterity saving throw to take only half damage, you can use your reaction to take no damage if you succeed on the saving throw, interposing your shield between yourself and the source of the effect.
• Shields you wield are considered a simple melee weapon, and deals 1d4 bludgeoning damage. It has the thrown property with a normal range of 10 feet and a long range of 20 feet.