Mastered

The coding of this confuses me, but is there any way of editing it so Mastered is separated from Skill Rank? So if you write:

|Mastered=y

Then it shows:

Mastered - {{{Skill Rank}}}

Someone may have rank 1 but not have mastered it, but have Dan 2 and have mastered it. I'm sorry, but I just can't make sense of this coding... Also, it might be a good idea to make something similar for capped skills.

Well, technically, mastering a skill is fully trained requirements at Rank 1. Finishing skill requirements at any other rank isn't considered skill mastery.

But Dan 1/2/3 is technically not rank 1, but it uses the same training requirements as and can still be mastered like rank 1. At the current coding, somebody must either chose to write:

|SkillRank=Mastered

Or:

|SkillRank=Dan 1

They can't say Dan 1 and that they Mastered it.