Found the feat I was thinking of.
Trained (replaces Heavily Armored, Lightly Armored, Linguist, Moderately Armored, Skilled, and Weapon Master)
You may take this feat more than once.
You gain any combination of the following benefits, adding up to 10 points:
- 5 points: Increase one ability score by 1, to a maximum of 20.
- 4 points: Learn a cantrip(1), or gain proficiency in light armor, medium armor(2) and shields, or heavy armor(3).
- 3 points: Gain proficiency in shields or a class of weapons (simple, martial(4), melee, ranged, firearms).
- 2 points: Gain proficiency in a skill.
- 1 point: Gain proficiency in a tool(5) or language.
(1) If you learn a cantrip, you may choose Wisdom, Intelligence, or Charisma as the spellcasting ability modifier for that cantrip.
(2) You must be proficient in simple weapons before gaining proficiency in martial weapons.
(3) You must be proficient in light armor before gaining proficiency in medium armor.
(4) You must be proficient in medium armor before gaining proficiency in heavy armor.
(5) Your DM may require an extra point for certain particularly useful tools.
* Your DM may allow you to gain expertise or advantage on checks with a skill or tool with which you are already proficient.